From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index da624a0..b1b0e1d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -124,7 +124,7 @@
             value= (String) param.get(s);
         }
         LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
-        if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("F")){
+        if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("D")||loc_no.getLocSts().equals("F")){
             EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
             convert(param, wrapper);
             allLike(LocDetl.class, param.keySet(), wrapper, condition);

--
Gitblit v1.9.1