skyouc
7 天以前 c828579bf44bf5b2ded4c04b16670be71cc76514
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -134,11 +134,11 @@
            return;
        }
        //执行移动任务
        boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
        if (executed) {
            return;
        }
//        //执行移动任务
//        boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
//        if (executed) {
//            return;
//        }
        String lastIo = resolveCrnLastIo(crnProtocol);
@@ -387,9 +387,9 @@
            return false;
        }
        if (!allowBatchOutboundExecute(wrkMast, true)) {
            return false;
        }
//        if (!allowBatchOutboundExecute(wrkMast, true)) {
//            return false;
//        }
        for (StationObjModel stationObjModel : outStationList) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
@@ -398,7 +398,15 @@
            }
            Map<Integer, StationProtocol> stationProtocolMap = stationThread.getStatusMap();
            StationProtocol stationProtocol = stationProtocolMap.get(stationObjModel.getStationId());
            //获取当前任务堆垛机任务站台
            Integer staNo = wrkMast.getSourceStaNo();
            Integer stationId = stationObjModel.getStationId();
            StationProtocol stationProtocol = stationProtocolMap.get(staNo);
           if (!staNo.equals(stationId)) {
               continue;
           }
            if (stationProtocol == null) {
                continue;
            }