From 0245612378ff186c1957952acf182a1d2e9b88d2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 04 八月 2023 08:59:21 +0800
Subject: [PATCH] #组托过滤同库位
---
src/main/java/com/zy/common/service/CommonService.java | 13 +++++++++----
1 files changed, 9 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 a0f4f87..62637a9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -449,12 +449,17 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- //鍒ゆ柇鏄惁闇�瑕佺Щ搴�
-
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount0(locMast0, 2)) {
+ Integer outermostRow = Utils.getOutermostRow(locMast0.getLocNo(), true);
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", outermostRow).eq("bay1", locMast0.getBay1()).eq("lev1", locMast0.getLev1()));
+ if (!locMast1.getLocSts().equals("O") && !locMast0.getRow1().equals(outermostRow)){
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount0(locMast0, 5)) {
+ locMast = locMast0;
+ }
+ }else {
locMast = locMast0;
}
+
}
}
}
--
Gitblit v1.9.1