From b3bddb829879019eecd1b58b1f827d152974aade Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期五, 15 十一月 2024 12:44:03 +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