From 0321d9947724d726f4829a8f44f766c220917887 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 09 四月 2024 11:47:47 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 65c1980..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);
// 鏍规嵁浠诲姟绫诲瀷鑾峰彇浠诲姟
@@ -262,7 +262,7 @@
StorageCage SelectStorageByCell(String cell);
// 鎵嬪姩瀹屾垚浠诲姟
- @Select("update storage_task set task_state=1 where id=1429")
+ @Select("update storage_task set task_state=1 where id=#{id}")
void FinishTask(Integer id);
@Select("select gi.* from glassinfo gi inner join flowcard fc on gi.flowcard=fc.flowcard where fc.state!=2 and position(#{width} in gi.width) and position(#{height} in gi.height) and position(#{thickness} in gi.thickness) and position(#{films} in gi.films) group by gi.id")
@@ -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);
@@ -312,4 +312,11 @@
@Select("select * from storage_cage where cage=#{cage} order by id desc")
List<StorageCage> SelectStorageCageByCage(Integer cage);
+ // 娣诲姞鍑虹墖闃熷垪
+ @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