From e3c9aa6bbf449ec27cd5f037045418d355d0580e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 14:35:21 +0800
Subject: [PATCH] #bug修复

---
 src/main/java/com/zy/asrs/utils/Utils.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 34f89db..6d3f5ca 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -800,10 +800,10 @@
     }
 
     /**
-     * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+     * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丱
      * 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
      */
-    public static boolean checkInsideLocIsDFX2(String locNo) {
+    public static boolean checkInsideLocIsDFXO(String locNo) {
         LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
         List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
         if (insideLoc.size() > 0) {
@@ -811,8 +811,9 @@
             for (LocMast mast : insideLocMast) {
                 if (!mast.getLocSts().equals("D")
                         && !mast.getLocSts().equals("F")
+                        && !mast.getLocSts().equals("O")
                         && !mast.getLocSts().equals("X")) {
-                    //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+                    //D銆丗銆乆銆丱(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
                     return true;
                 }
             }

--
Gitblit v1.9.1