wms下发任务给wcs时上锁，防止erp发送中止任务

zwl

昨天 ff66ddf96807fac02e01c7d2ecdfd1ba808af9c5

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

@@ -9,7 +9,10 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.asrs.task.support.OutboundBatchSeqReleaseGuard;
import com.zy.asrs.task.support.WorkPublishLockKeys;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +35,8 @@
public class WorkMastScheduler {

    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
    private static final int MAX_PUBLISH_TASKS_ONCE = 20;
    private static final long OUTBOUND_USER_NO_LOCK_SECONDS = 60L;

    @Autowired
    private WcsApiService wcsApiService;
@@ -39,6 +44,10 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WorkMastHandler workMastHandler;
    @Autowired
    private OutboundBatchSeqReleaseGuard outboundBatchSeqReleaseGuard;
    @Autowired
    private RedisUtil redisUtil;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
@@ -73,7 +82,7 @@
     * @date 2026/1/10 14:42
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    private void autoPubTasks() {
    private synchronized void autoPubTasks() {
        // 仅处理待下发/已生成下发号的工作档。
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L))
                .orderBy("user_no", true)
@@ -91,8 +100,13 @@
                continue;
            }

            WorkTaskParams params = buildWorkTaskParams(wrkMast);
            if (isOutboundPublishTask(wrkMast)) {
                if (Cools.isEmpty(wrkMast.getBatchSeq())) {
                    log.warn("出库进仓编号(batchSeq)为空，跳过下发, wrkNo={}, userNo={}",
                            wrkMast.getWrkNo(), wrkMast.getUserNo());
                    continue;
                }
                WorkTaskParams params = buildWorkTaskParams(wrkMast);
                String userNo = normalizeGroupKey(wrkMast.getUserNo());
                String batchSeq = normalizeGroupKey(wrkMast.getBatchSeq());
                outboundTasksByUserNo
@@ -100,15 +114,12 @@
                        .computeIfAbsent(batchSeq, key -> new ArrayList<>())
                        .add(params);
            } else {
                paramsList.add(params);
                paramsList.add(buildWorkTaskParams(wrkMast));
            }
        }

        if (!paramsList.isEmpty()) {
            R r = wcsApiService.pubWrksToWcs(paramsList);
            if (r == null || !Objects.equals(r.get("code"), 200)) {
                log.warn("批量下发任务到WCS失败, result={}", r);
            }
        if (publishTaskChunks(paramsList)) {
            return;
        }

        if (outboundTasksByUserNo.isEmpty()) {
@@ -121,10 +132,9 @@
            batchSeqs.sort(this::compareBatchSeqNatural);

            for (String batchSeq : batchSeqs) {
                String blockingBatchSeq = findFirstUnfinishedOutboundBatchSeq(userNo);
                if (!Objects.equals(batchSeq, blockingBatchSeq)) {
                    log.info("出库批次未完成，暂停后续下发, userNo={}, blockingBatchSeq={}, nextBatchSeq={}",
                            userNo, blockingBatchSeq, batchSeq);
                String blockMsg = outboundBatchSeqReleaseGuard.validateReady(userNo, batchSeq);
                if (!Cools.isEmpty(blockMsg)) {
                    log.info(blockMsg);
                    break;
                }

@@ -133,10 +143,8 @@
                    continue;
                }

                R r = wcsApiService.pubWrksToWcs(batchParams);
                if (r == null || !Objects.equals(r.get("code"), 200)) {
                    log.warn("批量下发出库任务到WCS失败, userNo={}, batchSeq={}, result={}", userNo, batchSeq, r);
                    break;
                if (publishOutboundTaskChunks(userNo, batchSeq, batchParams)) {
                    return;
                }
            }
        }
@@ -157,7 +165,7 @@
                    .setTaskPri(wrkMast.getIoPri().intValue())
                    .setBarcode(wrkMast.getBarcode());
            if (wrkMast.getPltType() != null && wrkMast.getPltType() > 0) {
                params.setBatch(wrkMast.getUserNo())
                params.setBatch(wrkMast.getBatchSeq())
                        .setBatchSeq(wrkMast.getPltType());
            }
        // 2: 入库。入库接口使用 sourceStaNo + 目标库位。
@@ -183,59 +191,97 @@
        return wrkMast != null && Objects.equals(wrkMast.getIoType(), 101);
    }

    private String findFirstUnfinishedOutboundBatchSeq(String userNo) {
        EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
        if (Cools.isEmpty(userNo)) {
            wrapper.isNull("user_no");
        } else {
            wrapper.eq("user_no", userNo);
        }
        wrapper.eq("io_type", 101);
        wrapper.lt("wrk_sts", 14);
        List<WrkMast> rows = wrkMastService.selectList(wrapper);
        if (rows == null || rows.isEmpty()) {
            return null;
        }
        String firstBatchSeq = null;
        for (WrkMast row : rows) {
            String batchSeq = normalizeGroupKey(row.getBatchSeq());
            if (firstBatchSeq == null || compareBatchSeqNatural(batchSeq, firstBatchSeq) < 0) {
                firstBatchSeq = batchSeq;
            }
        }
        return firstBatchSeq;
    }

    private int compareBatchSeqNatural(String left, String right) {
        String safeLeft = Cools.isEmpty(left) ? "" : left;
        String safeRight = Cools.isEmpty(right) ? "" : right;
        boolean leftNumeric = isDigits(safeLeft);
        boolean rightNumeric = isDigits(safeRight);
        if (leftNumeric && rightNumeric) {
            BigInteger leftValue = new BigInteger(safeLeft);
            BigInteger rightValue = new BigInteger(safeRight);
            int compare = leftValue.compareTo(rightValue);
        int leftIndex = 0;
        int rightIndex = 0;
        while (leftIndex < safeLeft.length() && rightIndex < safeRight.length()) {
            char leftChar = safeLeft.charAt(leftIndex);
            char rightChar = safeRight.charAt(rightIndex);
            if (Character.isDigit(leftChar) && Character.isDigit(rightChar)) {
                int leftStart = leftIndex;
                int rightStart = rightIndex;
                while (leftIndex < safeLeft.length() && Character.isDigit(safeLeft.charAt(leftIndex))) {
                    leftIndex++;
                }
                while (rightIndex < safeRight.length() && Character.isDigit(safeRight.charAt(rightIndex))) {
                    rightIndex++;
                }
                String leftNumber = safeLeft.substring(leftStart, leftIndex);
                String rightNumber = safeRight.substring(rightStart, rightIndex);
                int compare = new BigInteger(leftNumber).compareTo(new BigInteger(rightNumber));
                if (compare != 0) {
                    return compare;
                }
                compare = Integer.compare(leftNumber.length(), rightNumber.length());
                if (compare != 0) {
                    return compare;
                }
                continue;
            }
            int compare = Character.compare(leftChar, rightChar);
            if (compare != 0) {
                return compare;
            }
            leftIndex++;
            rightIndex++;
        }
        return safeLeft.compareTo(safeRight);
    }

    private boolean isDigits(String value) {
        if (Cools.isEmpty(value)) {
            return false;
        }
        for (int i = 0; i < value.length(); i++) {
            if (!Character.isDigit(value.charAt(i))) {
                return false;
            }
        }
        return true;
        return Integer.compare(safeLeft.length(), safeRight.length());
    }

    private String normalizeGroupKey(String value) {
        return Cools.isEmpty(value) ? "" : value;
    }

    private boolean publishTaskChunks(List<WorkTaskParams> paramsList) {
        if (paramsList == null || paramsList.isEmpty()) {
            return false;
        }
        for (int start = 0; start < paramsList.size(); start += MAX_PUBLISH_TASKS_ONCE) {
            int end = Math.min(start + MAX_PUBLISH_TASKS_ONCE, paramsList.size());
            List<WorkTaskParams> chunk = paramsList.subList(start, end);
            R r = wcsApiService.pubWrksToWcs(chunk);
            if (isWcsSuccess(r)) {
                return true;
            }
            log.warn("批量下发任务到WCS失败, start={}, size={}, result={}", start, chunk.size(), r);
        }
        return false;
    }

    private boolean publishOutboundTaskChunks(String userNo, String batchSeq, List<WorkTaskParams> batchParams) {
        if (batchParams == null || batchParams.isEmpty()) {
            return false;
        }
        for (int start = 0; start < batchParams.size(); start += MAX_PUBLISH_TASKS_ONCE) {
            int end = Math.min(start + MAX_PUBLISH_TASKS_ONCE, batchParams.size());
            List<WorkTaskParams> chunk = batchParams.subList(start, end);
            String lockKey = WorkPublishLockKeys.outboundUserNoLock(userNo);
            String lockValue = String.valueOf(System.currentTimeMillis());
            if (!redisUtil.setIfAbsent(lockKey, lockValue, OUTBOUND_USER_NO_LOCK_SECONDS)) {
                log.info("出库任务正在下发，跳过本轮, userNo={}, batchSeq={}, lockKey={}", userNo, batchSeq, lockKey);
                return false;
            }
            try {
                R r = wcsApiService.pubWrksToWcs(chunk);
                if (isWcsSuccess(r)) {
                    return true;
                }
                log.warn("批量下发出库任务到WCS失败, userNo={}, batchSeq={}, start={}, size={}, result={}",
                        userNo, batchSeq, start, chunk.size(), r);
            } finally {
                Object currentLockValue = redisUtil.get(lockKey);
                if (Objects.equals(currentLockValue, lockValue)) {
                    redisUtil.del(lockKey);
                }
            }
        }
        return false;
    }

    private boolean isWcsSuccess(R r) {
        return r != null && Objects.equals(r.get("code"), 200);
    }

}