From ff66ddf96807fac02e01c7d2ecdfd1ba808af9c5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 25 四月 2026 18:42:10 +0800
Subject: [PATCH] wms下发任务给wcs时上锁，防止erp发送中止任务
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 116 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index d1dc7cc..84ea570 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/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,8 +35,8 @@
public class WorkMastScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
- private static final long OUT_LOCK_REPORT_SUCCESS_WRK_STS = 21L;
- private static final long OUT_LOCK_REPORT_FAIL_WRK_STS = 22L;
+ private static final int MAX_PUBLISH_TASKS_ONCE = 20;
+ private static final long OUTBOUND_USER_NO_LOCK_SECONDS = 60L;
@Autowired
private WcsApiService wcsApiService;
@@ -41,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(){
@@ -75,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)
@@ -93,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
@@ -102,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("鎵归噺涓嬪彂浠诲姟鍒癢CS澶辫触, result={}", r);
- }
+ if (publishTaskChunks(paramsList)) {
+ return;
}
if (outboundTasksByUserNo.isEmpty()) {
@@ -123,10 +132,9 @@
batchSeqs.sort(this::compareBatchSeqNatural);
for (String batchSeq : batchSeqs) {
- String blockingBatchSeq = findFirstUnfinishedOutboundBatchSeq(userNo);
- if (blockingBatchSeq != null && compareBatchSeqNatural(batchSeq, blockingBatchSeq) != 0) {
- log.info("鍑哄簱鎵规鏈畬鎴愶紝鏆傚仠鍚庣画涓嬪彂, userNo={}, blockingBatchSeq={}, nextBatchSeq={}",
- userNo, blockingBatchSeq, batchSeq);
+ String blockMsg = outboundBatchSeqReleaseGuard.validateReady(userNo, batchSeq);
+ if (!Cools.isEmpty(blockMsg)) {
+ log.info(blockMsg);
break;
}
@@ -135,10 +143,8 @@
continue;
}
- R r = wcsApiService.pubWrksToWcs(batchParams);
- if (r == null || !Objects.equals(r.get("code"), 200)) {
- log.warn("鎵归噺涓嬪彂鍑哄簱浠诲姟鍒癢CS澶辫触, userNo={}, batchSeq={}, result={}", userNo, batchSeq, r);
- break;
+ if (publishOutboundTaskChunks(userNo, batchSeq, batchParams)) {
+ return;
}
}
}
@@ -185,30 +191,6 @@
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.last(" and (wrk_sts < 14 or wrk_sts in ("
- + OUT_LOCK_REPORT_SUCCESS_WRK_STS + "," + OUT_LOCK_REPORT_FAIL_WRK_STS + "))");
- 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;
@@ -252,4 +234,54 @@
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("鎵归噺涓嬪彂浠诲姟鍒癢CS澶辫触, 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("鎵归噺涓嬪彂鍑哄簱浠诲姟鍒癢CS澶辫触, 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);
+ }
+
}
--
Gitblit v1.9.1