From b5e9330891f269ad3b116d39dd600855aecffe2f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 九月 2023 09:00:10 +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                 |   20 ++++++++++++++++++++
 src/main/resources/application.yml                          |    4 ++--
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 3a8460f..7272427 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -121,6 +121,7 @@
     List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
     List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour);
     List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour);
+    Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour);
 
     WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
     WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
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 9501ae7..e4f6bc6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1263,6 +1263,17 @@
                 continue;
             }
 
+            /*
+             * 100銆�200瀛樺湪杩涜涓殑鐩樼偣浠诲姟锛屽垯涓嶆墽琛岀洏鐐逛换鍔�
+             * */
+            if (wrkMast.getIoType().equals(107)){
+                Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
+                if (countPan!=0){
+                    News.error("MainServiceImpl  locToCrnStn 1271琛�"+"鐩樼偣鍑哄簱璺宠繃锛屽瓨鍦ㄨ繘琛屼腑鍙兘鍫靛浠诲姟鏁皗}涓�",countPan);
+                    continue;
+                }
+            }
+
             // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
             SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
             StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aa11a99..0a12aa1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
-#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
     #    password: Zoneyung@zy56$
     password: sa@123
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e32d850..4ab2dfa 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -221,6 +221,26 @@
 
     </select>
 
+    <select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer">
+        select count (*) from dbo.asr_wrk_mast where 1=1
+        and
+        (
+        <choose>
+            <when test="sour &lt; 200">
+                (wrk_sts > 11 and wrk_sts &lt; 15 and source_sta_no &lt; 200 and io_type > 101 and io_type &lt; 110)
+                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; 15 and source_sta_no > 200 and io_type > 101 and io_type &lt; 110)
+                or
+                (wrk_sts &lt; 3 and sta_no > 200 and io_type &lt; 100 and io_type > 9 and io_type != 11)
+            </otherwise>
+        </choose>
+        )
+
+    </select>
+
     <select id="selectWrkStsAndIoType1" resultMap="BaseResultMap">
         select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and io_type=101
         <if test="sour > 200">

--
Gitblit v1.9.1