From 26bd94065f7b0b6e8453050ecd4f0a179bf2a090 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 六月 2024 08:10:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ccd7815..2c332e3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -81,12 +81,18 @@
         LocMast locMast = null;
         List<String> groupOuterLoc = Utils.getGroupLocNo(locNo, true);
         if (!Cools.isEmpty(groupOuterLoc)) {
-            for (String loc : groupOuterLoc) {
+            for (int i = 0; i < groupOuterLoc.size(); i ++ ) {
+                String loc = groupOuterLoc.get(i);
                 LocMast tmp = this.selectById(loc);
                 if (tmp == null) {
                     continue;
                 }
 
+                // 娣卞簱浣嶄笉涓虹┖搴撲綅鎴栫┖鏉垮垯娴呭簱浣嶄笉鑳芥斁
+                if (i == 0 && (!tmp.getLocSts().equals("O") && !tmp.getLocSts().equals("D"))){
+                    break;
+                }
+
                 if (tmp.getLocSts().equals("O")) {
                     locMast = tmp;
                     break;

--
Gitblit v1.9.1