From 3c89060b69da83e336bbf784fe6031f425cb1871 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 26 九月 2023 20:13:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 693a545..f55d534 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -129,6 +129,13 @@
// 鐩爣搴撲綅
LocMast locMast = null;
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ locMast = getLocNoStep4(staDescId, locTypeDto);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
//搴撲綅瑙勫垯
locMast = getLocNoStepRule(matNos, locTypeDto);
if (locMast != null) {
@@ -138,13 +145,6 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
locMast = getLocNoStep3(staDescId, matNos, locTypeDto);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- locMast = getLocNoStep4(staDescId, locTypeDto);
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
@@ -259,7 +259,7 @@
}
if (Cools.isEmpty(locMast)){
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D"));
+ .eq("loc_sts", "O"));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
--
Gitblit v1.9.1