From af5edce322ff326356a32011e140182846c5dbed Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 28 十一月 2023 08:02:15 +0800
Subject: [PATCH] 测试后调整理片逻辑
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 86dbe5a..9c9d4e6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -36,7 +36,7 @@
@Update("update longzi set glass_id =123, width =1600, state =1 where cell =24")
void update();
//鑾峰彇鐜荤拑淇℃伅
- @Select("select orderid as ordernumber,width as glasslengthmm from glass where glassid=#{glassid}")
+ @Select("select ordernumber as ordernumber,glasslength_mm as glasslengthmm,barcode from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
@Insert("insert into storage_task(task_type,task_state,shelf_rack,load_rack)values(#{storage_task},#{task_state},#{shelf_rack},#{load_rack})")
@@ -52,7 +52,7 @@
StorageCage selectOut2(String glassid);
//鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
- @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell}")
+ @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell} and state=1")
int selectGlassState(int cage,int cell);
//鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
@@ -113,7 +113,7 @@
Integer Selectoutstate();
//娣诲姞浠诲姟搴忓垪
//鑾峰彇杩涚墖闃熷垪id
- @Insert("INSERT INTO `canadames`.`queue`(`glassid`, `type`, `state`,width) VALUES (#{glassid},#{type},0,#{width});")
+ @Insert("update queue set glassid=#{glassid},width=#{width} where type=#{type};")
void insertqueue(String glassid,int type,double width);
//鑾峰彇浠诲姟搴忓垪
@Select("select glassid,orderid,width,type from queue where state=#{state}")
@@ -139,14 +139,15 @@
//鑾峰彇杩涚墖闃熷垪id
@Select("select glassid from queue where type=1")
String Selectqueueid();
- //鑾峰彇杩涚墖闃熷垪id
+ //鑾峰彇杩涚墖闃熷垪鏄惁鏈夊緟鍑哄簱
@Select("select state from queue where type=1")
- String Selectqueuestate();
+ int Selectqueuestate();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT * FROM `out_slice` where state=0 or state=0 order by id limit 1;")
+ @Select("SELECT glassid FROM `out_slice` where state=0 order by id limit 1;")
String SelectOutSlice();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
- @Select("SELECT count(*) FROM `out_slice` where state=1 or state=0 order by id limit 1;")
+ @Select("SELECT count(*) FROM `out_slice` where state=1;")
int SelectOutSliceshu();
+
}
\ No newline at end of file
--
Gitblit v1.8.0