From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:12:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 3446eb8..8b86aa7 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);
// 淇敼鏍煎瓙鐜荤拑鏁伴噺
@@ -246,7 +246,7 @@
void updateStroageCageByCell(Integer cell, Integer num);
// 璁＄畻鏍煎瓙鍐呭墿浣欏搴�
- @Update("update storage_cage set width=5000-(glasswidth+100)*number where cell=#{cell}")
+ @Update("update storage_cage set width=5000-if(glasswidth is null,0,glasswidth+50)*number where cell=#{cell}")
void UpdateStroageCageWidthByCell(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(#{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, Integer tier);
@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);
@@ -316,4 +316,7 @@
@Insert("INSERT INTO flowcard(`flowcard`, `totaltier`, `number`, `line`, `state`, `method`, `starttime`) "
+" select #{flowcard}, 0, #{number}, 0, 0, 0, now() where 0=( select count(*) from flowcard where flowcard=#{flowcard});")
void InsertFlowcard(String flowcard, Integer number);
+
+ @Select("Delete from queue where glassid=#{glassId}")
+ void DeletequeueByGlassid(String glassId);
}
--
Gitblit v1.8.0