From 186432933336d96c19402c5aee61064df4a7390a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:43:09 +0800
Subject: [PATCH] 完成调试

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

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 39f8d2a..52a54cb 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -27,7 +27,7 @@
 
     WrkMast selectPakInStepBarcode(@Param("barcode")String barcode);
 
-    WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
+    List<WrkMast> selectPakInStep11(@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 238f2da..a4d588b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -307,39 +307,41 @@
                 && staProtocol.isPakMk()) {
             News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
             // 鍒ゆ柇閲嶅宸ヤ綔妗�
-            WrkMast wrkMast = wrkMastMapper.selectPakInStep11(1135);
-            if (wrkMast == null) {
+            List<WrkMast> wrkMasts = wrkMastMapper.selectPakInStep11(1135);
+            if (Cools.isEmpty(wrkMasts)) {
                 return;
             }
-            if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
-                News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "宸ヤ綔妗e拰瀹岀粨宸ヤ綔鍙蜂笉鍖归厤锛寋}锛寋}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
-                return;
-            }
-            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
-            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
-                return;
-            }
-            if (!config.getValue().equalsIgnoreCase("1")) {
-                News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "妯″紡涓嶅1");
-                return;
-            }
-            // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
-            // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
-            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
-            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
-            devpThread.setPakMk(staProtocol.getSiteId(), false);
-            boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
-            log.error("杈撻�佺嚎涓嬪彂3锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
-            if (result) {
-                // 鏇存柊宸ヤ綔涓绘。
-                wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
-                wrkMast.setModiTime(new Date());
-                if (wrkMastMapper.updateById(wrkMast) == 0) {
-                    News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗eけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+            for (WrkMast wrkMast : wrkMasts) {
+                if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
+                    News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "宸ヤ綔妗e拰瀹岀粨宸ヤ綔鍙蜂笉鍖归厤锛寋}锛寋}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
+                    continue;
                 }
-            } else {
-                News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 1);
+                Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
+                if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+                    continue;
+                }
+                if (!config.getValue().equalsIgnoreCase("1")) {
+                    News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "妯″紡涓嶅1");
+                    continue;
+                }
+                // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+                // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+                staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+                staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+                devpThread.setPakMk(staProtocol.getSiteId(), false);
+                boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+                log.error("杈撻�佺嚎涓嬪彂3锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
+                if (result) {
+                    // 鏇存柊宸ヤ綔涓绘。
+                    wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
+                    wrkMast.setModiTime(new Date());
+                    if (wrkMastMapper.updateById(wrkMast) == 0) {
+                        News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗eけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+                    }
+                } else {
+                    News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 1);
+                }
             }
 
         } else {
@@ -1276,7 +1278,7 @@
                         }
                         break;
                     }
-                }else {
+                } else {
                     News.watchError(wrkMast.getWrkNo() + "浠诲姟-鍫嗗灈鏈哄嚭搴�", "鍫嗗灈鏈虹珯鐐圭姸鎬侀渶瑕佹弧瓒筹細鑷姩銆佸彲鍑�, 绔欑偣缂栧彿={}", staProtocol.getSiteId());
                 }
             }
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index bd55c06..d6c0036 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -91,7 +91,7 @@
     </select>
 
     <select id="selectPakInStep11" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+        select  * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
     </select>
 
 

--
Gitblit v1.9.1