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/HomeMapper.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 51ed198..730ca3b 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
@@ -106,18 +106,26 @@
   //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
   @Select("select count(*) from storage_cage where glass_id=#{glassId}")
   short SelectStorageByGlassId(String glassId);
+
   //鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅
   @Select("select * from glass where position(#{orderid} in orderid)")
   List<Glass> SelectGlass(String orderid);
+
   //鑾峰彇涓婄墖闃熷垪淇℃伅
   @Select("select gl.* from queue qe inner join glass gl on qe.glassid=gl.glassid where qe.id=#{id}")
   Glass GetQueueInfo(int id);
+
   //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
-  @Select("update queue set glassid=#{glassid},state=0 where id=1")
-  void InsertQueueGlassId(String glassid);
-  //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+  @Select("update queue set glassid=#{glassid},state=1 where id=#{id}")
+  void InsertQueueGlassId(String glassid,Short id);
+
+  //纭鎵爜浣嶇幓鐠冧俊鎭�
   @Select("update queue set state=1 where id=1")
   void UpdateQueueState();
 
+  //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+  @Select("update queue set glassid='' where id=#{id}")
+  void DeleteQueueGlass(String id);
+
   
 }

--
Gitblit v1.8.0