From 835bd18ad7f74192f96e83d85c358a7d9aa6b559 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 05 九月 2023 14:14:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/FireOutHandler.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index 05efc88..04e0a88 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -43,7 +43,10 @@
         try {
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("fire_status", 1)
-                    .eq("loc_sts", "F"));
+                    .andNew()
+                    .eq("loc_sts", "F")
+                    .or()
+                    .eq("loc_sts", "R"));
             Integer ioType = 101;   //鍑哄簱
             Date now = new Date();
             //浼樺厛绾�99锛岀Щ搴撳埌0102501
@@ -107,6 +110,8 @@
                     if (!locMastService.updateById(locMast)) {
                         throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
                     }
+                }else if(locMast.getLocSts().equals("R")){
+
                 } else {
                     throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
                 }

--
Gitblit v1.9.1