From 7ec0d6926482a21b38c246ad460ca25cc78d6ffc Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 17 四月 2026 12:56:05 +0800
Subject: [PATCH] 1.erp对接 2.电视机对接
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 206 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 166 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index d672fdb..2ce6486 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -5,7 +5,6 @@
import com.core.common.R;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
-import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
@@ -17,10 +16,14 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Date;
+import java.util.Map;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2020/7/7
@@ -57,59 +60,182 @@
}
/**
- * 浠诲姟鑷姩涓嬪彂
+ * 浠诲姟鑷姩涓嬪彂銆�
+ * <p>
+ * 璋冨害鍣ㄥ彧璐熻矗浠庡伐浣滄。涓寫鍑衡�滃綋鍓嶅厑璁镐笅鍙戔�濈殑浠诲姟锛屽苟灏嗗叾杞崲鎴� WCS 鎺ュ彛闇�瑕佺殑鎶ユ枃缁撴瀯锛�
+ * 鍑哄簱浠诲姟鎸� userNo -> batchSeq 鍒嗗眰姹囨�诲悗涓茶涓嬪彂锛岀‘淇濆悓涓� userNo 涓嬪墠涓�涓� batchSeq 瀹屾垚鍚庡啀鍙戜笅涓�涓��
+ * <p>
+ * 褰撳墠鎵归噺涓嬪彂鐨勫綊骞剁淮搴︽槸锛�
+ * 1. WCS鎺ュ彛璺緞锛堝叆搴�/鍑哄簱/绉诲簱涓嶈兘娣峰彂锛夛紱
+ * 2. 鍑哄簱浠诲姟鎸� work_mast.user_no -> work_mast.batch_seq 鍒嗗眰姹囨�伙紝骞舵寜 batchSeq 鑷劧鍗囧簭涓嬪彂銆�
*
* @author Ryan
* @date 2026/1/10 14:42
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
private void autoPubTasks() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ // 浠呭鐞嗗緟涓嬪彂/宸茬敓鎴愪笅鍙戝彿鐨勫伐浣滄。銆�
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L))
+ .orderBy("user_no", true)
+ .orderBy("batch_seq", true)
+ .orderBy("plt_type", true));
if (wrkMasts.isEmpty()) {
return;
}
- Collections.shuffle(wrkMasts);
+
+ List<WorkTaskParams> paramsList = new ArrayList<>();
+ Map<String, LinkedHashMap<String, List<WorkTaskParams>>> outboundTasksByUserNo = new LinkedHashMap<>();
for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getIoType()>100&& !wrkMast.getPdcType().equals("Y")) {
- continue;
- }
- Integer crnNo = wrkMast.getCrnNo();
- //璇ュ爢鍨涙満宸茬粡涓嬪彂浠诲姟缁檞cs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(2L, 12L)));
- if (!wrkMasts1.isEmpty()) {
+ // 鍑哄簱绫讳换鍔★紙ioType > 100锛夐粯璁ら渶瑕� ERP 纭锛涙湭纭鐨勪换鍔″湪杩欓噷鐩存帴璺宠繃銆�
+ if (wrkMast.getIoType() > 100 && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
continue;
}
- String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
- String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
- WorkTaskParams params = new WorkTaskParams();
- //鍑哄簱鍜岀Щ搴�
- if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getStaNo())&& !wrkMast.getStaNo().equals("0")) {
- params.setType("out")
- .setTaskNo(wrkMast.getWrkNo()+"")
- .setLocNo(wcsSourceLocNo)
- .setStaNo(String.valueOf(wrkMast.getStaNo()))
- .setTaskPri(wrkMast.getIoPri().intValue())
- .setBarcode(wrkMast.getBarcode());
- }else if(wrkMast.getIoType()==2&& !Cools.isEmpty(wrkMast.getSourceStaNo())){
- params.setType("in")
- .setTaskNo(wrkMast.getWrkNo()+"")
- .setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()))
- .setLocNo(wcsLocNo)
- .setTaskPri(wrkMast.getIoPri().intValue())
- .setBarcode(wrkMast.getBarcode());
+ WorkTaskParams params = buildWorkTaskParams(wrkMast);
+ if (isOutboundPublishTask(wrkMast)) {
+ String userNo = normalizeGroupKey(wrkMast.getUserNo());
+ String batchSeq = normalizeGroupKey(wrkMast.getBatchSeq());
+ outboundTasksByUserNo
+ .computeIfAbsent(userNo, key -> new LinkedHashMap<>())
+ .computeIfAbsent(batchSeq, key -> new ArrayList<>())
+ .add(params);
} else {
- params.setType("move")
- .setTaskNo(wrkMast.getWrkNo()+"")
- .setSourceLocNo(wcsSourceLocNo)
- .setLocNo(wcsLocNo)
- .setBarcode(wrkMast.getBarcode());
+ paramsList.add(params);
}
- R r = wcsApiService.pubWrkToWcs(params);
- if (r.get("code").equals(200)){
- break;
+ }
+
+ if (!paramsList.isEmpty()) {
+ R r = wcsApiService.pubWrksToWcs(paramsList);
+ if (r == null || !Objects.equals(r.get("code"), 200)) {
+ log.warn("鎵归噺涓嬪彂浠诲姟鍒癢CS澶辫触, result={}", r);
}
- };
+ }
+
+ if (outboundTasksByUserNo.isEmpty()) {
+ return;
+ }
+
+ for (Map.Entry<String, LinkedHashMap<String, List<WorkTaskParams>>> 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 (!Objects.equals(batchSeq, blockingBatchSeq)) {
+ log.info("鍑哄簱鎵规鏈畬鎴愶紝鏆傚仠鍚庣画涓嬪彂, userNo={}, blockingBatchSeq={}, nextBatchSeq={}",
+ userNo, blockingBatchSeq, batchSeq);
+ break;
+ }
+
+ List<WorkTaskParams> batchParams = userEntry.getValue().get(batchSeq);
+ if (batchParams == null || batchParams.isEmpty()) {
+ 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;
+ }
+ }
+ }
+ }
+
+ private WorkTaskParams buildWorkTaskParams(WrkMast wrkMast) {
+ // WMS 搴撲綅缂栫爜杞崲鎴� WCS 鍙瘑鍒殑搴撲綅缂栫爜銆�
+ String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
+ String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
+ WorkTaskParams params = new WorkTaskParams();
+
+ // 101: 鍑哄簱銆傛湁搴忎换鍔℃墠鍚� WCS 浼� batch/batchSeq锛泂eq=0 琛ㄧず鏃犲簭锛屼笉浼犺繖涓や釜瀛楁銆�
+ if (wrkMast.getIoType() == 101) {
+ params.setType("out")
+ .setTaskNo(wrkMast.getWrkNo() + "")
+ .setLocNo(wcsSourceLocNo)
+ .setStaNo(String.valueOf(wrkMast.getStaNo()))
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBarcode(wrkMast.getBarcode());
+ if (wrkMast.getPltType() != null && wrkMast.getPltType() > 0) {
+ params.setBatch(wrkMast.getUserNo())
+ .setBatchSeq(wrkMast.getPltType());
+ }
+ // 2: 鍏ュ簱銆傚叆搴撴帴鍙ｄ娇鐢� sourceStaNo + 鐩爣搴撲綅銆�
+ } else if (wrkMast.getIoType() == 2 && !Cools.isEmpty(wrkMast.getSourceStaNo())) {
+ params.setType("in")
+ .setTaskNo(wrkMast.getWrkNo() + "")
+ .setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()))
+ .setLocNo(wcsLocNo)
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBarcode(wrkMast.getBarcode());
+ // 鍏朵綑璧扮Щ搴撴帴鍙ｏ紝婧愬簱浣嶅拰鐩爣搴撲綅閮介渶瑕佸甫缁� WCS銆�
+ } else {
+ params.setType("move")
+ .setTaskNo(wrkMast.getWrkNo() + "")
+ .setSourceLocNo(wcsSourceLocNo)
+ .setLocNo(wcsLocNo)
+ .setBarcode(wrkMast.getBarcode());
+ }
+ return params;
+ }
+
+ private boolean isOutboundPublishTask(WrkMast wrkMast) {
+ 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);
+ if (compare != 0) {
+ return compare;
+ }
+ }
+ 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;
+ }
+
+ private String normalizeGroupKey(String value) {
+ return Cools.isEmpty(value) ? "" : value;
}
}
--
Gitblit v1.9.1