From 92c1cf60b4b804b97b54876b5140132a16765333 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 25 三月 2024 08:09:11 +0800
Subject: [PATCH] 测试更新

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |   13 ++++++++-----
 1 files changed, 8 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 be93c8b..105307a 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
@@ -3,7 +3,7 @@
 import org.apache.ibatis.annotations.*;
 
 import com.example.springboot.entity.CarPosition;
-import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.FlowCard;
 import com.example.springboot.entity.GlassInfo;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.entity.StorageTask;
@@ -239,7 +239,7 @@
   void DeleteStroageCageByCell(Integer cell);
   
   //淇敼鏍煎瓙鐜荤拑鏁伴噺
-  @Update("update storage_cage set number=number+#{num} where cell=#{cell}")
+  @Update("update storage_cage set number=ifnull(number,0)+#{num} where cell=#{cell}")
   void updateStroageCageByCell(Integer cell, Integer num);
 
   //璁$畻鏍煎瓙鍐呭墿浣欏搴�
@@ -269,9 +269,9 @@
   void StorageCageAddGlass(String cell, GlassInfo glassInfo);
 
   @Select("select * from flowcard where state!=2")
-  List<Flowcard> SelectOrderTask();
+  List<FlowCard> SelectOrderTask();
 
-  @Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier")
+  @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}")
@@ -280,8 +280,11 @@
   @Update("update flowcard set method=#{method} where flowcard=#{flowcard}")
   void ModeChange(String flowcard, int method);
 
-  @Select("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype} where state=0")
+  @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}")
+  void AddGlassNo(String flowcard, Integer mateid, Integer geTier);
   
 
 }

--
Gitblit v1.8.0