From fed38e8a453ff56691555d9a34dd65d8ff1f5e4c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 21 三月 2026 17:48:23 +0800
Subject: [PATCH] 优化找库位规则
---
src/main/java/com/zy/common/service/CommonService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 68548cb..95363ed 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -793,8 +793,13 @@
locTypeDto == null || locTypeDto.getLocType1() == null ? null : locTypeDto.getLocType1().intValue(),
findLocNoAttributeVo == null ? null : findLocNoAttributeVo.getMatnr());
if (!Cools.isEmpty(stationCrnLocTypes)) {
- return findRun2EmptyLocByCrnLocTypeEntries(rowLastno, rowLastnoType, stationCrnLocTypes,
+ // 绔欑偣浼樺厛绾у彧鏄�滀紭鍏堝皾璇曗�濓紝娌℃湁鍛戒腑鏃跺繀椤荤户缁蛋榛樿/搴撳尯鍥為��锛�
+ // 鍚﹀垯浼氭妸鈥滀紭鍏堝�欓�夋棤浣嶁�濊鍒ゆ垚鈥滄暣浠撴棤浣嶁�濄��
+ LocMast locMast = findRun2EmptyLocByCrnLocTypeEntries(rowLastno, rowLastnoType, stationCrnLocTypes,
locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "station-priority");
+ if (!Cools.isEmpty(locMast)) {
+ return locMast;
+ }
}
if (preferredArea == null) {
List<Integer> defaultCrnNos = new ArrayList<>(orderedCrnNos);
--
Gitblit v1.9.1