From d4f51021f6232c31b63c9ea3a628ccdc156378f3 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期三, 10 七月 2024 16:18:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9589f10..2ed3944 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -335,11 +335,14 @@
.eq("row1", nearRow)
.eq("loc_sts", "O")
.orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
+ System.out.println("00000000000000000000whsType:"+whsType);
+
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ System.out.println("111111111111111whsType:"+whsType);
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "O"));
@@ -348,6 +351,7 @@
break;
}
} else {
+ System.out.println("22222222222222222222whsType:"+whsType);
if (!Cools.isEmpty(locMast1)) {
locMast = locMast1;
break;
@@ -371,13 +375,13 @@
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "D"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
}
}
--
Gitblit v1.9.1