From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 274 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 230 insertions(+), 44 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..90afab5 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -9,7 +9,11 @@
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.properties.SlaveProperties;
+import com.zy.common.utils.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +36,9 @@
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;
+ private static final int DOUBLE_EXTENSION_OUTBOUND_CRN_NO = 19;
@Autowired
private WcsApiService wcsApiService;
@@ -41,6 +46,18 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private OutboundBatchSeqReleaseGuard outboundBatchSeqReleaseGuard;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+ private enum LocDepthType {
+ SHALLOW,
+ DEEP,
+ UNKNOWN
+ }
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -67,15 +84,16 @@
* 璋冨害鍣ㄥ彧璐熻矗浠庡伐浣滄。涓寫鍑衡�滃綋鍓嶅厑璁镐笅鍙戔�濈殑浠诲姟锛屽苟灏嗗叾杞崲鎴� WCS 鎺ュ彛闇�瑕佺殑鎶ユ枃缁撴瀯锛�
* 鍑哄簱浠诲姟鎸� userNo -> batchSeq 鍒嗗眰姹囨�诲悗涓茶涓嬪彂锛岀‘淇濆悓涓� userNo 涓嬪墠涓�涓� batchSeq 瀹屾垚鍚庡啀鍙戜笅涓�涓��
* <p>
- * 褰撳墠鎵归噺涓嬪彂鐨勫綊骞剁淮搴︽槸锛�
- * 1. WCS鎺ュ彛璺緞锛堝叆搴�/鍑哄簱/绉诲簱涓嶈兘娣峰彂锛夛紱
- * 2. 鍑哄簱浠诲姟鎸� work_mast.user_no -> work_mast.batch_seq 鍒嗗眰姹囨�伙紝骞舵寜 batchSeq 鑷劧鍗囧簭涓嬪彂銆�
+ * 褰撳墠涓嬪彂瑙勫垯鏄細
+ * 1. 鍏ュ簱浠诲姟鎸� WCS 鎺ュ彛鎵归噺涓嬪彂锛�
+ * 2. 绉诲簱浠诲姟鎸夊崟鏉′换鍔′笅鍙戯紱
+ * 3. 鍑哄簱浠诲姟鎸� work_mast.user_no -> work_mast.batch_seq 鍒嗗眰姹囨�伙紝骞舵寜 batchSeq 鑷劧鍗囧簭涓嬪彂銆�
*
* @author Ryan
* @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)
@@ -86,62 +104,82 @@
}
List<WorkTaskParams> paramsList = new ArrayList<>();
- Map<String, LinkedHashMap<String, List<WorkTaskParams>>> outboundTasksByUserNo = new LinkedHashMap<>();
+ List<WorkTaskParams> moveParamsList = new ArrayList<>();
+ Map<String, LinkedHashMap<String, List<WrkMast>>> outboundTasksByUserNo = new LinkedHashMap<>();
for (WrkMast wrkMast : wrkMasts) {
// 鍑哄簱绫讳换鍔★紙ioType > 100锛夐粯璁ら渶瑕� ERP 纭锛涙湭纭鐨勪换鍔″湪杩欓噷鐩存帴璺宠繃銆�
if (wrkMast.getIoType() > 100 && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
continue;
}
- WorkTaskParams params = buildWorkTaskParams(wrkMast);
if (isOutboundPublishTask(wrkMast)) {
+ if (Cools.isEmpty(wrkMast.getBatchSeq())) {
+ log.warn("鍑哄簱杩涗粨缂栧彿(batchSeq)涓虹┖锛岃烦杩囦笅鍙�, wrkNo={}, userNo={}",
+ wrkMast.getWrkNo(), wrkMast.getUserNo());
+ continue;
+ }
String userNo = normalizeGroupKey(wrkMast.getUserNo());
String batchSeq = normalizeGroupKey(wrkMast.getBatchSeq());
outboundTasksByUserNo
.computeIfAbsent(userNo, key -> new LinkedHashMap<>())
.computeIfAbsent(batchSeq, key -> new ArrayList<>())
- .add(params);
+ .add(wrkMast);
} else {
- paramsList.add(params);
+ WorkTaskParams params = buildWorkTaskParams(wrkMast);
+ if (isMovePublishTask(params)) {
+ moveParamsList.add(params);
+ } else {
+ paramsList.add(params);
+ }
}
}
- 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 (publishMoveTasksOneByOne(moveParamsList)) {
+ return;
}
if (outboundTasksByUserNo.isEmpty()) {
return;
}
- for (Map.Entry<String, LinkedHashMap<String, List<WorkTaskParams>>> userEntry : outboundTasksByUserNo.entrySet()) {
+ for (Map.Entry<String, LinkedHashMap<String, List<WrkMast>>> userEntry : outboundTasksByUserNo.entrySet()) {
String userNo = userEntry.getKey();
List<String> batchSeqs = new ArrayList<>(userEntry.getValue().keySet());
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;
}
- List<WorkTaskParams> batchParams = userEntry.getValue().get(batchSeq);
- if (batchParams == null || batchParams.isEmpty()) {
+ List<WrkMast> batchMasts = selectOutboundBatchMasts(userEntry.getValue().get(batchSeq));
+ if (batchMasts == null || batchMasts.isEmpty()) {
continue;
}
+ List<WorkTaskParams> batchParams = buildWorkTaskParams(batchMasts);
- 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;
}
}
}
+ }
+
+ private List<WorkTaskParams> buildWorkTaskParams(List<WrkMast> wrkMasts) {
+ List<WorkTaskParams> paramsList = new ArrayList<>();
+ if (wrkMasts == null || wrkMasts.isEmpty()) {
+ return paramsList;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ paramsList.add(buildWorkTaskParams(wrkMast));
+ }
+ return paramsList;
}
private WorkTaskParams buildWorkTaskParams(WrkMast wrkMast) {
@@ -185,28 +223,111 @@
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);
+ private boolean isMovePublishTask(WorkTaskParams params) {
+ return params != null && "move".equalsIgnoreCase(params.getType());
+ }
+
+ private List<WrkMast> selectOutboundBatchMasts(List<WrkMast> batchMasts) {
+ if (batchMasts == null || batchMasts.isEmpty()) {
+ return new ArrayList<>();
}
- 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;
+ List<WrkMast> ordered = new ArrayList<>(batchMasts);
+ if (hasOrderedOutboundSeq(ordered)) {
+ ordered.sort(this::compareOutboundSeq);
+ return ordered;
}
- String firstBatchSeq = null;
- for (WrkMast row : rows) {
- String batchSeq = normalizeGroupKey(row.getBatchSeq());
- if (firstBatchSeq == null || compareBatchSeqNatural(batchSeq, firstBatchSeq) < 0) {
- firstBatchSeq = batchSeq;
+ if (!hasDoubleExtensionOutboundTask(ordered)) {
+ return ordered;
+ }
+
+ List<WrkMast> shallowMasts = new ArrayList<>();
+ List<WrkMast> deepMasts = new ArrayList<>();
+ List<WrkMast> otherMasts = new ArrayList<>();
+ for (WrkMast mast : ordered) {
+ if (!isDoubleExtensionOutboundTask(mast)) {
+ otherMasts.add(mast);
+ continue;
+ }
+ LocDepthType locDepthType = resolveOutboundLocDepth(mast);
+ if (locDepthType == LocDepthType.SHALLOW) {
+ shallowMasts.add(mast);
+ } else if (locDepthType == LocDepthType.DEEP) {
+ deepMasts.add(mast);
+ } else {
+ otherMasts.add(mast);
}
}
- return firstBatchSeq;
+ if (shallowMasts.isEmpty() && deepMasts.isEmpty()) {
+ return ordered;
+ }
+
+ List<WrkMast> result = new ArrayList<>(ordered.size());
+ result.addAll(shallowMasts);
+ result.addAll(deepMasts);
+ result.addAll(otherMasts);
+ return result;
+ }
+
+ private boolean hasOrderedOutboundSeq(List<WrkMast> batchMasts) {
+ for (WrkMast mast : batchMasts) {
+ if (outboundSeq(mast) > 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private int compareOutboundSeq(WrkMast left, WrkMast right) {
+ int leftSeq = outboundSeq(left);
+ int rightSeq = outboundSeq(right);
+ boolean leftOrdered = leftSeq > 0;
+ boolean rightOrdered = rightSeq > 0;
+ if (leftOrdered && rightOrdered) {
+ return Integer.compare(leftSeq, rightSeq);
+ }
+ if (leftOrdered) {
+ return -1;
+ }
+ if (rightOrdered) {
+ return 1;
+ }
+ return 0;
+ }
+
+ private int outboundSeq(WrkMast mast) {
+ return mast == null || mast.getPltType() == null ? 0 : mast.getPltType();
+ }
+
+ private boolean hasDoubleExtensionOutboundTask(List<WrkMast> batchMasts) {
+ for (WrkMast mast : batchMasts) {
+ if (isDoubleExtensionOutboundTask(mast)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isDoubleExtensionOutboundTask(WrkMast mast) {
+ return isOutboundPublishTask(mast)
+ && mast.getCrnNo() != null
+ && mast.getCrnNo() >= DOUBLE_EXTENSION_OUTBOUND_CRN_NO;
+ }
+
+ private LocDepthType resolveOutboundLocDepth(WrkMast mast) {
+ if (mast == null || Cools.isEmpty(mast.getSourceLocNo()) || slaveProperties == null) {
+ return LocDepthType.UNKNOWN;
+ }
+ try {
+ if (Utils.isShallowLoc(slaveProperties, mast.getSourceLocNo())) {
+ return LocDepthType.SHALLOW;
+ }
+ if (Utils.isDeepLoc(slaveProperties, mast.getSourceLocNo())) {
+ return LocDepthType.DEEP;
+ }
+ } catch (Exception e) {
+ log.warn("鍙屼几鍑哄簱搴撲綅娣辨祬鍒ゆ柇澶辫触, wrkNo={}, sourceLocNo={}", mast.getWrkNo(), mast.getSourceLocNo(), e);
+ }
+ return LocDepthType.UNKNOWN;
}
private int compareBatchSeqNatural(String left, String right) {
@@ -252,4 +373,69 @@
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 publishMoveTasksOneByOne(List<WorkTaskParams> moveParamsList) {
+ if (moveParamsList == null || moveParamsList.isEmpty()) {
+ return false;
+ }
+ for (WorkTaskParams params : moveParamsList) {
+ R r = wcsApiService.pubWrkToWcs(params);
+ if (isWcsSuccess(r)) {
+ return true;
+ }
+ log.warn("绉诲簱浠诲姟涓嬪彂鍒癢CS澶辫触, taskNo={}, result={}",
+ params == null ? null : params.getTaskNo(), 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