From 96cfc17f191fee0a05070ec8e7bb6fb099f0231c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 24 十二月 2025 14:28:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/plugin/FakeProcess.java |  280 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 180 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index dec9d60..f202acc 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -3,20 +3,13 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.domain.param.CreateInTaskParam;
 import com.zy.asrs.domain.param.CreateOutTaskParam;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.utils.Utils;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
 import com.zy.common.model.StartupDto;
 import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.News;
 import com.zy.core.cache.MessageQueue;
@@ -28,10 +21,12 @@
 import com.zy.core.model.command.StationCommand;
 import com.zy.core.model.protocol.CrnProtocol;
 import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.properties.SystemProperties;
 import com.zy.core.thread.CrnThread;
 import com.zy.core.thread.StationThread;
 import com.zy.core.utils.CrnOperateProcessUtils;
 import com.zy.core.utils.StationOperateProcessUtils;
+import com.zy.core.utils.WmsOperateUtils;
 import com.zy.system.entity.Config;
 import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +42,11 @@
     private static Map<Integer,Long> stationStayTimeMap = new HashMap<>();
     private static String enableFake = "N";
     private static String fakeRealTaskRequestWms = "N";
+    private static String fakeGenerateInTask = "Y";
+    private static String fakeGenerateOutTask = "Y";
+
+    private Thread asyncRunThread = null;
+    private Thread asyncFakeRunThread = null;
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -66,34 +66,14 @@
     private CrnOperateProcessUtils crnOperateUtils;
     @Autowired
     private StationOperateProcessUtils stationOperateProcessUtils;
+    @Autowired
+    private WmsOperateUtils wmsOperateUtils;
 
     @Override
     public void run() {
-        Config enableFakeConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
-        if (enableFakeConfig != null) {
-            enableFake = enableFakeConfig.getValue();
-        }
+        asyncRun();
+        asyncFakeRun();
 
-        Config fakeRealTaskRequestWmsConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
-        if (fakeRealTaskRequestWmsConfig != null) {
-            fakeRealTaskRequestWms = fakeRealTaskRequestWmsConfig.getValue();
-        }
-
-        //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔$敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
-        checkInStationHasTask();
-        //鐢熸垚浠跨湡妯℃嫙鍏ュ簱浠诲姟
-        generateFakeInTask();
-        //鐢熸垚浠跨湡妯℃嫙鍑哄簱浠诲姟
-        generateFakeOutTask();
-        //璁$畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
-        calcAllStationStayTime();
-        //妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
-        checkOutStationStayTimeOut();
-        //妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
-        checkInStationCrnTake();
-
-        //璇锋眰鐢熸垚鍏ュ簱浠诲姟
-        generateStoreWrkFile();
         //鎵ц鍫嗗灈鏈轰换鍔�
         crnOperateUtils.crnIoExecute();
         //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
@@ -106,9 +86,108 @@
         stationOperateProcessUtils.stationOutExecuteFinish();
     }
 
