屏蔽预调度任务

skyouc

2 天以前 cf9211f711be85c8e0c1c739d01c8694d2cf5c51

 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);

@@ -163,7 +163,7 @@
            if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts) {
                boolean result = this.crnExecuteInPlanner(currentCrn, crnThread, wrkMast);
                if (result) {
                    crnProtocol.setLastIo("O");
                    crnProtocol.setLastIo("I");
                    return;
                }
                continue;
@@ -172,7 +172,7 @@
            if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.NEW_OUTBOUND.sts) {
                boolean result = this.crnExecuteOutPlanner(currentCrn, crnThread, wrkMast);
                if (result) {
                    crnProtocol.setLastIo("I");
                    crnProtocol.setLastIo("O");
                    return;
                }
                continue;
@@ -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());