From d854b17b4133577fe3e41bdf33f5fc46bfb81fe4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 18 十一月 2024 15:50:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 7 +++++--
1 files changed, 5 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 4c61f44..98f4a83 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -567,10 +567,13 @@
continue;
}
for (LocMast locMastGro1 : locMasts) {
+ if (locMastGro1.getBay1() == 2){
+ continue;
+ }
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
break;
}
- if (locMastGro1.getLocSts().equals("O") || locMastGro1.getLocSts().equals("S")){
+ if (locMastGro1.getLocSts().equals("O")){
locMast = locMastGro1;
break;
}
@@ -667,7 +670,7 @@
break;
}
}
- if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
+ if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
break;
}
if (locMastGro1.getLocSts().equals("O")){
--
Gitblit v1.9.1