From 477b4071ccf45b6d15280d37a4a002307aa2271c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 九月 2023 17:11:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 1f08e10..f9f24bf 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
@@ -32,15 +32,17 @@
void insert(StorageTask storageTask);
//鍑虹墖浠诲姟鏌ヨ
- @Select("select cage,cell,tier 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 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);
//鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
@Select("select state from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
int selectGlassState(int cage,int cell);
- //鍒ゆ柇
- @Select("select cage,cell,max(state)as shu from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0;")
- int selectGlassCage(double width,int cage1,int cage2);
-
+ //鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
+ @Select("select cage,cell,max(state)as shu from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
+ StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
+ //淇敼绗煎瓙淇℃伅(杩涚墖)
+ @Update("update storage_cage set state=1,width=width #{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{glasswidth} where cage=#{cage} and cell=#{cell} and tier=#{tier}");
+
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
--
Gitblit v1.8.0