From a8698fd74b7e630820f42eb76bd58ce8d22585d1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 06 九月 2023 16:56:49 +0800
Subject: [PATCH] 更新mes逻辑
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 8 ++++----
springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 34 +++++++++++++++++++++++++---------
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
index 4b1da37..0b0e6d2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
@@ -30,27 +30,39 @@
//鍑虹墖浠诲姟
@GetMapping("/all2")
public Result selectdd(String orderid){
-
+ //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout=spianMapper.selectOut(orderid);
- //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
- //鐜荤拑鍐呭鐗�
-
- int cage =cageout.getCage();
+ int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell =cageout.getCell();
int tier =cageout.getTier();
- double width=cageout.getWidth();
+ double glasswidth=cageout.getGlassWidth();
+ //鍒ゆ柇鐜荤拑鍐呭鐗�
if(tier==2){
+ //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
return Result.success("鎵ц鍑虹墖");
}
else{
+ //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state= spianMapper.selectGlassState(cage,cell);
//鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
if(state==0){
return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
}else{
- //鐜荤拑闇�瑕佽皟鎷ㄦ椂
+ //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+ if(cage<6){
+ StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+ }else{
+ StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ StorageCage ca=cagecell;
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+
+ }
- return Result.success("鐘舵�佷负1,闇�瑕佽璋冩嫧");
}
}
@@ -72,13 +84,17 @@
int cages=spianMapper.selectCage(cage1);
//鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夌┖鏍�
StorageCage cages1=spianMapper.selectCage1(cage1);
+ //鏈夊悎閫傜┖鏍兼椂杩涚墖
if(cages>1 &&cages1.getTier()!=null){
+ //鎵ц杩涚墖
return Result.success(cages1);
+ }else{
+ //杩斿洖涓嶅彲杩涚墖
}
}
- return Result.success("0");
+ return Result.success("涓嶅彲杩涚墖");
}
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..c8dc1a5 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,14 +32,14 @@
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);
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
--
Gitblit v1.8.0