From 785aeaf363da16440554d67e9a3ded6ecf157ad4 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 10 三月 2023 11:01:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   11 +++++++----
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java         |    1 +
 src/main/resources/mapper/WrkMastMapper.xml                 |    7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 25c8a20..e2804a1 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -94,4 +94,5 @@
 
     List<WrkMast> selectAll(@Param("staNo")Integer staNo);
 
+    WrkMast selectAllC();
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ca71a2d..0380f0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -725,14 +725,14 @@
                         .eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
                 for (LocMast locMast1:locMasts){
                     if (locMast1.getRow1()>locMast.getRow1()){
-                        if (!locMast1.getLocSts().equals("F")){
+                        if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
                             if (!locMast1.getLocSts().equals("X")){
                                 sign=true;
                                 break;
                             }
                         }
                     }else if (locMast1.getRow1()<locMast.getRow1()){
-                        if (locMast1.getLocSts().equals("F")){
+                        if (locMast1.getLocSts().equals("F") || locMast1.getLocSts().equals("D")){
                             News.error("褰撳墠宸ヤ綔妗ｇ洰鏍囧簱浣嶆墍鍦ㄦ帓鍓嶈竟瀛樺湪璐х墿锛�", wrkMast.getWrkNo());
                             sign=true;
                             break;
@@ -744,13 +744,13 @@
                         .eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
                 for (LocMast locMast1:locMasts){
                     if (locMast1.getRow1()>locMast.getRow1()){
-                        if (locMast1.getLocSts().equals("F")){
+                        if (locMast1.getLocSts().equals("F") || locMast1.getLocSts().equals("D")){
                             News.error("褰撳墠宸ヤ綔妗ｇ洰鏍囧簱浣嶆墍鍦ㄦ帓鍓嶈竟瀛樺湪璐х墿锛�", wrkMast.getWrkNo());
                             sign=true;
                             break;
                         }
                     }else if (locMast1.getRow1()<locMast.getRow1()){
-                        if (!locMast1.getLocSts().equals("F")){
+                        if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
                             if (!locMast1.getLocSts().equals("X")){
                                 sign=true;
                                 break;
@@ -2585,6 +2585,9 @@
      */
     @SuppressWarnings("serial")
     public synchronized void loopSteCharge() {
+        if (!Cools.isEmpty(wrkMastMapper.selectAllC())){
+            return;
+        }
         if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
             return;
         }
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e395995..f098ac4 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -196,6 +196,13 @@
         and source_sta_no=#{staNo}
     </select>
 
+    <select id="selectAllC" resultMap="BaseResultMap">
+        select top 1 *
+        from dbo.asr_wrk_mast where 1=1
+        and wrk_sts!=1 and wrk_sts!=11
+        and wrk_sts!=18 and wrk_sts!=9 and wrk_sts &lt; 20 and io_type!=11
+    </select>
+
     <select id="selectPakinWorkingByGroupLoc" resultMap="BaseResultMap">
         select top 1 *
         from dbo.asr_wrk_mast

--
Gitblit v1.9.1