From a99b88095349c58bb019dbf39f1ac91273da549c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 30 一月 2023 16:26:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 406773f..81787fd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -360,8 +360,12 @@
List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
for (LocMast locMast2:locMasts1){
- if (locMast2.getRow1().equals(innermostRow)) {
- locMast = locMast2;
+ if (locMast2.getLocSts().equals("O")){
+ if (locMast2.getRow1().equals(innermostRow)) {
+ locMast = locMast2;
+ break;
+ }
+ }else if (!locMast2.getLocSts().equals("F")){
break;
}
}
--
Gitblit v1.9.1