#预调度堆垛机2

Junjie

6 小时以前 a0b49b0d11220c7fefcbe0ca0e938827c16edae4

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -385,7 +385,7 @@
            return false;
        }

        if (!allowBatchOutboundExecute(wrkMast)) {
        if (!allowBatchOutboundExecute(wrkMast, true)) {
            return false;
        }

@@ -458,13 +458,19 @@
        return false;
    }

    private boolean allowBatchOutboundExecute(WrkMast wrkMast) {
    public boolean canOutboundTaskExecuteInCurrentBatchWindow(WrkMast wrkMast) {
        return allowBatchOutboundExecute(wrkMast, false);
    }

    private boolean allowBatchOutboundExecute(WrkMast wrkMast, boolean logBlockedReason) {
        if (wrkMast == null || Cools.isEmpty(wrkMast.getBatch())) {
            return true;
        }

        if (Cools.isEmpty(wrkMast.getBatchSeq())) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 缺少批次序号，暂不允许堆垛机出库", wrkMast.getBatch());
            if (logBlockedReason) {
                News.taskInfo(wrkMast.getWrkNo(), "批次:{} 缺少批次序号，暂不允许堆垛机出库", wrkMast.getBatch());
            }
            return false;
        }

@@ -479,7 +485,9 @@
        }

        if (Cools.isEmpty(firstBatchWrkMast.getBatchSeq())) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 存在未配置批次序号的任务，暂不允许堆垛机出库", wrkMast.getBatch());
            if (logBlockedReason) {
                News.taskInfo(wrkMast.getWrkNo(), "批次:{} 存在未配置批次序号的任务，暂不允许堆垛机出库", wrkMast.getBatch());
            }
            return false;
        }

@@ -487,7 +495,9 @@
        boolean firstBatchTaskExecuted = firstBatchWrkMast.getWrkSts() != null
                && !firstBatchWrkMast.getWrkSts().equals(WrkStsType.NEW_OUTBOUND.sts);
        if (!currentIsFirstBatchTask && !firstBatchTaskExecuted) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 首个序号任务:{} 尚未执行，当前任务暂不允许出库", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
            if (logBlockedReason) {
                News.taskInfo(wrkMast.getWrkNo(), "批次:{} 首个序号任务:{} 尚未执行，当前任务暂不允许出库", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
            }
            return false;
        }

@@ -498,20 +508,24 @@

        List<WrkMast> unfinishedBatchWrkMasts = listUnfinishedBatchWrkMasts(wrkMast.getBatch());
        if (hasMissingBatchSeq(unfinishedBatchWrkMasts)) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 存在未配置批次序号的未完成任务，暂不允许堆垛机出库", wrkMast.getBatch());
            if (logBlockedReason) {
                News.taskInfo(wrkMast.getWrkNo(), "批次:{} 存在未配置批次序号的未完成任务，暂不允许堆垛机出库", wrkMast.getBatch());
            }
            return false;
        }

        if (!isWithinBatchExecuteWindow(wrkMast, unfinishedBatchWrkMasts, batchRunningLimit)) {
            List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
                    .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
                    .map(WrkMast::getBatchSeq)
                    .collect(java.util.stream.Collectors.toList());
            News.taskInfo(wrkMast.getWrkNo(),
                    "批次:{} 当前严格执行窗口序号列表为{}，当前序号={}，暂不允许堆垛机出库",
                    wrkMast.getBatch(),
                    windowBatchSeqList,
                    wrkMast.getBatchSeq());
            if (logBlockedReason) {
                List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
                        .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
                        .map(WrkMast::getBatchSeq)
                        .collect(java.util.stream.Collectors.toList());
                News.taskInfo(wrkMast.getWrkNo(),
                        "批次:{} 当前严格执行窗口序号列表为{}，当前序号={}，暂不允许堆垛机出库",
                        wrkMast.getBatch(),
                        windowBatchSeqList,
                        wrkMast.getBatchSeq());
            }
            return false;
        }

@@ -523,7 +537,9 @@
                        WrkStsType.COMPLETE_OUTBOUND.sts,
                        WrkStsType.SETTLE_OUTBOUND.sts));
        if (batchRunningCount >= batchRunningLimit) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 执行中任务数达到上限，当前={}，上限={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
            if (logBlockedReason) {
                News.taskInfo(wrkMast.getWrkNo(), "批次:{} 执行中任务数达到上限，当前={}，上限={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
            }
            return false;
        }

@@ -1106,6 +1122,10 @@

    //调度堆垛机移动
    public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo) {
        return dispatchCrnMove(crnNo, targetLocNo, false);
    }

    public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo, boolean allowQueueWhenBusy) {
        if (crnNo == null || Cools.isEmpty(targetLocNo)) {
            return false;
        }
@@ -1140,16 +1160,18 @@
            return false;
        }

        long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .in("wrk_sts",
                        WrkStsType.INBOUND_RUN.sts,
                        WrkStsType.OUTBOUND_RUN.sts,
                        WrkStsType.LOC_MOVE_RUN.sts,
                        WrkStsType.CRN_MOVE_RUN.sts));
        if (runningCount > 0) {
            News.info("堆垛机:{} 存在执行中的任务，暂不生成移动任务", crnNo);
            return false;
        if (!allowQueueWhenBusy) {
            long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
                    .eq("crn_no", crnNo)
                    .in("wrk_sts",
                            WrkStsType.INBOUND_RUN.sts,
                            WrkStsType.OUTBOUND_RUN.sts,
                            WrkStsType.LOC_MOVE_RUN.sts,
                            WrkStsType.CRN_MOVE_RUN.sts));
            if (runningCount > 0) {
                News.info("堆垛机:{} 存在执行中的任务，暂不生成移动任务", crnNo);
                return false;
            }
        }

        WrkMast activeTask = wrkMastService.getOne(new QueryWrapper<WrkMast>()