From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 97d0a29..4395cc7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -23,7 +23,12 @@
@Select("select cage,round(100-(21-sum(if(state>0,1,state)))/21*100) as cell,21-sum(if(state>0,1,state)) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
List<StorageCage> selectAll();
- @Select("Select cage,sum(case when number=0 or number is null then 1 else 0 end) as cell,100-sum(case when number=0 or number is null then 1 else 0 end)/count(id)*100 as width from storage_cage group by cage")
+ // @Select("Select cage,sum(case when number=0 or number is null then 1 else 0 end) as cell,100-sum(case when number=0 or number is null then 1 else 0 end)/count(id)*100 as width from storage_cage group by cage")
+ // List<StorageCage> selectAlls();
+ // 鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
+ // @Select("Select a.cage,sum(case when a.number=0 or a.number is null then 1 else 0 end)-b.cells as cell,100+b.cells-sum(case when a.number=0 or a.number is null then 1 else 0 end)/count(a.id)*100 as width from storage_cage a left join (select `cage_numbers`.`cage` AS `cages`,count(`a`.`shelf_rack`) AS `cells` from ((select 1 AS `cage` union all select 2 AS `2` union all select 3 AS `3` union all select 4 AS `4`) `cage_numbers` left join `out_task` `a` on((((case when (`a`.`shelf_rack` between 1 and 40) then 1 when (`a`.`shelf_rack` between 41 and 80) then 2 when (`a`.`shelf_rack` between 81 and 120) then 3 when (`a`.`shelf_rack` between 121 and 160) then 4 else NULL end) = `cage_numbers`.`cage`) and (`a`.`task_state` = 0)))) group by `cage_numbers`.`cage` order by `cage_numbers`.`cage`) as b on a.cage=b.cages group by a.cage;")
+ // List<StorageCage> selectAlls();
+ @Select("Select a.cage, GREATEST(sum(case when a.number is null and disabled=0 then 1 else 0 end),0) as cell,LEAST(100-sum(case when a.number is null and disabled=0 then 1 else 0 end)/count(a.id)*100,100) as width from storage_cage a left join (select `cage_numbers`.`cage` AS `cages`,count(`a`.`shelf_rack`) AS `cells` from ((select 1 AS `cage` union all select 2 AS `2` union all select 3 AS `3` union all select 4 AS `4`) `cage_numbers` left join `out_task` `a` on((((case when (`a`.`shelf_rack` between 1 and 40) then 1 when (`a`.`shelf_rack` between 41 and 80) then 2 when (`a`.`shelf_rack` between 81 and 120) then 3 when (`a`.`shelf_rack` between 121 and 160) then 4 else NULL end) = `cage_numbers`.`cage`) and (`a`.`task_state` = 0)))) group by `cage_numbers`.`cage` order by `cage_numbers`.`cage`) as b on a.cage=b.cages group by a.cage;")
List<StorageCage> selectAlls();
// 鏌ヨ10-6绗煎唴灞傛牸瀛愮姸鎬�
@@ -247,7 +252,7 @@
void updateStroageCageByCell(Integer cell, Integer num);
// 璁＄畻鏍煎瓙鍐呭墿浣欏搴�
- @Update("update storage_cage set width=4300-if(glasswidth is null,0,glasswidth+300)*number+300 where cell=#{cell}")
+ @Update("update storage_cage set width=4300-if(glasswidth is null,0,glasswidth)*number-(number*300)+300 where cell=#{cell}")
void UpdateStroageCageWidthByCell(Integer cell);
// 鏍规嵁浠诲姟绫诲瀷鑾峰彇浠诲姟
@@ -307,6 +312,10 @@
// int deleteGlassinfo(String flowcard);
@Update("Update flowcard set state=2, flowcard=CONCAT('宸插垹闄�', #{flowcard}),orderstate=0 where flowcard=#{flowcard}")
int deleteFlowcard(String flowcard);
+ //鏌ヨ褰撳墠绗煎瓙鏄惁杩樻湁璇ヨ鍗曠殑鐜荤拑
+
+ @Select("select count(*) from storage_cage where flowcard=#{flowcard}")
+ int selectflowcardCage(String flowcard);
//淇敼鍑虹墖闃熷垪鐘舵��
@Update("Update out_task set task_state=#{state} where id=#{id}")
int UpdateOutTask(Integer id, Integer state);
@@ -361,7 +370,7 @@
List<Map> Selecttiersum();
// 鏌ヨ绗煎唴鐜荤拑淇℃伅
- @Select("select * from storage_cage where cage=#{cage} order by id desc")
+ @Select("select DISTINCT * from storage_cage where cage=#{cage} order by id desc")
List<StorageCage> SelectStorageCageByCage(Integer cage);
// 娣诲姞鍑虹墖闃熷垪
--
Gitblit v1.8.0