From 4142b96426da5346f5e2143a54775dbe5b154d2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 15:05:46 +0800
Subject: [PATCH] 修改终止任务功能
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 14 +++++++-------
1 files changed, 7 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 fe4f681..5eb7b2a 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
@@ -62,10 +62,6 @@
@Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
void UpdateCageTask1(@Param("glassid") String glassid);
- // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
- @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
- void UpdateCageTask2(@Param("glassid") String glassid);
-
//鑾峰彇鎶ヨ淇℃伅
@Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
List<alarmmg> SelectAlarmmgInfo();
@@ -74,6 +70,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,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null where glass_id=#{glassid}")
void DeleteByGlassID(String glassid);
@@ -153,12 +150,12 @@
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2)")
+ @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2 or state=3)")
Out_slice SelectQueueByglassid(String getbarcode);
//娣诲姞鍑虹墖闃熷垪
- @Insert("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);
+ @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position` ,`orderid` ,`listid` ,`boxid` ,`glasswidthmm` ,`glassheightmm`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position}, #{orderid}, #{listid}, #{boxid}, #{glasswidth}, #{glassheight});")
+ void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position, Short state,String orderid, String listid, String boxid, String glasswidth, String glassheight);
//鍑虹墖闃熷垪璋冨簭
@Update("update out_slice set sequence=#{sequence} where glassid=#{glassId}")
@@ -185,4 +182,7 @@
@Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1")
Double SelectCageWidth(short cage, short cell);
+ @Select("update out_slice set state=3 where glassId=#{glassid}")
+ void UpdateOutSliceGlass(String glassid);
+
}
--
Gitblit v1.8.0