From ffc342d5c299fa3d966d88e4cdb9bf092a7c7510 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 三月 2024 08:31:01 +0800
Subject: [PATCH] 添加主页面设备状态显示

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 105307a..ad017b3 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
@@ -21,6 +21,9 @@
   @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")
+  List<StorageCage> selectAlls();
+
   // 鏌ヨ10-6绗煎唴灞傛牸瀛愮姸鎬�
   @Select("SELECT cage,state,ifnull(glasswidth/2750*2,0) as glasswidth from storage_cage where cage>5 and tier=2 order by cage desc,cell desc")
   List<StorageCage> selectRack1();
@@ -283,8 +286,11 @@
   @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state<=0")
   void UpdateQueue(String flowcard,double width,double height,Integer glasstype);
 
-  @Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
+  @Update("update glassinfo set finishnumber=ifnull(finishnumber,0)+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
   void AddGlassNo(String flowcard, Integer mateid, Integer geTier);
   
 
+  // 鏌ヨ绗煎唴鐜荤拑淇℃伅
+  @Select("SELECT select * from storage_cage where cage=#{cage} order by id desc")
+  List<StorageCage> SelectStorageCageByCage(Integer cage);
 }

--
Gitblit v1.8.0