From 779270b1473023b3733767fb429cd07513b01ea4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 19 十月 2022 14:27:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 2b08e21..23ce15a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -111,10 +111,19 @@
 //        ) {
 //            locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
 //        }
-        for (String locNo : locNos) {
-            LocMast locMast = this.selectById(locNo);
+        for (int i = 0; i<locNos.size(); i++) {
+            LocMast locMast = this.selectById(locNos.get(i));
             if (locMast.getLocSts().equals("O")) {
-                return locMast;
+                if (i == 0) {
+                    return locMast;
+                } else {
+                    LocMast lastLoc = this.selectById(locNos.get(i - 1));
+                    if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D")  || lastLoc.getLocSts().equals("X")) {
+                        return locMast;
+                    } else {
+                        break;
+                    }
+                }
             }
         }
         return null;

--
Gitblit v1.9.1