From 9057d8571f11a552a326fa35fda9b5ec614f5c58 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 09:33:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 17 +++++++++++------
1 files changed, 11 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 f5a7bee..f85627b 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
@@ -165,7 +165,7 @@
Out_slice SelectQueueByglassid(String getbarcode);
//娣诲姞鍑虹墖闃熷垪
- @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position` ,`orderid` ,`listid` ,`boxid` ,`glasswidthmm` ,`glassheightmm` ,`framewidthmm` ,`frameheightmm` ) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position}, #{orderid}, #{listid}, #{boxid}, #{glasswidth}, #{glassheight}, #{framewidthmm}, #{frameheightmm});")
+ @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position` ,`orderid` ,`listid` ,`boxid` ,`glasswidthmm` ,`glassheightmm` ,`framewidthmm` ,`frameheightmm` ,`framestate` ) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position}, #{orderid}, #{listid}, #{boxid}, #{glasswidth}, #{glassheight}, #{framewidthmm}, #{frameheightmm}, 0);")
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,String framewidthmm,String frameheightmm);
//鍑虹墖闃熷垪璋冨簭
@@ -179,12 +179,12 @@
@Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)")
List<RolePermission> SelectPermissionByUserName(String username);
- //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
- @Update("update out_slice set state=3 where id=#{id}")
- void CompleteQueue(String id);
+ // //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
+ // @Update("update out_slice set state=2 where id=#{id}")
+ // void CompleteQueue(String id);
//鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
- @Update("update out_slice set state=3 where id=#{id}")
+ @Update("update out_slice set state=2 where glassid=#{glassid}")
void CompleteQueueByGlassId(String glassid);
//鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺
@@ -216,11 +216,16 @@
Out_slice SelectCurrentFrame();
//鏍规嵁鐜荤拑id鏌ヨ浠诲姟淇℃伅
- @Select("select task_type from storage_task where glass_id=#{glassid} and task_state!=2")
+ @Select("select task_type from storage_task where glass_id=#{glassid} and task_state!=1")
Short SelectTaskByGlassId(String glassid);
//淇敼鏍煎瓙瀹藉害
@Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
void UpdataCageWidth(double width, int cage, int cell);
+ //鑾峰彇閾濇鏈夋病鏈夋鍦ㄥ嚭鐗囩殑鐜荤拑
+ @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1")
+ Short SelectOutingQueueCount(String frameNo);
+
+
}
--
Gitblit v1.8.0