From 2feeab89a8c715b245b421a364713e3cc041a150 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 14:21:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..15c7957 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;
                     }

--
Gitblit v1.9.1