From 6599114495a190322f93b65e4124c31d50953a12 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 26 十月 2022 10:57:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 8482b74..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;
@@ -127,8 +136,10 @@
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || excludeLocNos.contains(locMast.getLocNo())) {
- continue;
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ if (!excludeLocNos.contains(locMast.getLocNo())) {
+ continue;
+ }
}
iterator.remove();
}
--
Gitblit v1.9.1