#预调度堆垛机2

Junjie

17 小时以前 9f13307b0ad0d7a0bac431773ec073cb93b170d4

 src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java

@@ -22,12 +22,18 @@
import com.zy.core.move.StationMoveSession;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.RedisKeyType;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

@Component
public class InboundCrnMoveDispatchScheduler {
@@ -38,19 +44,22 @@
    private final BasCrnpService basCrnpService;
    private final CrnOperateProcessUtils crnOperateProcessUtils;
    private final StationMoveCoordinator stationMoveCoordinator;
    private final RedisUtil redisUtil;

    public InboundCrnMoveDispatchScheduler(WrkMastService wrkMastService,
                                           BasStationService basStationService,
                                           CommonService commonService,
                                           BasCrnpService basCrnpService,
                                           CrnOperateProcessUtils crnOperateProcessUtils,
                                           StationMoveCoordinator stationMoveCoordinator) {
                                           StationMoveCoordinator stationMoveCoordinator,
                                           RedisUtil redisUtil) {
        this.wrkMastService = wrkMastService;
        this.basStationService = basStationService;
        this.commonService = commonService;
        this.basCrnpService = basCrnpService;
        this.crnOperateProcessUtils = crnOperateProcessUtils;
        this.stationMoveCoordinator = stationMoveCoordinator;
        this.redisUtil = redisUtil;
    }

    @Scheduled(fixedDelay = 1000L)
@@ -108,8 +117,8 @@
            return;
        }

        // 同堆垛机没有未完成出库任务时，优先直接到当前入库任务取货位等待。
        if (!hasPendingOutboundTask(crnNo)) {
        // 同堆垛机没有需要参与当前调度判断的出库任务时，优先直接到当前入库任务取货位等待。
        if (!hasBlockingOutboundTask(crnNo)) {
            boolean dispatched = crnOperateProcessUtils.dispatchCrnMove(crnNo, inboundPickupLocNo);
            if (dispatched) {
                News.info("检测到仅有入库任务，已触发堆垛机直接移动到入库任务取货位等待，工作号={}，堆垛机号={}，取货位={}",
@@ -146,11 +155,11 @@
        return null;
    }

    private boolean hasPendingOutboundTask(Integer crnNo) {
    private boolean hasBlockingOutboundTask(Integer crnNo) {
        if (crnNo == null) {
            return false;
        }
        return wrkMastService.count(new QueryWrapper<WrkMast>()
        List<WrkMast> pendingOutboundTasks = wrkMastService.list(new QueryWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .eq("io_type", WrkIoType.OUT.id)
                .in("wrk_sts",
@@ -159,7 +168,99 @@
                        WrkStsType.OUTBOUND_RUN_COMPLETE.sts,
                        WrkStsType.STATION_RUN.sts,
                        WrkStsType.STATION_RUN_COMPLETE.sts,
                        WrkStsType.OUTBOUND_MANUAL.sts)) > 0;
                        WrkStsType.OUTBOUND_MANUAL.sts)
                .orderByAsc("wrk_no"));
        if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
            return false;
        }

        // 非批次任务或缺少批次序号的任务仍按原逻辑处理，避免放宽到无法确认执行顺序的出库任务。
        boolean hasNonBatchTask = pendingOutboundTasks.stream().anyMatch(task -> !isBatchTaskWithSeq(task));
        if (hasNonBatchTask) {
            return true;
        }

        String activeBatch = resolveActiveOutboundBatch(pendingOutboundTasks);
        if (Cools.isEmpty(activeBatch)) {
            return true;
        }

        return pendingOutboundTasks.stream()
                .filter(this::isBatchTaskWithSeq)
                .filter(task -> isWithinCurrentBatchExecuteWindow(task, pendingOutboundTasks))
                .filter(this::isCrnMoveBlockingOutboundTask)
                .anyMatch(task -> Objects.equals(activeBatch, task.getBatch()));
    }

    private String resolveActiveOutboundBatch(List<WrkMast> pendingOutboundTasks) {
        if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
            return null;
        }
        Set<String> activeBatchSet = pendingOutboundTasks.stream()
                .filter(this::isBatchTaskWithSeq)
                .filter(task -> !Objects.equals(task.getWrkSts(), WrkStsType.NEW_OUTBOUND.sts))
                .map(WrkMast::getBatch)
                .filter(batch -> !Cools.isEmpty(batch))
                .collect(Collectors.toSet());
        if (activeBatchSet.size() != 1) {
            return null;
        }
        return activeBatchSet.iterator().next();
    }

    private boolean isBatchTaskWithSeq(WrkMast wrkMast) {
        return wrkMast != null
                && Objects.equals(wrkMast.getIoType(), WrkIoType.OUT.id)
                && !Cools.isEmpty(wrkMast.getBatch())
                && wrkMast.getBatchSeq() != null;
    }

    private boolean isCrnMoveBlockingOutboundTask(WrkMast wrkMast) {
        if (wrkMast == null || wrkMast.getWrkSts() == null) {
            return false;
        }
        return Objects.equals(wrkMast.getWrkSts(), WrkStsType.NEW_OUTBOUND.sts)
                || Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_RUN.sts)
                || Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_MANUAL.sts);
    }

    private boolean isWithinCurrentBatchExecuteWindow(WrkMast wrkMast, List<WrkMast> pendingOutboundTasks) {
        if (!isBatchTaskWithSeq(wrkMast) || pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
            return false;
        }
        int batchRunningLimit = getSystemConfigInt("crnOutBatchRunningLimit", 5);
        if (batchRunningLimit <= 0) {
            return true;
        }
        List<WrkMast> sameBatchTasks = pendingOutboundTasks.stream()
                .filter(this::isBatchTaskWithSeq)
                .filter(task -> Objects.equals(task.getBatch(), wrkMast.getBatch()))
                .sorted(Comparator.comparing(WrkMast::getBatchSeq).thenComparing(WrkMast::getWrkNo))
                .collect(Collectors.toList());
        if (sameBatchTasks.isEmpty()) {
            return false;
        }
        int windowSize = Math.min(batchRunningLimit, sameBatchTasks.size());
        for (int i = 0; i < windowSize; i++) {
            WrkMast current = sameBatchTasks.get(i);
            if (current != null && Objects.equals(current.getWrkNo(), wrkMast.getWrkNo())) {
                return true;
            }
        }
        return false;
    }

    private int getSystemConfigInt(String code, int defaultValue) {
        Object systemConfigMapObj = redisUtil == null ? null : redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
        if (!(systemConfigMapObj instanceof HashMap)) {
            return defaultValue;
        }
        try {
            HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
            return Integer.parseInt(systemConfigMap.getOrDefault(code, String.valueOf(defaultValue)));
        } catch (Exception ignore) {
            return defaultValue;
        }
    }

    private boolean isInboundCrnMoveDispatchWindow(WrkMast wrkMast, StationMoveSession session) {