From 0aa9b026a52b03e4c3ba3e59970e309be58a792b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 十二月 2023 08:32:45 +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 | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 b41062a..fe4f681 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
@@ -55,8 +55,8 @@
short SelectInTask();
// 鎵嬪姩瀹屾垚浠诲姟
- @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
- void UpdateTask(@Param("task_type") Integer task_type);
+ @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0 and glass_id=#{glassid}")
+ void UpdateTask(@Param("task_type") Integer task_type,String glassid);
// 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
@Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
@@ -135,7 +135,7 @@
north_glass_buffer1 SelectBoxNo(String glassid);
//鏌ヨ鍑虹墖闃熷垪淇℃伅
- @Select("select * from out_slice where state=0 or state=1 or state=2 order by sequence")
+ @Select("select * from out_slice order by sequence")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -143,9 +143,9 @@
StorageCage SelectStorageGlassById(String glassid);
- //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
- void DeleteProductionQueueGlass(String id);
+ // //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ // @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
+ // void DeleteProductionQueueGlass(String id);
//鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
@Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
@@ -178,8 +178,11 @@
@Select("select count(*) from out_slice where barcode=#{frameid} and state<2")
Short SelectCountByFrameNo(String frameid);
- //閾濇id瀵瑰簲鐜荤拑鏀瑰畬鍏ㄩ儴瀹屾垚鐘舵��
- @Update("update out_slice set state=3 where barcode=#{frameid} and state=2")
+ //鍒犻櫎宸插畬鎴愮殑浠诲姟
+ @Update("delete from out_slice where Barcode=#{frameid}")
void CompleteQueueByFrameNo(String frameid);
+ @Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1")
+ Double SelectCageWidth(short cage, short cell);
+
}
--
Gitblit v1.8.0