From b381767ad6eb57f1dfe0068f1cc1241d53786322 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 05 十二月 2025 19:02:44 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2
src/main/java/com/zy/common/service/CommonService.java | 92 +++++++++++++++++++++++++++++-----------------
2 files changed, 59 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index da0787a..e798da5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -40,7 +40,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 5;
}
/*
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 78391a3..78ef044 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -514,6 +514,30 @@
List<LocMast> locMasts = new ArrayList<>();
List<LocMast> locMastsLow2 = new ArrayList<>();
List<LocMast> locMastsLow3 = new ArrayList<>();
+
+ LocMast locMastLow = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100101"));
+ LocMast locMastMid = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100108"));
+ LocMast locMastHigh = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100111"));
+ LocMast locMastHighest = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100113"));
+ if (locMastService.checkEmptyCount(locMastLow)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",1));
+ }else {
+ if (locMastService.checkEmptyCount(locMastMid)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",2));
+
+ }else {
+ if (locMastService.checkEmptyCount(locMastHigh)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",5));
+ }else {
+ if (locMastService.checkEmptyCount(locMastHighest)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",6));
+ }else {
+ throw new CoolException("鏃犵┖搴撲綅鍙敤");
+ }
+ }
+ }
+ }
+
// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
// if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
@@ -561,37 +585,37 @@
- locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
- .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
- locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
- .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
- if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
- .eq("loc_sts", "O").ge("lev1",8));
- if (Cools.isEmpty(locMasts)){
- if (nearRow == 2){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
- .eq("loc_sts", "O").ge("lev1",8));
- }else if (nearRow == 3){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
- .eq("loc_sts", "O").ge("lev1",8));
-
- }
- }
- }else {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
- .eq("loc_sts", "O"));
- if (Cools.isEmpty(locMasts)){
- if (nearRow == 2){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
- .eq("loc_sts", "O"));
- }else if (nearRow == 3){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
- .eq("loc_sts", "O"));
-
- }
- }
- }
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
+// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
+// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+// if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O").ge("lev1",8));
+// if (Cools.isEmpty(locMasts)){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O").ge("lev1",8));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O").ge("lev1",8));
+//
+// }
+// }
+// }else {
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O"));
+// if (Cools.isEmpty(locMasts)){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O"));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O"));
+//
+// }
+// }
+// }
@@ -617,9 +641,9 @@
//
// }
// }
- if (locMasts.size() <= 5){
- throw new CoolException("鏃犵┖搴撲綅鍙敤");
- }
+// if (locMasts.size() <= 5){
+// throw new CoolException("鏃犵┖搴撲綅鍙敤");
+// }
List<LocMast> locMastList = new ArrayList<>();
locMasts.sort(new Comparator<LocMast>() {
@Override
--
Gitblit v1.9.1