From b9dc5699e4e999bd8f40ef1025791d9e18a074f4 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 26 十二月 2025 14:38:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..cf5f7e8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1070,7 +1070,7 @@
int endBay = 19;
switch (findLocNoAttributeVo.getOutArea()) {
- case 1:
+ case 3:
startBay = 15;
endBay = 19;
break;
@@ -1078,7 +1078,7 @@
startBay = 8;
endBay = 14;
break;
- case 3:
+ case 1:
startBay = 1;
endBay = 8;
break;
@@ -1104,15 +1104,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