From 29443551704a4f81cfc20ed9b75de5393b8b0944 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 21 三月 2026 17:41:02 +0800
Subject: [PATCH] 优化找库位规则

---
 src/main/java/com/zy/common/service/CommonService.java |    5 ++++-
 1 files changed, 4 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..819e6e9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -793,8 +793,11 @@
                 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