From fe3b6f1f3163be94496e5d5e72654f22ae131245 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 21 三月 2026 15:40:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a8e9e1c..6ad81dc 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1046,31 +1046,46 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- if (Cools.isEmpty(locMast) && sourceStaNo != 4006) {//si'lou'p鍥涙ゼ鐩樼偣閫夋嫨鍖哄煙
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", true)); // 鏈�娴呭簱浣�
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
- locMast = locMast2;
+ if (Cools.isEmpty(locMast) && sourceStaNo != 4006 && sourceStaNo != 2033 ) {//si'lou'p鍥涙ゼ鐩樼偣閫夋嫨鍖哄煙
+ for(int row = 21; row <= 25; row++){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", row)
+ .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .orderBy("lev1", true).orderBy("bay1", true)); // 鏈�娴呭簱浣�
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ if(locMast1!= null){
+ locMast = locMast1;
break;
}
}
}
- } else {
+
+ }else if(Cools.isEmpty(locMast) && sourceStaNo != 4006){
+ for(int row = 28; row <= 31; row++){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", row)
+ .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .orderBy("lev1", true).orderBy("bay1", true)); // 鏈�娴呭簱浣�
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ if(locMast1!= null){
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+ }else {
// 鏍规嵁 findLocNoAttributeVo.getOutArea() 璁剧疆鍒楄寖鍥�
int startBay = 1;
int endBay = 19;
switch (findLocNoAttributeVo.getOutArea()) {
- case 1:
+ case 3:
startBay = 15;
endBay = 19;
break;
@@ -1078,7 +1093,7 @@
startBay = 8;
endBay = 14;
break;
- case 3:
+ case 1:
startBay = 1;
endBay = 8;
break;
@@ -1104,15 +1119,20 @@
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
- locMast = locMast2;
- found = true;
- break;
- }
+ if(locMast1!= null){
+ locMast = locMast1;
+ found = true;
+ break;
}
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+// // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+// if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
+// locMast = locMast2;
+// found = true;
+// break;
+// }
+// }
}
if (found) {
--
Gitblit v1.9.1