From 73f677ac03ebcf0f9d2e865dd60d3e4a6c2bc2c9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 23 四月 2026 13:53:01 +0800
Subject: [PATCH] 电视机出库订单托数显示
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 150 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 582ec1d..603ded6 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.support.OutboundBatchSeqReleaseGuard;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.LocTypeDto;
@@ -35,6 +36,7 @@
import java.io.IOException;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -48,6 +50,7 @@
private static final long OUT_LOCK_REPORT_PENDING_WRK_STS = 13L;
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 long OUTBOUND_CRN_COMPLETE_WRK_STS = 25L;
private static final String OUT_LOCK_REPORT_PENDING_FLAG = "P";
/** 鍚屼竴 WCS 璺緞銆佸悓涓�鍗曞彿涓嬩竴缁勪笅鍙戠殑浠诲姟鏉℃暟涓婇檺 */
@@ -107,6 +110,8 @@
private RowLastnoService rowLastnoService;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private OutboundBatchSeqReleaseGuard outboundBatchSeqReleaseGuard;
/**
@@ -126,6 +131,10 @@
String validateMsg = validatePubTask(params, wrkMast);
if (!Cools.isEmpty(validateMsg)) {
return R.error(validateMsg);
+ }
+ String batchBlockMsg = validateOutboundBatchSeqReady(params, wrkMast);
+ if (!Cools.isEmpty(batchBlockMsg)) {
+ return R.error(batchBlockMsg);
}
String url = resolveTaskPath(params);
String requestJson = JSON.toJSONString(params);
@@ -203,6 +212,7 @@
List<String> failMsgs = new ArrayList<>();
List<WorkTaskParams> lastSentChunk = null;
String skipGroupKey = null;
+ Set<String> blockedOutboundUserKeys = new HashSet<>();
for (List<WorkTaskParams> chunk : chunks) {
if (chunk == null || chunk.isEmpty()) {
@@ -211,8 +221,22 @@
WorkTaskParams head = chunk.get(0);
WrkMast headMast = wrkMastMap.get(head.getTaskNo());
String key = buildBatchGroupKey(head, headMast);
+ String outboundUserKey = buildOutboundUserKey(head, headMast);
if (skipGroupKey != null && skipGroupKey.equals(key)) {
+ continue;
+ }
+ if (outboundUserKey != null && blockedOutboundUserKeys.contains(outboundUserKey)) {
+ continue;
+ }
+
+ String batchBlockMsg = validateOutboundBatchSeqReady(chunk, wrkMastMap);
+ if (!Cools.isEmpty(batchBlockMsg)) {
+ skipMsgs.add(batchBlockMsg);
+ skipGroupKey = key;
+ if (outboundUserKey != null) {
+ blockedOutboundUserKeys.add(outboundUserKey);
+ }
continue;
}
@@ -464,6 +488,26 @@
return outboundPltSlotReleasedInWms(userNo, batchGroup, minPlt - 1);
}
+ private String validateOutboundBatchSeqReady(List<WorkTaskParams> chunk, Map<String, WrkMast> wrkMastMap) {
+ if (chunk == null || chunk.isEmpty()) {
+ return null;
+ }
+ WorkTaskParams head = chunk.get(0);
+ return validateOutboundBatchSeqReady(head, wrkMastMap.get(head.getTaskNo()));
+ }
+
+ private String validateOutboundBatchSeqReady(WorkTaskParams params, WrkMast wrkMast) {
+ if (params == null || !"out".equalsIgnoreCase(params.getType())) {
+ return null;
+ }
+ if (wrkMast == null || !Objects.equals(wrkMast.getIoType(), 101)) {
+ return null;
+ }
+ return outboundBatchSeqReleaseGuard.validateReady(
+ sortUserNoForPub(params, wrkMast),
+ sortBatchGroupForPub(params, wrkMast));
+ }
+
private boolean outboundPltSlotReleasedInWms(String userNo, String batchSeq, int pltType) {
EntityWrapper<WrkMast> mastWrapper = new EntityWrapper<>();
mastWrapper.eq("user_no", userNo);
@@ -521,7 +565,7 @@
return Comparator
.comparing((WorkTaskParams p) -> Optional.ofNullable(p.getType()).orElse(""), String.CASE_INSENSITIVE_ORDER)
.thenComparing(p -> sortUserNoForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(String::compareTo))
- .thenComparing(p -> sortBatchGroupForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(String::compareTo))
+ .thenComparing(p -> sortBatchGroupForPub(p, wrkMastMap.get(p.getTaskNo())), WcsApiServiceImpl::compareBatchSeqNatural)
.thenComparing(p -> sortPltForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(Integer::compareTo));
}
@@ -545,6 +589,64 @@
return wrkMast.getBatchSeq();
}
return null;
+ }
+
+ private static String buildOutboundUserKey(WorkTaskParams params, WrkMast wrkMast) {
+ if (params == null || !"out".equalsIgnoreCase(params.getType())) {
+ return null;
+ }
+ String userNo = sortUserNoForPub(params, wrkMast);
+ if (Cools.isEmpty(userNo)) {
+ return null;
+ }
+ return resolveSafeKey(userNo);
+ }
+
+ private static int compareBatchSeqNatural(String left, String right) {
+ String safeLeft = normalizeBatchSeq(left);
+ String safeRight = normalizeBatchSeq(right);
+ 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 Integer.compare(safeLeft.length(), safeRight.length());
+ }
+
+ private static String normalizeBatchSeq(String value) {
+ return Cools.isEmpty(value) ? "" : value;
+ }
+
+ private static String resolveSafeKey(String value) {
+ return Cools.isEmpty(value) ? "_EMPTY_" : value;
}
private static String buildOutboundBatchCacheKey(String userNo, String batchSeq) {
@@ -590,6 +692,15 @@
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
+ } else if (isOutboundCrnTaskComplete(params)) {
+ // WCS鍑哄簱浠诲姟瀹屾垚锛氬爢鍨涙満鍑哄簱浠诲姟鎵ц瀹屾垚锛屽伐浣滅姸鎬� -> 25銆�
+ if (isOutboundTask(mast) && canMarkOutboundCrnComplete(mast)) {
+ mast.setWrkSts(OUTBOUND_CRN_COMPLETE_WRK_STS);
+ mast.setModiTime(new Date());
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
} else if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
@@ -608,23 +719,7 @@
//wcs浠诲姟鍙栨秷鎺ュ彛
} else if (params.getMsgType().equals("task_cancel")) {
workService.cancelWrkMast(String.valueOf(mast.getWrkNo()), 9955L);
- } else if (params.getMsgType().equals("task_arrive")) {
- //鍒拌揪鐩殑鍦�
- //濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
- if(!Cools.isEmpty(mast.getLocNo())){
- mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
- }
- mast.setWrkSts(14L);
- if(Cools.isEmpty(mast.getStaNo())){
- mast.setOveMk("Y");
- }
- mast.setModiTime(new Date());
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
}
- } else if (params.getNotifyType().equals("weight")) {
-
}
return R.ok();
}
@@ -635,8 +730,23 @@
&& "crn_out_task_run".equalsIgnoreCase(params.getMsgType());
}
+ private boolean isOutboundCrnTaskComplete(ReceviceTaskParams params) {
+ return params != null
+ && "Crn".equalsIgnoreCase(params.getNotifyType())
+ && "crn_out_task_complete".equalsIgnoreCase(params.getMsgType());
+ }
+
private boolean isOutboundTask(WrkMast mast) {
return mast != null && mast.getIoType() != null && (mast.getIoType() == 101 || mast.getIoType() == 110);
+ }
+
+ private boolean canMarkOutboundCrnComplete(WrkMast mast) {
+ if (mast == null || mast.getWrkSts() == null) {
+ return false;
+ }
+ return mast.getWrkSts() < 14
+ || mast.getWrkSts().equals(OUT_LOCK_REPORT_SUCCESS_WRK_STS)
+ || mast.getWrkSts().equals(OUT_LOCK_REPORT_FAIL_WRK_STS);
}
private boolean canMarkOutboundTaskComplete(WrkMast mast) {
@@ -645,7 +755,8 @@
}
return mast.getWrkSts() < 14
|| mast.getWrkSts().equals(OUT_LOCK_REPORT_SUCCESS_WRK_STS)
- || mast.getWrkSts().equals(OUT_LOCK_REPORT_FAIL_WRK_STS);
+ || mast.getWrkSts().equals(OUT_LOCK_REPORT_FAIL_WRK_STS)
+ || mast.getWrkSts().equals(OUTBOUND_CRN_COMPLETE_WRK_STS);
}
@Override
@@ -778,6 +889,9 @@
if ("Y".equalsIgnoreCase(wrkMast.getPauseMk())) {
return "task paused";
}
+ if (Objects.equals(wrkMast.getIoType(), 101) && Cools.isEmpty(wrkMast.getBatchSeq())) {
+ return "鍑哄簱杩涗粨缂栧彿(batchSeq)涓虹┖锛岃烦杩囦笅鍙�";
+ }
if (requiresOutboundErpConfirm(wrkMast) && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
return "task not confirmed by erp";
}
--
Gitblit v1.9.1