From 82f5a3c1fdcfcde25c20805feea64e5a3c315201 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 十一月 2024 14:12:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index febd971..47d85bf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -567,10 +567,17 @@
continue;
}
for (LocMast locMastGro1 : locMasts) {
- if ((locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14) && mixture){
- continue;
+ if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
+ if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
+ continue;
+ }
+ }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
+ if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
+ continue;
+ }
}
- if (locMastGro1.getBay1() == 2){
+
+ if (locMastGro1.getBay1() == 2){ //wcs闂闄愬埗
continue;
}
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
--
Gitblit v1.9.1