skyouc
2 天以前 cf9211f711be85c8e0c1c739d01c8694d2cf5c51
屏蔽预调度任务
4个文件已修改
36 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/plugin/NormalProcess.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -44,7 +44,7 @@
        this.crnOperateProcessUtils = crnOperateProcessUtils;
    }
    @Scheduled(fixedDelay = 1000L)
//    @Scheduled(fixedDelay = 1000L)
    public void dispatchInboundCrnMove() {
        List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>()
                .orderByAsc("crn_no"));
src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -63,17 +63,26 @@
        //执行堆垛机任务,按 lane 串行提交
        crnOperateUtils.submitCrnIoTasks(DISPATCH_INTERVAL_MS);
        //堆垛机任务执行完成,按 lane 串行提交
        crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
        // 检测入库任务是否已经到达目标站台
        stationOperateProcessUtils.submitInboundStationArrivalTasks(DISPATCH_INTERVAL_MS);
        //执行输送站点入库任务,按 lane 串行提交
        stationOperateProcessUtils.submitStationInTasks(DISPATCH_INTERVAL_MS);
        //执行输送站点出库任务,按 lane 串行提交
        stationOperateProcessUtils.submitCrnStationOutTasks(DISPATCH_INTERVAL_MS);
        // 检测出库任务是否已经到达目标站台
        stationOperateProcessUtils.submitStationOutExecuteFinishTasks(DISPATCH_INTERVAL_MS);
        // 检测站台运行完成后的任务转完成
        stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
        //检测输送站点是否运行堵塞,按 lane 串行提交
        stationOperateProcessUtils.submitCheckStationRunBlockTasks(DISPATCH_INTERVAL_MS);
        //检测输送站点任务停留超时后重新计算路径,按 lane 串行提交
        stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(DISPATCH_INTERVAL_MS);
    }
    /**
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -280,9 +280,12 @@
        crnCommand.setSourcePosX(Utils.getRow(targetLocNo));     // 目标库位排
        crnCommand.setSourcePosY(Utils.getBay(targetLocNo));     // 目标库位列
        crnCommand.setSourcePosZ(Utils.getLev(targetLocNo));     // 目标库位层
        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // 目标库位排
        crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // 目标库位列
        crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // 目标库位层
//        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // 目标库位排
//        crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // 目标库位列
//        crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // 目标库位层
         crnCommand.setDestinationPosX(0);     // 目标库位排
        crnCommand.setDestinationPosY(0);     // 目标库位列
        crnCommand.setDestinationPosZ(0);     // 目标库位层
        crnCommand.setCommand(1);     // 任务确认
        return crnCommand;
    }
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());