From 4a1aabe58c417352b62504255603f790b0a6228b Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期五, 30 一月 2026 15:37:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java |  636 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 328 insertions(+), 308 deletions(-)

diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index b3c63d3..627d207 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -46,203 +46,7 @@
 
     //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
     public synchronized void stationInExecute() {
-        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
-        for (BasDevp basDevp : basDevps) {
-            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
-            if(stationThread == null){
-                continue;
-            }
-
-            Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
-
-            List<StationObjModel> list = basDevp.getBarcodeStationList$();
-            for (StationObjModel entity : list) {
-                Integer stationId = entity.getStationId();
-                if(!stationMap.containsKey(stationId)){
-                    continue;
-                }
-
-                StationProtocol stationProtocol = stationMap.get(stationId);
-                if (stationProtocol == null) {
-                    continue;
-                }
-
-                Object lock = redisUtil.get(RedisKeyType.STATION_IN_EXECUTE_LIMIT.key + stationId);
-                if(lock != null){
-                    continue;
-                }
-
-                //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙�
-                if (stationProtocol.isAutoing()
-                        && stationProtocol.isLoading()
-                        && stationProtocol.getTaskNo() > 0
-                ) {
-                    //妫�娴嬩换鍔℃槸鍚︾敓鎴�
-                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
-                    if (wrkMast == null) {
-                        continue;
-                    }
-
-                    if (wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts) {
-                        continue;
-                    }
-
-                    String locNo = wrkMast.getLocNo();
-                    FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
-                    if (findCrnNoResult == null) {
-                        News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鏈尮閰嶅埌鍫嗗灈鏈�", wrkMast.getWrkNo());
-                        continue;
-                    }
-
-                    Integer targetStationId = commonService.findInStationId(findCrnNoResult, stationId);
-                    if (targetStationId == null) {
-                        News.taskInfo(wrkMast.getWrkNo(), "{}绔欑偣,鎼滅储鍏ュ簱绔欑偣澶辫触", stationId);
-                        continue;
-                    }
-
-                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationId, targetStationId, 0);
-                    if(command == null){
-                        News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", wrkMast.getWrkNo());
-                        continue;
-                    }
-
-                    wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
-                    wrkMast.setSourceStaNo(stationProtocol.getStationId());
-                    wrkMast.setStaNo(targetStationId);
-                    wrkMast.setSystemMsg("");
-                    wrkMast.setIoTime(new Date());
-                    if (wrkMastService.updateById(wrkMast)) {
-                        MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
-                        News.info("杈撻�佺珯鐐瑰叆搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationId, wrkMast.getWrkNo(), JSON.toJSONString(command));
-                        redisUtil.set(RedisKeyType.STATION_IN_EXECUTE_LIMIT.key + stationId, "lock", 5);
-                    }
-                }
-            }
-        }
-    }
-
-    //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
-    public synchronized void crnStationOutExecute() {
-        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
-                .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
-                .isNotNull("crn_no")
-        );
-        for (WrkMast wrkMast : wrkMasts) {
-            Object infoObj = redisUtil.get(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
-            if (infoObj == null) {
-                News.info("鍑哄簱浠诲姟{}鏁版嵁缂撳瓨涓嶅瓨鍦�", wrkMast.getWrkNo());
-                continue;
-            }
-
-            StationObjModel stationObjModel = JSON.parseObject(infoObj.toString(), StationObjModel.class);
-            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
-            if(stationThread == null){
-                continue;
-            }
-
-            Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
-            StationProtocol stationProtocol = stationMap.get(stationObjModel.getStationId());
-            if (stationProtocol == null) {
-                continue;
-            }
-
-            Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId());
-            if (lock != null) {
-                continue;
-            }
-
-            //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿0
-            if (stationProtocol.isAutoing()
-                    && stationProtocol.isLoading()
-                    && stationProtocol.getTaskNo() == 0
-            ) {
-                StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
-                if(command == null){
-                    News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
-                    continue;
-                }
-
-                wrkMast.setWrkSts(WrkStsType.STATION_RUN.sts);
-                wrkMast.setSystemMsg("");
-                wrkMast.setIoTime(new Date());
-                if (wrkMastService.updateById(wrkMast)) {
-                    MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
-                    News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
-                    redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
-                    redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60 * 5);
-                    redisUtil.del(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
-                }
-            }
-        }
-    }
-
-    //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
-    public synchronized void dualCrnStationOutExecute() {
-        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
-                .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
-                .isNotNull("dual_crn_no")
-        );
-        for (WrkMast wrkMast : wrkMasts) {
-            Object infoObj = redisUtil.get(RedisKeyType.DUAL_CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
-            if (infoObj == null) {
-                News.info("鍑哄簱浠诲姟{}鏁版嵁缂撳瓨涓嶅瓨鍦�", wrkMast.getWrkNo());
-                continue;
-            }
-
-            StationObjModel stationObjModel = JSON.parseObject(infoObj.toString(), StationObjModel.class);
-            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
-            if(stationThread == null){
-                continue;
-            }
-
-            Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
-            StationProtocol stationProtocol = stationMap.get(stationObjModel.getStationId());
-            if (stationProtocol == null) {
-                continue;
-            }
-
-            Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId());
-            if (lock != null) {
-                continue;
-            }
-
-            //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿0
-            if (stationProtocol.isAutoing()
-                    && stationProtocol.isLoading()
-                    && stationProtocol.getTaskNo() == 0
-            ) {
-                StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
-                if(command == null){
-                    News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
-                    continue;
-                }
-
-                wrkMast.setWrkSts(WrkStsType.STATION_RUN.sts);
-                wrkMast.setSystemMsg("");
-                wrkMast.setIoTime(new Date());
-                if (wrkMastService.updateById(wrkMast)) {
-                    MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
-                    News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
-                    redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
-                    redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60 * 5);
-                    redisUtil.del(RedisKeyType.DUAL_CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
-                }
-            }
-        }
-    }
-
-    //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
-    public synchronized void stationOutExecuteFinish() {
-        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
-        for (WrkMast wrkMast : wrkMasts) {
-            Integer wrkNo = wrkMast.getWrkNo();
-
-            Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkNo);
-            if (lock != null) {
-                continue;
-            }
-
-            boolean complete = true;
+        try {
             List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
             for (BasDevp basDevp : basDevps) {
                 StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -250,152 +54,368 @@
                     continue;
                 }
 
-                List<StationProtocol> list = stationThread.getStatus();
-                for (StationProtocol stationProtocol : list) {
-                    if (stationProtocol.getTaskNo().equals(wrkNo)) {
-                        complete = false;
+                Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+
+                List<StationObjModel> list = basDevp.getBarcodeStationList$();
+                for (StationObjModel entity : list) {
+                    Integer stationId = entity.getStationId();
+                    if (!stationMap.containsKey(stationId)) {
+                        continue;
+                    }
+
+                    StationProtocol stationProtocol = stationMap.get(stationId);
+                    if (stationProtocol == null) {
+                        continue;
+                    }
+
+                    Object lock = redisUtil.get(RedisKeyType.STATION_IN_EXECUTE_LIMIT.key + stationId);
+                    if (lock != null) {
+                        continue;
+                    }
+
+                    //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙�
+                    if (stationProtocol.isAutoing()
+                            && stationProtocol.isLoading()
+                            && stationProtocol.getTaskNo() > 0
+                    ) {
+                        //妫�娴嬩换鍔℃槸鍚︾敓鎴�
+                        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+                        if (wrkMast == null) {
+                            continue;
+                        }
+
+                        if (wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts) {
+                            continue;
+                        }
+
+                        String locNo = wrkMast.getLocNo();
+                        FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
+                        if (findCrnNoResult == null) {
+                            News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鏈尮閰嶅埌鍫嗗灈鏈�", wrkMast.getWrkNo());
+                            continue;
+                        }
+
+                        Integer targetStationId = commonService.findInStationId(findCrnNoResult, stationId);
+                        if (targetStationId == null) {
+                            News.taskInfo(wrkMast.getWrkNo(), "{}绔欑偣,鎼滅储鍏ュ簱绔欑偣澶辫触", stationId);
+                            continue;
+                        }
+
+                        StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationId, targetStationId, 0);
+                        if (command == null) {
+                            News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", wrkMast.getWrkNo());
+                            continue;
+                        }
+
+                        wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
+                        wrkMast.setSourceStaNo(stationProtocol.getStationId());
+                        wrkMast.setStaNo(targetStationId);
+                        wrkMast.setSystemMsg("");
+                        wrkMast.setIoTime(new Date());
+                        if (wrkMastService.updateById(wrkMast)) {
+                            MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+                            News.info("杈撻�佺珯鐐瑰叆搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationId, wrkMast.getWrkNo(), JSON.toJSONString(command));
+                            redisUtil.set(RedisKeyType.STATION_IN_EXECUTE_LIMIT.key + stationId, "lock", 5);
+                        }
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-            if (complete) {
-                wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
-                wrkMast.setIoTime(new Date());
-                wrkMastService.updateById(wrkMast);
+    //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
+    public synchronized void crnStationOutExecute() {
+        try {
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
+                    .isNotNull("crn_no")
+            );
+            for (WrkMast wrkMast : wrkMasts) {
+                Object infoObj = redisUtil.get(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
+                if (infoObj == null) {
+                    News.info("鍑哄簱浠诲姟{}鏁版嵁缂撳瓨涓嶅瓨鍦�", wrkMast.getWrkNo());
+                    continue;
+                }
+
+                StationObjModel stationObjModel = JSON.parseObject(infoObj.toString(), StationObjModel.class);
+                StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
+                if (stationThread == null) {
+                    continue;
+                }
+
+                Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+                StationProtocol stationProtocol = stationMap.get(stationObjModel.getStationId());
+                if (stationProtocol == null) {
+                    continue;
+                }
+
+                Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId());
+                if (lock != null) {
+                    continue;
+                }
+
+                //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿0
+                if (stationProtocol.isAutoing()
+                        && stationProtocol.isLoading()
+                        && stationProtocol.getTaskNo() == 0
+                ) {
+                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
+                    if (command == null) {
+                        News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+                        continue;
+                    }
+
+                    wrkMast.setWrkSts(WrkStsType.STATION_RUN.sts);
+                    wrkMast.setSystemMsg("");
+                    wrkMast.setIoTime(new Date());
+                    if (wrkMastService.updateById(wrkMast)) {
+                        MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+                        News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
+                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
+                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
+                        redisUtil.del(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
+                    }
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
+    public synchronized void dualCrnStationOutExecute() {
+        try {
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
+                    .isNotNull("dual_crn_no")
+            );
+            for (WrkMast wrkMast : wrkMasts) {
+                Object infoObj = redisUtil.get(RedisKeyType.DUAL_CRN_OUT_TASK_STATION_INFO.key + wrkMast.getWrkNo());
+                if (infoObj == null) {
+                    News.info("鍑哄簱浠诲姟{}鏁版嵁缂撳瓨涓嶅瓨鍦�", wrkMast.getWrkNo());
+                    continue;
+                }
+
+                StationObjModel stationObjModel = JSON.parseObject(infoObj.toString(), StationObjModel.class);
+                StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
+                if (stationThread == null) {
+                    continue;
+                }
+
+                Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+                StationProtocol stationProtocol = stationMap.get(stationObjModel.getStationId());
+                if (stationProtocol == null) {
+                    continue;
+                }
+
+                Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId());
+                if (lock != null) {
+                    continue;
+                }
+
+                //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿0
+                if (stationProtocol.isAutoing()
+                        && stationProtocol.isLoading()
+                        && stationProtocol.getTaskNo() == 0
+                ) {
+                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
+                    if (command == null) {
+                        News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+                        continue;
+                    }
+
+                    wrkMast.setWrkSts(WrkStsType.STATION_RUN.sts);
+                    wrkMast.setSystemMsg("");
+                    wrkMast.setIoTime(new Date());
+                    if (wrkMastService.updateById(wrkMast)) {
+                        MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+                        News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
+                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
+                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
+                        redisUtil.del(RedisKeyType.DUAL_CRN_OUT_TASK_STATION_INFO.key + wrkMast.getWrkNo());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
+    public synchronized void stationOutExecuteFinish() {
+        try {
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
+            for (WrkMast wrkMast : wrkMasts) {
+                Integer wrkNo = wrkMast.getWrkNo();
+
+                Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkNo);
+                if (lock != null) {
+                    continue;
+                }
+
+                boolean complete = true;
+                List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+                for (BasDevp basDevp : basDevps) {
+                    StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+                    if (stationThread == null) {
+                        continue;
+                    }
+
+                    List<StationProtocol> list = stationThread.getStatus();
+                    for (StationProtocol stationProtocol : list) {
+                        if (stationProtocol.getTaskNo().equals(wrkNo)) {
+                            complete = false;
+                        }
+                    }
+                }
+
+                if (complete) {
+                    wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
+                    wrkMast.setIoTime(new Date());
+                    wrkMastService.updateById(wrkMast);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
     //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
     public synchronized void checkStationRunBlock() {
-        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
-        for (BasDevp basDevp : basDevps) {
-            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
-            if(stationThread == null){
-                continue;
-            }
+        try {
+            List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+            for (BasDevp basDevp : basDevps) {
+                StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+                if (stationThread == null) {
+                    continue;
+                }
 
-            List<Integer> runBlockReassignLocStationList = new ArrayList<>();
-            for (StationObjModel stationObjModel : basDevp.getRunBlockReassignLocStationList$()) {
-                runBlockReassignLocStationList.add(stationObjModel.getStationId());
-            }
+                List<Integer> runBlockReassignLocStationList = new ArrayList<>();
+                for (StationObjModel stationObjModel : basDevp.getRunBlockReassignLocStationList$()) {
+                    runBlockReassignLocStationList.add(stationObjModel.getStationId());
+                }
 
-            List<StationProtocol> list = stationThread.getStatus();
-            for (StationProtocol stationProtocol : list) {
-                if(stationProtocol.isAutoing()
-                    && stationProtocol.isLoading()
-                    && stationProtocol.getTaskNo() > 0
-                    && stationProtocol.isRunBlock()
-                ) {
-                    WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
-                    if (wrkMast == null) {
-                        News.info("杈撻�佺珯鐐瑰彿={} 杩愯闃诲锛屼絾鏃犳硶鎵惧埌瀵瑰簲浠诲姟锛屽伐浣滃彿={}", stationProtocol.getStationId(), stationProtocol.getTaskNo());
-                        continue;
-                    }
-
-                    Object lock = redisUtil.get(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo());
-                    if (lock != null) {
-                        continue;
-                    }
-                    redisUtil.set(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo(), "lock", 15);
-
-                    if (wrkMast.getIoType() == WrkIoType.IN.id && runBlockReassignLocStationList.contains(stationProtocol.getStationId())) {
-                        //绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
-                        //杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
-                        String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
-                        if (response == null) {
-                            News.taskError(wrkMast.getWrkNo(), "璇锋眰WMS閲嶆柊鍒嗛厤搴撲綅鎺ュ彛澶辫触锛屾帴鍙f湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
+                List<StationProtocol> list = stationThread.getStatus();
+                for (StationProtocol stationProtocol : list) {
+                    if (stationProtocol.isAutoing()
+                            && stationProtocol.isLoading()
+                            && stationProtocol.getTaskNo() > 0
+                            && stationProtocol.isRunBlock()
+                    ) {
+                        WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
+                        if (wrkMast == null) {
+                            News.info("杈撻�佺珯鐐瑰彿={} 杩愯闃诲锛屼絾鏃犳硶鎵惧埌瀵瑰簲浠诲姟锛屽伐浣滃彿={}", stationProtocol.getStationId(), stationProtocol.getTaskNo());
                             continue;
                         }
-                        JSONObject jsonObject = JSON.parseObject(response);
-                        if (jsonObject.getInteger("code").equals(200)) {
-                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
 
-                            String sourceLocNo = wrkMast.getLocNo();
-                            String locNo = dto.getLocNo();
+                        Object lock = redisUtil.get(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo());
+                        if (lock != null) {
+                            continue;
+                        }
+                        redisUtil.set(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo(), "lock", 15);
 
-                            LocMast sourceLocMast = locMastService.queryByLoc(sourceLocNo);
-                            if (sourceLocMast == null) {
-                                News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 婧愬簱浣嶄俊鎭笉瀛樺湪", sourceLocNo);
+                        if (wrkMast.getIoType() == WrkIoType.IN.id && runBlockReassignLocStationList.contains(stationProtocol.getStationId())) {
+                            //绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
+                            //杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
+                            String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
+                            if (response == null) {
+                                News.taskError(wrkMast.getWrkNo(), "璇锋眰WMS閲嶆柊鍒嗛厤搴撲綅鎺ュ彛澶辫触锛屾帴鍙f湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
                                 continue;
                             }
+                            JSONObject jsonObject = JSON.parseObject(response);
+                            if (jsonObject.getInteger("code").equals(200)) {
+                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);
 
-                            if (!sourceLocMast.getLocSts().equals("S")) {
-                                News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 婧愬簱浣嶇姸鎬佷笉澶勪簬鍏ュ簱棰勭害", sourceLocNo);
-                                continue;
-                            }
+                                String sourceLocNo = wrkMast.getLocNo();
+                                String locNo = dto.getLocNo();
 
-                            LocMast locMast = locMastService.queryByLoc(locNo);
-                            if (locMast == null) {
-                                News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 鐩爣搴撲綅淇℃伅涓嶅瓨鍦�", locNo);
-                                continue;
-                            }
+                                LocMast sourceLocMast = locMastService.queryByLoc(sourceLocNo);
+                                if (sourceLocMast == null) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 婧愬簱浣嶄俊鎭笉瀛樺湪", sourceLocNo);
+                                    continue;
+                                }
 
-                            if (!locMast.getLocSts().equals("O")) {
-                                News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 鐩爣搴撲綅鐘舵�佷笉澶勪簬绌哄簱浣�", locNo);
-                                continue;
-                            }
+                                if (!sourceLocMast.getLocSts().equals("S")) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 婧愬簱浣嶇姸鎬佷笉澶勪簬鍏ュ簱棰勭害", sourceLocNo);
+                                    continue;
+                                }
 
-                            FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
-                            if (findCrnNoResult == null) {
-                                News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鏈尮閰嶅埌鍫嗗灈鏈�", wrkMast.getWrkNo());
-                                continue;
-                            }
-                            Integer crnNo = findCrnNoResult.getCrnNo();
+                                LocMast locMast = locMastService.queryByLoc(locNo);
+                                if (locMast == null) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 鐩爣搴撲綅淇℃伅涓嶅瓨鍦�", locNo);
+                                    continue;
+                                }
 
-                            Integer targetStationId = commonService.findInStationId(findCrnNoResult, stationProtocol.getStationId());
-                            if (targetStationId == null) {
-                                News.taskInfo(wrkMast.getWrkNo(), "{}绔欑偣,鎼滅储鍏ュ簱绔欑偣澶辫触", stationProtocol.getStationId());
-                                continue;
-                            }
+                                if (!locMast.getLocSts().equals("O")) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "搴撲綅鍙�:{} 鐩爣搴撲綅鐘舵�佷笉澶勪簬绌哄簱浣�", locNo);
+                                    continue;
+                                }
 
-                            StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), targetStationId, 0);
-                            if(command == null){
-                                News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", wrkMast.getWrkNo());
-                                continue;
-                            }
+                                FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
+                                if (findCrnNoResult == null) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鏈尮閰嶅埌鍫嗗灈鏈�", wrkMast.getWrkNo());
+                                    continue;
+                                }
+                                Integer crnNo = findCrnNoResult.getCrnNo();
 
-                            //鏇存柊婧愬簱浣�
-                            sourceLocMast.setLocSts("O");
-                            sourceLocMast.setModiTime(new Date());
-                            locMastService.updateById(sourceLocMast);
+                                Integer targetStationId = commonService.findInStationId(findCrnNoResult, stationProtocol.getStationId());
+                                if (targetStationId == null) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "{}绔欑偣,鎼滅储鍏ュ簱绔欑偣澶辫触", stationProtocol.getStationId());
+                                    continue;
+                                }
 
-                            //鏇存柊鐩爣搴撲綅
-                            locMast.setLocSts("S");
-                            locMast.setModiTime(new Date());
-                            locMastService.updateById(locMast);
+                                StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), targetStationId, 0);
+                                if (command == null) {
+                                    News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", wrkMast.getWrkNo());
+                                    continue;
+                                }
 
-                            //鏇存柊宸ヤ綔妗f暟鎹�
-                            wrkMast.setLocNo(locNo);
-                            wrkMast.setStaNo(targetStationId);
+                                //鏇存柊婧愬簱浣�
+                                sourceLocMast.setLocSts("O");
+                                sourceLocMast.setModiTime(new Date());
+                                locMastService.updateById(sourceLocMast);
 
-                            if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
-                                wrkMast.setCrnNo(crnNo);
-                            } else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
-                                wrkMast.setDualCrnNo(crnNo);
-                            }else {
-                                throw new CoolException("鏈煡璁惧绫诲瀷");
-                            }
+                                //鏇存柊鐩爣搴撲綅
+                                locMast.setLocSts("S");
+                                locMast.setModiTime(new Date());
+                                locMastService.updateById(locMast);
 
-                            if (wrkMastService.updateById(wrkMast)) {
-                                MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+                                //鏇存柊宸ヤ綔妗f暟鎹�
+                                wrkMast.setLocNo(locNo);
+                                wrkMast.setStaNo(targetStationId);
+
+                                if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
+                                    wrkMast.setCrnNo(crnNo);
+                                } else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
+                                    wrkMast.setDualCrnNo(crnNo);
+                                } else {
+                                    throw new CoolException("鏈煡璁惧绫诲瀷");
+                                }
+
+                                if (wrkMastService.updateById(wrkMast)) {
+                                    MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+                                }
+                            } else {
+                                News.error("璇锋眰WMS鎺ュ彛澶辫触锛侊紒锛乺esponse锛歿}", response);
                             }
                         } else {
-                            News.error("璇锋眰WMS鎺ュ彛澶辫触锛侊紒锛乺esponse锛歿}", response);
-                        }
-                    }else {
-                        //杩愯鍫靛锛岄噸鏂拌绠楄矾绾�
-                        StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
-                        if(command == null){
-                            News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
-                            continue;
-                        }
+                            //杩愯鍫靛锛岄噸鏂拌绠楄矾绾�
+                            StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
+                            if (command == null) {
+                                News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+                                continue;
+                            }
 
-                        MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
-                        News.info("杈撻�佺珯鐐瑰牭濉炲悗閲嶆柊璁$畻璺緞鍛戒护涓嬪彂鎴愬姛锛岀珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
+                            MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+                            News.info("杈撻�佺珯鐐瑰牭濉炲悗閲嶆柊璁$畻璺緞鍛戒护涓嬪彂鎴愬姛锛岀珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
+                        }
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

--
Gitblit v1.9.1