From 5d480903c47b8966a086fc6c9bb26151f695570a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 13 三月 2026 15:19:03 +0800
Subject: [PATCH] erp下发停止出库任务，wms取消wcs任务
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 143 ++++-------------------------------------------
1 files changed, 14 insertions(+), 129 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 58e8d31..9aa7192 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -377,12 +377,12 @@
if (param == null || Cools.isEmpty(param.getOrderId())) {
throw new CoolException("orderNo涓嶈兘涓虹┖");
}
- if (param.getReason() == null) {
+ if (param.getExecute() == null) {
throw new CoolException("reason涓嶈兘涓虹┖");
}
List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
- if (Objects.equals(param.getReason(), 1)) {
+ if (Objects.equals(param.getExecute(), 1)) {
// ERP纭绔嬪嵆鎵ц锛屼粎澶勭悊寰呬笅鍙戠殑鍑哄簱浠诲姟銆�
List<WrkMast> pendingTasks = activeTasks.stream()
.filter(wrkMast -> wrkMast != null && Objects.equals(wrkMast.getWrkSts(), 11L))
@@ -415,94 +415,30 @@
result.put("confirmedCount", confirmedCount);
return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
}
- if (Objects.equals(param.getReason(), 2)) {
- // ERP璇锋眰鍙栨秷浠诲姟锛氭湭涓嬪彂浠诲姟鐩存帴鏈湴鍙栨秷锛屽凡涓嬪彂浠诲姟浜ょ粰WCS鍒ゅ畾鍙彇娑堟竻鍗曘��
+ if (Objects.equals(param.getExecute(), 2)) {
+ // ERP璇锋眰鍙栨秷浠诲姟锛氱洿鎺ユ敹闆嗕换鍔″彿锛屾寜 taskList 鏍煎紡鍙戦�佺粰 WCS銆�
Map<String, Object> result = new HashMap<>();
result.put("orderNo", param.getOrderId());
- result.put("reason", param.getReason());
+ result.put("execute", param.getExecute());
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);
}
-
- 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());
-
- 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);
-
- 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);
+ List<HashMap<String,Object>> taskList = new ArrayList<>();
+ for (WrkMast wrkMast : activeTasks) {
+ HashMap<String,Object> hashMap = new HashMap<>();
+ hashMap.put("taskNo", wrkMast.getWrkNo());
+ taskList.add(hashMap);
}
-
- 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);
+ wcsApiService.pauseOutTasks(taskList);
+ return R.ok("鍙栨秷浠诲姟宸插彂閫佽嚦WCS").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涓嶈兘涓虹┖");
- }
- if (param.getExecute() == null) {
- 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.setOrderId(param.getOrderId());
- pauseParam.setReason(2);
- return pakoutOrderPause(pauseParam);
- }
- throw new CoolException("execute浠呮敮鎸�1鎴�2");
+ return null;
}
private List<WrkMast> findActiveOutboundTasks(String orderNo) {
@@ -631,14 +567,7 @@
return orderDetl.getMatnr() + "|batch=" + (orderDetl.getBatch() == null ? "" : orderDetl.getBatch()) + "|lack=" + lackQty;
}
- private boolean needNotifyWcsStop(WrkMast wrkMast) {
- return wrkMast != null
- && wrkMast.getWrkSts() != null
- && wrkMast.getWrkSts() >= 12L
- && wrkMast.getWrkSts() < 14L;
- }
-
- private StopOutTaskParams buildStopOutTaskParams(OpenOrderPakoutPauseParam param, List<WrkMast> wrkMasts) {
+ private StopOutTaskParams buildStopOutTaskParams(List<WrkMast> wrkMasts) {
StopOutTaskParams stopParams = new StopOutTaskParams();
// WCS鍙栨秷鎺ュ彛浠呮帴鏀� taskList.taskNo銆�
for (WrkMast wrkMast : wrkMasts) {
@@ -647,50 +576,6 @@
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
--
Gitblit v1.9.1