From e9ad9d2e525ba7693bb088b0b635a3b17b5378ba Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 16:52:53 +0800
Subject: [PATCH] 2023.06.02兼容代码，后期库位规则符合要求后可删除（优化）
---
src/main/java/com/zy/common/service/CommonService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ec3e5dc..e2be8c9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -212,10 +212,16 @@
wrapper.eq("loc_type1", locTypeDto.getLocType1());
wrapper.in("crn_no", "1,2");
wrapper.eq("loc_sts", "O");
- locMast = locMastService.selectOne(wrapper);
- if (locMast != null) {
+ List<LocMast> locMasts = locMastService.selectList(wrapper);
+ for (LocMast mast : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
//鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ return getLocNoFinalStep(staDescId, sourceStaNo, mast);//杩斿洖dto
}
//----------------2023.06.02鍏煎浠ｇ爜end---------------------
--
Gitblit v1.9.1