From fb031cfeb03cb20c95c78fcccf9ba93c5dd5d798 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期六, 18 五月 2024 20:38:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 43865c8..da9f631 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -238,7 +238,7 @@
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ String shallowLocNo = Utils.getShallowLoc5(slaveProperties, locNo,whsType);
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
@@ -277,7 +277,7 @@
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ String shallowLocNo = Utils.getShallowLoc5(slaveProperties, loc.getLocNo(),whsType);
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
@@ -338,7 +338,7 @@
continue;
}
if (Utils.BooleanWhsTypeStaIoType(whsType)){
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ String shallowLoc = Utils.getDeepLoc5(slaveProperties, locMast1.getLocNo(),whsType);
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "O"));
if (!Cools.isEmpty(locMast2)) {
@@ -359,7 +359,7 @@
continue;
}
if (Utils.BooleanWhsTypeStaIoType(whsType)){
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ String shallowLoc = Utils.getDeepLoc5(slaveProperties, locMast1.getLocNo(),whsType);
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "O"));
if (!Cools.isEmpty(locMast2)) {
--
Gitblit v1.9.1