#预调度堆垛机2

Junjie

8 小时以前 7fdc76dde7cd00510347e3231c4f60a88b012107

 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())) {
            if (logBlockedReason) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 缺少批次序号，暂不允许堆垛机出库", wrkMast.getBatch());
            }
            return false;
        }

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

        if (Cools.isEmpty(firstBatchWrkMast.getBatchSeq())) {
            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) {
            if (logBlockedReason) {
            News.taskInfo(wrkMast.getWrkNo(), "批次:{} 首个序号任务:{} 尚未执行，当前任务暂不允许出库", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
            }
            return false;
        }

@@ -498,11 +508,14 @@

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

        if (!isWithinBatchExecuteWindow(wrkMast, unfinishedBatchWrkMasts, batchRunningLimit)) {
            if (logBlockedReason) {
            List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
                    .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
                    .map(WrkMast::getBatchSeq)
@@ -512,6 +525,7 @@
                    wrkMast.getBatch(),
                    windowBatchSeqList,
                    wrkMast.getBatchSeq());
            }
            return false;
        }

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