+    public void asyncRun() {
+        if (asyncRunThread != null) {
+            return;
+        }
+
+        asyncRunThread = new Thread(() -> {
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    // 绯荤粺杩愯鐘舵�佸垽鏂�
+                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+                        continue;
+                    }
+
+                    //璇锋眰鐢熸垚鍏ュ簱浠诲姟
+                    generateStoreWrkFile();
+
+                    // 闂撮殧
+                    Thread.sleep(50);
+                } catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    break;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        asyncRunThread.setName("asyncRunProcess");
+        asyncRunThread.setDaemon(true);
+        asyncRunThread.start();
+    }
+
+    public void asyncFakeRun() {
+        if (asyncFakeRunThread != null) {
+            return;
+        }
+
+        asyncFakeRunThread = new Thread(() -> {
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    Config enableFakeConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+                    if (enableFakeConfig != null) {
+                        enableFake = enableFakeConfig.getValue();
+                    }
+
+                    Config fakeRealTaskRequestWmsConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
+                    if (fakeRealTaskRequestWmsConfig != null) {
+                        fakeRealTaskRequestWms = fakeRealTaskRequestWmsConfig.getValue();
+                    }
+
+                    Config fakeGenerateInTaskConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateInTask"));
+                    if (fakeGenerateInTaskConfig != null) {
+                        fakeGenerateInTask = fakeGenerateInTaskConfig.getValue();
+                    }
+
+                    Config fakeGenerateOutTaskConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateOutTask"));
+                    if (fakeGenerateOutTaskConfig != null) {
+                        fakeGenerateOutTask = fakeGenerateOutTaskConfig.getValue();
+                    }
+
+                    // 绯荤粺杩愯鐘舵�佸垽鏂�
+                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+                        continue;
+                    }
+
+                    //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔$敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
+                    checkInStationHasTask();
+                    //鐢熸垚浠跨湡妯℃嫙鍏ュ簱浠诲姟
+                    generateFakeInTask();
+                    //鐢熸垚浠跨湡妯℃嫙鍑哄簱浠诲姟
+                    generateFakeOutTask();
+                    //璁$畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
+                    calcAllStationStayTime();
+                    //妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
+                    checkOutStationStayTimeOut();
+                    //妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
+                    checkInStationCrnTake();
+
+                    //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
+                    stationOperateProcessUtils.checkStationRunBlock();
+
+                    // 闂撮殧
+                    Thread.sleep(50);
+                } catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    break;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        asyncFakeRunThread.setName("asyncFakeRunProcess");
+        asyncFakeRunThread.setDaemon(true);
+        asyncFakeRunThread.start();
+    }
+
     //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔$敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
     private synchronized void checkInStationHasTask() {
         if (!enableFake.equals("Y")) {
+            return;
+        }
+
+        if (!fakeGenerateInTask.equals("Y")) {
             return;
         }
 
@@ -133,8 +212,8 @@
                     continue;
                 }
 
-                Object object = redisUtil.get(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId);
-                if (object != null) {
+                Object lock = redisUtil.get(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId);
+                if(lock != null){
                     continue;
                 }
 
@@ -143,9 +222,9 @@
                         && !stationProtocol.isLoading()
                         && stationProtocol.getTaskNo() == 0
                 ) {
-                    StationCommand command = stationThread.getMoveCommand(9999, stationId, 0, 0);
+                    StationCommand command = stationThread.getMoveCommand(commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                     MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
-                    redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 10);
+                    redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 5);
                 }
             }
         }
@@ -161,6 +240,10 @@
             return;
         }
 
+        if (!fakeGenerateInTask.equals("Y")) {
+            return;
+        }
+
         List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
         for (BasDevp basDevp : basDevps) {
             StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -170,7 +253,7 @@
 
             Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
 
-            List<StationObjModel> list = basDevp.getInStationList$();
+            List<StationObjModel> list = basDevp.getBarcodeStationList$();
             for (StationObjModel model : list) {
                 Integer stationId = model.getStationId();
                 if(!stationMap.containsKey(stationId)){
@@ -184,14 +267,18 @@
 
                 Object object = redisUtil.get(RedisKeyType.GENERATE_FAKE_IN_TASK_LIMIT.key + stationId);
                 if (object != null) {
-                    return;
+                    continue;
                 }
 
-                //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿9999锛岀敓鎴愬叆搴撴暟鎹�
+                //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
                 if (stationProtocol.isAutoing()
                         && stationProtocol.isLoading()
-                        && stationProtocol.getTaskNo() == 9999
+                        && stationProtocol.getTaskNo() > 0
                 ) {
+                    if (Cools.isEmpty(stationProtocol.getBarcode())) {
+                        continue;
+                    }
+
                     //妫�娴嬩换鍔℃槸鍚︾敓鎴�
                     List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
                     if (!wrkMasts.isEmpty()) {
@@ -222,8 +309,14 @@
                     taskParam.setStaNo(targetStationId);
                     taskParam.setLocNo(locMast.getLocNo());
                     taskParam.setBarcode(stationProtocol.getBarcode());
-                    boolean result = commonService.createInTask(taskParam);
+                    WrkMast wrkMast = commonService.createInTask(taskParam);
 
+                    StationCommand command = stationThread.getMoveCommand(wrkMast.getWrkNo(), stationId, stationId, 0);
+                    if(command == null){
+                        News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+                        continue;
+                    }
+                    MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                     redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_TASK_LIMIT.key + stationId, "lock", 5);
                 }
             }
@@ -237,6 +330,10 @@
         }
 
         if (fakeRealTaskRequestWms.equals("Y")) {
+            return;
+        }
+
+        if (!fakeGenerateOutTask.equals("Y")) {
             return;
         }
 
@@ -288,7 +385,7 @@
                     taskParam.setStaNo(stationId);
                     taskParam.setLocNo(locMast.getLocNo());
                     boolean result = commonService.createOutTask(taskParam);
-                    redisUtil.set(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId, "lock", 15);
+                    redisUtil.set(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId, "lock", 10);
                 }
             }
         }
