From d0e719bd6bb8d2a840211d60efbb46b83d77455d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 九月 2023 09:51:54 +0800
Subject: [PATCH] 添加玻璃尺寸不在范围内的提示并不允许上片
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 20 ++++++++++++++++----
1 files changed, 16 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 e86cd52..05b5daf 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,15 +61,18 @@
//淇敼绗煎瓙淇℃伅(杩涚墖)
@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);
+ //淇敼鍚岀瀛愭牸瀛愬搴�
+ @Update("update storage_cage set state=#{state} where state=#{oldstate};")
+ void UpdataAddCageState(int state,int oldstate);
//淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
@Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
void UpdataOutCage1(double width,int cage,int cell);
//璋冩嫧鏇存崲绗煎瓙淇℃伅
- @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1 where a.id=#{id1}")
+ @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth where a.id=#{id1}")
void UpdateDBCage(int id1,int cage,int cell);
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
@@ -92,4 +97,11 @@
//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
@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);
+ //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+ @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
+ Integer Selectoutstate();
}
+
\ No newline at end of file
--
Gitblit v1.8.0