From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 03e840e..6903be8 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
@@ -109,6 +109,7 @@
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
//娣诲姞浠诲姟搴忓垪
+ //鑾峰彇杩涚墖闃熷垪id
@Insert("INSERT INTO `canadames`.`queue`(`glassid`, `type`, `state`,width) VALUES (#{glassid},#{type},0,#{width});")
void insertqueue(String glassid,int type,double width);
//鑾峰彇浠诲姟搴忓垪
@@ -132,6 +133,12 @@
//瀵绘壘鍙互澶氱墖鍑虹墖鐨勭幓鐠�
@Select("select cage,cell,ROUND(id/2)as prcId,width,count(glass_id)shu from storage_cage where order_id=#{orderid} and (cage!=#{cage} or cell!=#{cell}) GROUP BY cage,cell HAVING shu=1 ORDER BY cage desc,cell desc limit 1")
StorageCage SelectQueout(String orderid,int cage,int cell);
-
+ //鑾峰彇杩涚墖闃熷垪id
+ @Select("select glassid from queue where type=1 and state=0;")
+ @Select("select glassid from queue where type=1")
+ String Selectqueueid();
+ //鑾峰彇杩涚墖闃熷垪id
+ @Select("select state from queue where type=1")
+ String Selectqueuestate();
}
\ No newline at end of file
--
Gitblit v1.8.0