From 1b31d14e361c01fcd4e5c2dcfe0b6fb3a63c92fc Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 13 三月 2026 14:56:14 +0800
Subject: [PATCH] erp下发停止出库任务，wms取消wcs任务
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 202 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 150 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index e984af6..58e8d31 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -375,76 +375,134 @@
@Transactional
public R pakoutOrderPause(OpenOrderPakoutPauseParam param) {
if (param == null || Cools.isEmpty(param.getOrderId())) {
- throw new CoolException("orderNo is empty");
+ throw new CoolException("orderNo涓嶈兘涓虹┖");
}
- Order order = orderService.selectByNo(param.getOrderId());
- if (order == null) {
- order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderId());
- }
- if (order == null) {
- throw new CoolException("order not found: " + param.getOrderId());
+ if (param.getReason() == null) {
+ throw new CoolException("reason涓嶈兘涓虹┖");
}
List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
- if (activeTasks.isEmpty()) {
- return R.ok("no active out tasks");
- }
-
- Date now = new Date();
- int pausedCount = 0;
- List<WrkMast> issuedTasks = new ArrayList<>();
- for (WrkMast wrkMast : activeTasks) {
- if (wrkMast == null || "Y".equalsIgnoreCase(wrkMast.getPauseMk())) {
- continue;
+ if (Objects.equals(param.getReason(), 1)) {
+ // ERP纭绔嬪嵆鎵ц锛屼粎澶勭悊寰呬笅鍙戠殑鍑哄簱浠诲姟銆�
+ List<WrkMast> pendingTasks = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && Objects.equals(wrkMast.getWrkSts(), 11L))
+ .collect(Collectors.toList());
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderId());
+ result.put("taskCount", pendingTasks.size());
+ if (pendingTasks.isEmpty()) {
+ result.put("confirmedCount", 0);
+ return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
}
- wrkMast.setPauseMk("Y");
- wrkMast.setUpdMk(needNotifyWcsStop(wrkMast) ? "WCS_STOP_REQUESTED" : "WMS_PAUSED");
- wrkMast.setManuType("ERP_PAUSE");
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(9527L);
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("pause out task failed: " + wrkMast.getWrkNo());
+
+ Date now = new Date();
+ int confirmedCount = 0;
+ for (WrkMast wrkMast : pendingTasks) {
+ if (wrkMast == null || "Y".equalsIgnoreCase(wrkMast.getPdcType())) {
+ continue;
+ }
+ wrkMast.setPdcType("Y");
+// wrkMast.setUpdMk("ERP_CONFIRMED");
+// wrkMast.setManuType("ERP_CONFIRM_OUT");
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(9527L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("纭鎵ц鍑哄簱浠诲姟澶辫触: " + wrkMast.getWrkNo());
+ }
+ confirmedCount++;
}
- pausedCount++;
- if (needNotifyWcsStop(wrkMast)) {
- issuedTasks.add(wrkMast);
+
+ result.put("confirmedCount", confirmedCount);
+ return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
+ }
+ if (Objects.equals(param.getReason(), 2)) {
+ // ERP璇锋眰鍙栨秷浠诲姟锛氭湭涓嬪彂浠诲姟鐩存帴鏈湴鍙栨秷锛屽凡涓嬪彂浠诲姟浜ょ粰WCS鍒ゅ畾鍙彇娑堟竻鍗曘��
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderId());
+ result.put("reason", param.getReason());
+ result.put("taskCount", activeTasks.size());
+ if (activeTasks.isEmpty()) {
+ result.put("successList", Collections.emptyList());
+ result.put("failList", Collections.emptyList());
+ result.put("cancelledCount", 0);
+ return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
}
- }
- if (pausedCount == 0) {
- return R.ok("tasks already paused");
- }
+ Map<String, WrkMast> taskIndex = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && wrkMast.getWrkNo() != null)
+ .collect(Collectors.toMap(
+ wrkMast -> String.valueOf(wrkMast.getWrkNo()),
+ wrkMast -> wrkMast,
+ (left, right) -> left,
+ LinkedHashMap::new
+ ));
+ List<WrkMast> directCancelTasks = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && !needNotifyWcsStop(wrkMast))
+ .collect(Collectors.toList());
+ List<WrkMast> wcsCancelTasks = activeTasks.stream()
+ .filter(this::needNotifyWcsStop)
+ .collect(Collectors.toList());
- if (!issuedTasks.isEmpty()) {
- wcsApiService.pauseOutTasks(buildStopOutTaskParams(param, issuedTasks));
- }
+ LinkedHashSet<String> successTaskNos = new LinkedHashSet<>();
+ LinkedHashSet<String> failTaskNos = new LinkedHashSet<>();
+ cancelOutboundTasks(directCancelTasks.stream()
+ .map(WrkMast::getWrkNo)
+ .filter(Objects::nonNull)
+ .map(String::valueOf)
+ .collect(Collectors.toList()), taskIndex, successTaskNos);
- Map<String, Object> result = new HashMap<>();
- result.put("orderNo", param.getOrderId());
- result.put("pausedCount", pausedCount);
- result.put("wcsStopCount", issuedTasks.size());
- return R.ok("pause out success").add(result);
+ List<String> wcsSuccessList = Collections.emptyList();
+ List<String> wcsFailList = Collections.emptyList();
+ if (!wcsCancelTasks.isEmpty()) {
+ R wcsResult = wcsApiService.pauseOutTasks(buildStopOutTaskParams(param, wcsCancelTasks));
+ wcsSuccessList = extractTaskNoList(wcsResult, "successList");
+ wcsFailList = extractTaskNoList(wcsResult, "failList");
+ cancelOutboundTasks(wcsSuccessList, taskIndex, successTaskNos);
+
+ LinkedHashSet<String> wcsFailTaskNos = new LinkedHashSet<>(wcsFailList);
+ if (wcsFailTaskNos.isEmpty()) {
+ for (WrkMast wrkMast : wcsCancelTasks) {
+ String taskNo = String.valueOf(wrkMast.getWrkNo());
+ if (!successTaskNos.contains(taskNo)) {
+ wcsFailTaskNos.add(taskNo);
+ }
+ }
+ }
+ failTaskNos.addAll(wcsFailTaskNos);
+ wcsFailList = new ArrayList<>(wcsFailTaskNos);
+ }
+
+ result.put("wcsTaskCount", wcsCancelTasks.size());
+ result.put("wcsSuccessList", wcsSuccessList);
+ result.put("wcsFailList", wcsFailList);
+ result.put("successList", new ArrayList<>(successTaskNos));
+ result.put("failList", new ArrayList<>(failTaskNos));
+ result.put("cancelledCount", successTaskNos.size());
+ result.put("failCount", failTaskNos.size());
+ return R.ok(successTaskNos.isEmpty() ? "娌℃湁鍙彇娑堜换鍔�" : "鍙栨秷鍑哄簱浠诲姟鎴愬姛").add(result);
+ }
+ throw new CoolException("reason浠呮敮鎸�1鎴�2");
}
@Override
@Transactional
public R pakoutOrderExecute(OpenOrderPakoutExecuteParam param) {
if (param == null || Cools.isEmpty(param.getOrderId())) {
- throw new CoolException("orderId is empty");
+ throw new CoolException("orderId涓嶈兘涓虹┖");
}
if (param.getExecute() == null) {
- throw new CoolException("execute is empty");
+ throw new CoolException("execute涓嶈兘涓虹┖");
}
if (Objects.equals(param.getExecute(), 1)) {
return createPakoutTasks(param.getOrderId());
}
if (Objects.equals(param.getExecute(), 2)) {
OpenOrderPakoutPauseParam pauseParam = new OpenOrderPakoutPauseParam();
-// pauseParam.getOrderId(param.getOrderId());
-// pauseParam.setReason("OPEN_API_PAUSE");
+ pauseParam.setOrderId(param.getOrderId());
+ pauseParam.setReason(2);
return pakoutOrderPause(pauseParam);
}
- throw new CoolException("execute only supports 1 or 2");
+ throw new CoolException("execute浠呮敮鎸�1鎴�2");
}
private List<WrkMast> findActiveOutboundTasks(String orderNo) {
@@ -461,8 +519,8 @@
}
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("wrk_no", wrkNos)
- .in("io_type", Arrays.asList(101, 103, 107, 108, 110))
- .lt("wrk_sts", 14L));
+ .in("io_type", Arrays.asList(101, 103, 104, 107, 108, 110))
+ .in("wrk_sts", Arrays.asList(11L, 12L, 13L)));
if (wrkMasts == null || wrkMasts.isEmpty()) {
return Collections.emptyList();
}
@@ -582,18 +640,57 @@
private StopOutTaskParams buildStopOutTaskParams(OpenOrderPakoutPauseParam param, List<WrkMast> wrkMasts) {
StopOutTaskParams stopParams = new StopOutTaskParams();
- stopParams.setOrderNo(param.getOrderId());
- stopParams.setReason(param.getReason());
+ // WCS鍙栨秷鎺ュ彛浠呮帴鏀� taskList.taskNo銆�
for (WrkMast wrkMast : wrkMasts) {
StopOutTaskParams.TaskItem item = new StopOutTaskParams.TaskItem();
item.setTaskNo(String.valueOf(wrkMast.getWrkNo()));
- if (wrkMast.getStaNo() != null) {
- item.setStaNo(String.valueOf(wrkMast.getStaNo()));
- }
- item.setLocNo(wrkMast.getSourceLocNo());
stopParams.getTasks().add(item);
}
return stopParams;
+ }
+
+ private List<String> extractTaskNoList(R result, String key) {
+ if (result == null) {
+ return Collections.emptyList();
+ }
+ List<String> taskNos = toTaskNoList(result.get(key));
+ if (!taskNos.isEmpty()) {
+ return taskNos;
+ }
+ Object data = result.get("data");
+ if (data instanceof Map) {
+ return toTaskNoList(((Map<?, ?>) data).get(key));
+ }
+ if (data instanceof JSONObject) {
+ return toTaskNoList(((JSONObject) data).get(key));
+ }
+ return Collections.emptyList();
+ }
+
+ private List<String> toTaskNoList(Object value) {
+ if (value == null) {
+ return Collections.emptyList();
+ }
+ if (value instanceof Collection) {
+ List<String> taskNos = new ArrayList<>();
+ for (Object item : (Collection<?>) value) {
+ if (item != null) {
+ taskNos.add(String.valueOf(item));
+ }
+ }
+ return taskNos;
+ }
+ return JSON.parseArray(JSON.toJSONString(value), String.class);
+ }
+
+ private void cancelOutboundTasks(List<String> taskNos, Map<String, WrkMast> taskIndex, Set<String> successTaskNos) {
+ for (String taskNo : taskNos) {
+ if (Cools.isEmpty(taskNo) || successTaskNos.contains(taskNo) || !taskIndex.containsKey(taskNo)) {
+ continue;
+ }
+ workService.cancelWrkMast(taskNo, 9527L);
+ successTaskNos.add(taskNo);
+ }
}
@Override
@@ -1336,6 +1433,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setUserNo(param.getOrderId());//璁㈠崟鍙�
wrkMast.setPltType(param.getSeq());//鍑哄簱椤哄簭锛屼粠1寮�濮�
wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
--
Gitblit v1.9.1