@@ -312,7 +409,7 @@
 
             Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
 
-            List<StationObjModel> list = basDevp.getInStationList$();
+            List<StationObjModel> list = basDevp.getBarcodeStationList$();
             for (StationObjModel entity : list) {
                 Integer stationId = entity.getStationId();
                 if(!stationMap.containsKey(stationId)){
@@ -324,74 +421,49 @@
                     continue;
                 }
 
-                //婊¤冻鑷姩銆佹湁鐗┿�佸伐浣滃彿9999锛岀敓鎴愬叆搴撴暟鎹�
+                //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
                 if (stationProtocol.isAutoing()
                         && stationProtocol.isLoading()
-                        && stationProtocol.getTaskNo() == 9999
+                        && stationProtocol.getTaskNo() > 0
                 ) {
+                    if (Cools.isEmpty(stationProtocol.getBarcode())) {
+                        continue;
+                    }
+
                     //妫�娴嬩换鍔℃槸鍚︾敓鎴�
                     List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
                     if (!wrkMasts.isEmpty()) {
                         continue;
                     }
 
-                    String wmsUrl = null;
-                    Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
-                    if (wmsSystemUriConfig != null) {
-                        wmsUrl = wmsSystemUriConfig.getValue();
-                    }
-
-                    if(wmsUrl == null){
-                        News.error("鏈厤缃甒MS绯荤粺URI锛岄厤缃枃浠禖ode缂栫爜锛歸msSystemUri");
-                        return;
-                    }
-
-                    String wmsSystemInUrl = null;
-                    Config wmsSystemInUrlConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemInUrl"));
-                    if (wmsSystemInUrlConfig != null) {
-                        wmsSystemInUrl = wmsSystemInUrlConfig.getValue();
-                    }
-
-                    if(wmsSystemInUrlConfig == null){
-                        News.error("鏈厤缃甒MS鍏ュ簱鎺ュ彛鍦板潃锛岄厤缃枃浠禖ode缂栫爜锛歸msSystemInUrl");
-                        return;
-                    }
-
                     Object lock = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId);
                     if (lock != null) {
                         continue;
                     }
+                    redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
 
-                    try {
-                        HashMap<String, Object> param = new HashMap<>();
-                        param.put("barcode", stationProtocol.getBarcode());
-                        param.put("sourceStaNo", stationProtocol.getStationId());
-                        param.put("locType1", stationProtocol.getPalletHeight());
-                        param.put("row", Utils.getInTaskEnableRow());
+                    String response = wmsOperateUtils.applyInTask(stationProtocol.getBarcode(), stationProtocol.getStationId(), stationProtocol.getPalletHeight());
+                    if (response == null) {
+                        News.error("璇锋眰WMS鍏ュ簱鎺ュ彛澶辫触锛屾帴鍙f湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
+                        continue;
+                    }
+                    JSONObject jsonObject = JSON.parseObject(response);
+                    if (jsonObject.getInteger("code").equals(200)) {
+                        StartupDto dto = jsonObject.getObject("data", StartupDto.class);
 
-                        String response = new HttpHandler.Builder()
-                                .setUri(wmsUrl)
-                                .setPath(wmsSystemInUrl)
-                                .setJson(JSON.toJSONString(param))
-                                .build()
-                                .doPost();
-                        JSONObject jsonObject = JSON.parseObject(response);
-                        if (jsonObject.getInteger("code").equals(200)) {
-                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+                        CreateInTaskParam taskParam = new CreateInTaskParam();
+                        taskParam.setTaskNo(dto.getTaskNo());
+                        taskParam.setLocNo(dto.getLocNo());
+                        taskParam.setTaskPri(dto.getTaskPri());
+                        taskParam.setBarcode(stationProtocol.getBarcode());
+                        WrkMast wrkMast = commonService.createInTask(taskParam);
 
-                            CreateInTaskParam taskParam = new CreateInTaskParam();
-                            taskParam.setTaskNo(String.valueOf(dto.getTaskNo()));
-                            taskParam.setLocNo(dto.getLocNo());
-                            taskParam.setTaskPri(dto.getTaskPri());
-                            taskParam.setBarcode(stationProtocol.getBarcode());
-                            boolean result = commonService.createInTask(taskParam);
-                        } else {
-                            News.error("璇锋眰WMS鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+                        StationCommand command = stationThread.getMoveCommand(wrkMast.getWrkNo(), stationId, stationId, 0);
+                        if(command == null){
+                            News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+                            continue;
                         }
-
-                        redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 10);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                        MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                     }
                 }
             }
@@ -454,7 +526,7 @@
 
                     MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                     redisUtil.set(RedisKeyType.CHECK_OUT_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId(), "lock",10);
-                    News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
+                    News.info("杈撻�佺珯鐐瑰嚭搴撻噸缃懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
                 }
             }
         }
