From 347abab570a0c2e1f7fc30bcb684e0eca148c5bf Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 30 十一月 2023 09:35:42 +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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 61ff339..dd13816 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
@@ -37,7 +37,7 @@
//鑾峰彇鐜荤拑淇℃伅
- @Select("select ordernumber as ordernumber,glasslength_mm as glasslengthmm,barcode from north_glass_buffer1 where barcode=#{glassid}")
+ @Select("select ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
//鍑虹墖浠诲姟鏌ヨ
@@ -109,9 +109,12 @@
//鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
- //鑾峰彇杩涚墖闃熷垪id
- @Insert("update queue set glassid=#{glassid},width=#{width} where type=#{type};")
- void insertqueue(String glassid,int type,double width);
+ //鍒ゆ柇闃熷垪琛ㄦ槸鍚︽湁璇ョ幓鐠�
+ @Select("select COUNT(*) from queue where glassid=#{glassid};")
+ int Selectquecount(String glassid);
+ //鏇存柊杩涚墖闃熷垪
+ @Update("update queue set glassid=#{glassid},orderid=#{orderid},listid=#{listid},boxid=#{boxid},state=#{state},glasswidthmm=#{glasswidthmm},glassheightmm=#{glassheightmm},glasswidth=#{glasswidth},glassheight=#{glassheight} where type=#{type};")
+ void Updatequeue(String glassid,String orderid,String listid,String boxid,int state,String glasswidth,String glassheight,String glasswidthmm,String glassheightmm,int type);
//瀹屾垚杩涚墖闃熷垪浠诲姟
@Update("update queue set state=#{state} where glassid=#{glassid};")
void overqueue(String glassid,int state);
--
Gitblit v1.8.0