From 01bfed8b9977f82d4e13afd9ce95869d34044d2b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:23:47 +0800
Subject: [PATCH] 修改玻璃id命名规则,添加领取任务线路选择

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 e7e6bb2..18573ed 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
@@ -238,7 +238,7 @@
   List<StorageCage> SelectStorageCageInfo();
 
   // 鍒犻櫎鏍煎瓙鍐呯幓鐠冧俊鎭�
-  @Update("update storage_cage set width=5000,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,thickness=null,glasstype=null,number=null where cell=#{cell}")
+  @Update("update storage_cage set films=null,width=5000,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,thickness=null,glasstype=null,number=null where cell=#{cell}")
   void DeleteStroageCageByCell(Integer cell);
 
   // 淇敼鏍煎瓙鐜荤拑鏁伴噺
@@ -277,14 +277,14 @@
   @Select("select gi.*,sum(sc.number) as cageno from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype where gi.flowcard=#{flowcard} group by gi.id order by gi.mateid,gi.tier")
   List<GlassInfo> SelectOrderView(String flowcard);
 
-  @Update("update flowcard set state=#{state} where flowcard=#{flowcard}")
-  void ClaimTasks(String flowcard, int state);
+  @Update("update flowcard set state=#{state},line=#{line} where flowcard=#{flowcard}")
+  void ClaimTasks(String flowcard, int state, int line);
 
   @Update("update flowcard set method=#{method} where flowcard=#{flowcard}")
   void ModeChange(String flowcard, int method);
 
-  @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 queue set glassid=concat(#P{flowcard},'-',#{tier}),flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},thickness=#{thickness},state=1 where state<=0")
+  void UpdateQueue(String flowcard, double width, double height, Integer glasstype, Double thickness);
 
   @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);

--
Gitblit v1.8.0