From 1d806a95e30b2d1861c14b7db7cf6c83f5a6d41f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期日, 17 九月 2023 17:54:00 +0800
Subject: [PATCH] 增加派发id

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 e86cd52..3858c8f 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
@@ -9,6 +9,8 @@
 
 import java.util.List;
 
+import javax.print.DocFlavor.STRING;
+
 @Mapper
 
 public interface SpianMapper {
@@ -33,13 +35,13 @@
      void  update();
      //鑾峰彇鐜荤拑淇℃伅
      @Select("select orderid,width from glass where glassid=#{glassid}")
-     Glass selectGlass(Short glassid);
+     Glass 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})")
      void insert(StorageTask storageTask);
     
     //鍑虹墖浠诲姟鏌ヨ
-    @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
+    @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id,glass_id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
      StorageCage selectOut(String  orderId);
     //鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
     @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
@@ -59,7 +61,7 @@
 
     //淇敼绗煎瓙淇℃伅(杩涚墖)
     @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
-    void UpdataAddCage(Short orderid,Short glassid,double width,int cage,int cell,int id,int state);
+    void UpdataAddCage(Short orderid,String glassid,double width,int cage,int cell,int id,int state);
     //淇敼鍚岀瀛愭牸瀛愬搴�
      @Update("update storage_cage set width=width-#{width} where   cage=#{cage} and cell=#{cell};")
     void UpdataAddCage1(double width,int cage,int cell);
@@ -92,4 +94,7 @@
     //鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
     @Select("select COUNT(*)as id,glass_id from storage_task where (task_type=1 or task_type=2) and task_state=0;")
     Glass SelectDBOut();
+    //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+     @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
+     String SelectGlassid(int cage,int cell);
 }

--
Gitblit v1.8.0