@@ -497,7 +569,7 @@
                     if (wrkMast == null) {
                         MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                         redisUtil.set(RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId(), "lock",10);
-                        News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
+                        News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔�(task_over)锛岀珯鐐瑰彿={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
                     }else {
                         if (wrkMast.getWrkSts() != WrkStsType.NEW_INBOUND.sts && wrkMast.getWrkSts() != WrkStsType.INBOUND_DEVICE_RUN.sts) {
                             Integer crnNo = wrkMast.getCrnNo();
@@ -506,13 +578,13 @@
                                 continue;
                             }
                             CrnProtocol crnProtocol = crnThread.getStatus();
-                            if (crnProtocol.getStatusType().equals(CrnStatusType.FETCH_MOVING) || crnProtocol.getStatusType().equals(CrnStatusType.FETCHING)) {
+                            if (!crnProtocol.getStatusType().equals(CrnStatusType.PUT_MOVING) && !crnProtocol.getStatusType().equals(CrnStatusType.PUTTING)) {
                                 continue;
                             }
 
                             MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                             redisUtil.set(RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId(), "lock",10);
-                            News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
+                            News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔�(crn_fetch)锛岀珯鐐瑰彿={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(), JSON.toJSONString(command));
                         }
                     }
                 }
@@ -538,6 +610,10 @@
                     && crnProtocol.getTaskNo() > 0
                     && crnProtocol.getStatus() == CrnStatusType.WAITING.id
             ) {
+                Object lock = redisUtil.get(RedisKeyType.CRN_IO_EXECUTE_FINISH_LIMIT.key + basCrnp.getCrnNo());
+                if(lock != null){
+                    continue;
+                }
 
                 // 鑾峰彇寰呯‘璁ゅ伐浣滄。
                 WrkMast wrkMast = wrkMastService.selectByWorkNo(crnProtocol.getTaskNo());
@@ -572,6 +648,8 @@
                         StationCommand command = stationThread.getMoveCommand(9998, wrkMast.getSourceStaNo(), 0, 0);
                         MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                     }
+                }else if(wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts){
+                    updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
                 }else{
                     News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗗伐浣滅姸鎬佸紓甯搞�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
                     continue;
@@ -585,6 +663,8 @@
                     MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, resetCommand));
                     News.info("鍫嗗灈鏈轰换鍔$姸鎬佹洿鏂版垚鍔燂紝鍫嗗灈鏈哄彿={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
                 }
+
+                redisUtil.set(RedisKeyType.CRN_IO_EXECUTE_FINISH_LIMIT.key + basCrnp.getCrnNo(), "lock",10);
             }
         }
     }

--
Gitblit v1.9.1