From c3204d686fbf8a64dd7fa4dcbb48c0a075df06e0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 05 十二月 2023 08:06:19 +0800
Subject: [PATCH] 更新电气管理界面

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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 61db9ec..1889fad 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
@@ -73,7 +73,7 @@
   @Select("select * from storage_cage where position(#{cage} in ifnull(glass_id,\"\"))")
   List<StorageCage> SelectCageInfo(String cage);
 
-  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
+  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null where glass_id=#{glassid}")
   void DeleteByGlassID(String glassid);
 
   //鏌ヨ灏忚溅浣嶇疆
@@ -122,7 +122,7 @@
   void UpdateQueueState();
 
   //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
-  @Select("update queue set glassid='',state=0 where id=#{id}")
+  @Select("update queue set glassid=null,orderid=null,listid=null,boxid=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,state=0 where id=#{id}")
   void DeleteQueueGlass(String id);
 
   //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
@@ -134,7 +134,7 @@
   north_glass_buffer1 SelectBoxNo(String glassid);
 
   //鏌ヨ鍑虹墖闃熷垪淇℃伅
-  @Select("select * from out_slice where state=0 or state=1 order by sequence")
+  @Select("select * from out_slice where state=0 or state=1 or state=2 order by sequence")
   List<Out_slice> SelectProductionqueue();
 
   //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -143,8 +143,8 @@
 
 
   //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
-  @Select("update out_slice set state=3 where id=#{id}")
-  void DeleteProductionQueueGlass(Short id);
+  @Select("update out_slice set state=3 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
+  void DeleteProductionQueueGlass(String id);
 
   //鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
   @Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
@@ -152,16 +152,20 @@
 
 
   //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
-  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
+  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2)")
   Out_slice SelectQueueByglassid(String getbarcode);
 
   //娣诲姞鍑虹墖闃熷垪
-  @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
-  void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
+  @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip}, #{sequence}, now(), #{position});")
+  void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position);
 
   //鍑虹墖闃熷垪璋冨簭
   @Select("update out_slice set sequence=#{sequence} where glassid=#{glassId}")
   void UpdateOutSliceSequence(String glassId,int sequence);
 
+  //鏌ヨ鍑虹墖闃熷垪鏈�澶ч『搴�
+  @Select("select ifnull(max(sequence),0)+1 from out_slice ")
+  Short SelectMaxSquence();
+
 
 }

--
Gitblit v1.8.0