From 68d56160c32384f8d939df0bd25bdc9c50b042b9 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 30 十月 2023 11:08:04 +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 | 4 +++- 1 files changed, 3 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..0ed5faa 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 @@ -132,6 +132,8 @@ //瀵绘壘鍙互澶氱墖鍑虹墖鐨勭幓鐠� @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;") + String Selectqueueid(); } \ No newline at end of file -- Gitblit v1.8.0