From 7ddcebfb15b4448176f0374858911be72249749a Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 25 十月 2023 09:48:37 +0800
Subject: [PATCH] #

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

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 3096cc0..90d4f61 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1297,7 +1297,7 @@
                     Integer sour = wrkMast.getSourceStaNo();
                     List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType0(sour);
                     if (wrkMasts.size() > 0){
-                        News.error("MainServiceImpl  1028琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
+                        News.error("MainServiceImpl  1300琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
                         return false;
                     }
 
@@ -1306,7 +1306,7 @@
                             .eq("sta_no",300)
                             .last(" and wrk_sts>11 and io_type in (103,107) "));
                     if(!Cools.isEmpty(one)){
-                        News.error("MainServiceImpl  1099琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
+                        News.error("MainServiceImpl  1309琛�"+"瀛樺湪鎹℃枡銆佺洏鐐规湭鍏ュ簱璐х墿锛�2鍙峰爢鍨涙満鏆傛椂绂佹鍑哄簱锛侊紒锛�");
                         continue;
                     }
                 }
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d638ef9..8320f44 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -223,18 +223,22 @@
 
     <select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer">
         select count (*) from dbo.asr_wrk_mast where 1=1
-        and work_no!=#{workNo}
+        and wrk_no!=#{workNo}
         and
         (
         <choose>
             <when test="sour &lt; 200">
                 (wrk_sts > 11 and wrk_sts &lt; 18 and source_sta_no &lt; 200 and io_type > 101 and io_type &lt; 110)
                 or
+                (wrk_sts = 11 and source_sta_no &lt; 200 and io_type > 101 and io_type &lt; 110 and ste_no is not null)
+                or
                 (wrk_sts &lt; 3 and sta_no &lt; 200 and io_type &lt; 100 and io_type > 9 and io_type != 11 )
             </when>
             <otherwise>
                 (wrk_sts > 11 and wrk_sts &lt; 18 and source_sta_no > 200 and io_type > 101 and io_type &lt; 110)
                 or
+                (wrk_sts = 11 and source_sta_no > 200 and io_type > 101 and io_type &lt; 110 and ste_no is not null)
+                or
                 (wrk_sts &lt; 3 and sta_no > 200 and io_type &lt; 100 and io_type > 9 and io_type != 11)
             </otherwise>
         </choose>

--
Gitblit v1.9.1