From 632bde0f32999a2b319b706e23d90bc1b5dd8cc2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 21 四月 2026 17:22:56 +0800
Subject: [PATCH] 1.新增拍照功能
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 198 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 8f2a819..d1dc7cc 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -16,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.LinkedHashMap;
import java.util.Date;
+import java.util.Map;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2020/7/7
@@ -28,6 +32,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;
@Autowired
private WcsApiService wcsApiService;
@@ -59,11 +65,11 @@
* 浠诲姟鑷姩涓嬪彂銆�
* <p>
* 璋冨害鍣ㄥ彧璐熻矗浠庡伐浣滄。涓寫鍑衡�滃綋鍓嶅厑璁镐笅鍙戔�濈殑浠诲姟锛屽苟灏嗗叾杞崲鎴� WCS 鎺ュ彛闇�瑕佺殑鎶ユ枃缁撴瀯锛�
- * 鐪熸鐨勬壒閲忓垎缁勩�佽皟鐢� WCS銆佷互鍙婁笅鍙戞垚鍔熷悗鐨勭姸鎬佹帹杩涢兘鏀惧湪 service 灞傜粺涓�澶勭悊銆�
+ * 鍑哄簱浠诲姟鎸� userNo -> batchSeq 鍒嗗眰姹囨�诲悗涓茶涓嬪彂锛岀‘淇濆悓涓� userNo 涓嬪墠涓�涓� batchSeq 瀹屾垚鍚庡啀鍙戜笅涓�涓��
* <p>
* 褰撳墠鎵归噺涓嬪彂鐨勫綊骞剁淮搴︽槸锛�
* 1. WCS鎺ュ彛璺緞锛堝叆搴�/鍑哄簱/绉诲簱涓嶈兘娣峰彂锛夛紱
- * 2. work_mast.user_no + batch_seq锛堢浉鍚岃鍗曞悓鎵规鐨勪换鍔″繀椤绘斁鍒板悓涓�鎵规涓�璧蜂笂鎶ワ級銆�
+ * 2. 鍑哄簱浠诲姟鎸� work_mast.user_no -> work_mast.batch_seq 鍒嗗眰姹囨�伙紝骞舵寜 batchSeq 鑷劧鍗囧簭涓嬪彂銆�
*
* @author Ryan
* @date 2026/1/10 14:42
@@ -80,56 +86,170 @@
}
List<WorkTaskParams> paramsList = new ArrayList<>();
+ Map<String, LinkedHashMap<String, List<WorkTaskParams>>> outboundTasksByUserNo = new LinkedHashMap<>();
for (WrkMast wrkMast : wrkMasts) {
// 鍑哄簱绫讳换鍔★紙ioType > 100锛夐粯璁ら渶瑕� ERP 纭锛涙湭纭鐨勪换鍔″湪杩欓噷鐩存帴璺宠繃銆�
if (wrkMast.getIoType() > 100 && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
continue;
}
- // 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銆�
+ 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);
}
- paramsList.add(params);
}
- if (paramsList.isEmpty()) {
+
+ 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;
}
- // service 灞備細缁х画鎸夆�滄帴鍙ｈ矾寰� + userNo鈥濆垎缁勫悗鍐嶆壒閲忎笂鎶ャ��
- R r = wcsApiService.pubWrksToWcs(paramsList);
- if (!r.get("code").equals(200)) {
- log.warn("鎵归噺涓嬪彂浠诲姟鍒癢CS澶辫触, result={}", r);
+ 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 (blockingBatchSeq != null && compareBatchSeqNatural(batchSeq, blockingBatchSeq) != 0) {
+ 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.getBatchSeq())
+ .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.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;
+ 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 String normalizeGroupKey(String value) {
+ return Cools.isEmpty(value) ? "" : value;
+ }
+
}
--
Gitblit v1.9.1