From 91c235d583d3f6579d060fac9fa91faa65a1b42c Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 07 四月 2026 14:52:56 +0800
Subject: [PATCH] 取消还原
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 29 ++++++++++-------------------
2 files changed, 11 insertions(+), 20 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 21be91e..5d658fb 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -791,7 +791,7 @@
return R.ok("鏃犱换鍔￠渶瑕佸彇娑�");
}
if (!Boolean.parseBoolean(String.valueOf(switchValue))) {
- throw new CoolException("WCS寮�鍏冲叧闂�");
+ return R.ok("WCS寮�鍏冲叧闂�");
}
HashMap<String,Object> map = new HashMap<>();
map.put("taskList", params);
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 8b3e522..541a141 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -417,7 +417,7 @@
return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
}
if (Objects.equals(param.getExecute(), 2)) {
- // ERP璇锋眰鍙栨秷浠诲姟锛氭寜 plt_type 浠庡ぇ鍒板皬鍏� WCS 鍐� WMS锛涘け璐ユ垨寮傚父鍒欏仠姝㈠悗缁紝鎺ュ彛浠嶈繑鍥炲師鎴愬姛缁撴瀯銆�
+ // ERP璇锋眰鍙栨秷浠诲姟锛氱洿鎺ユ敹闆嗕换鍔″彿锛屾寜 taskList 鏍煎紡鍙戦�佺粰 WCS銆�
Map<String, Object> result = new HashMap<>();
result.put("orderNo", param.getOrderId());
result.put("execute", param.getExecute());
@@ -425,26 +425,17 @@
if (activeTasks.isEmpty()) {
return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
}
- List<WrkMast> sorted = new ArrayList<>(activeTasks);
- sorted.sort(Comparator.comparing(WrkMast::getPltType, Comparator.nullsLast(Comparator.reverseOrder())));
- for (WrkMast wrkMast : sorted) {
- try {
- if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() == 11L) {
- workService.cancelWrkMast(wrkMast.getWrkNo() + "", 9955L);
- }else{
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("taskNo", wrkMast.getWrkNo());
- List<HashMap<String, Object>> one = new ArrayList<>();
- one.add(hashMap);
- R wcsR = wcsApiService.pauseOutTasks(one);
- requireWcsPauseOk(wcsR);
- workService.cancelWrkMast(wrkMast.getWrkNo() + "", 9955L);
- }
- } catch (Exception e) {
- log.warn("[pakoutOrderPause] execute=2 鍙栨秷涓, orderNo={}, err={}", param.getOrderId(), e.getMessage());
- break;
+ List<HashMap<String,Object>> taskList = new ArrayList<>();
+ for (WrkMast wrkMast : activeTasks) {
+ HashMap<String,Object> hashMap = new HashMap<>();
+ hashMap.put("taskNo", wrkMast.getWrkNo());
+ if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() ==11L) {
+ workService.cancelWrkMast(wrkMast.getWrkNo()+"", 9955L);
+ continue;
}
+ taskList.add(hashMap);
}
+ wcsApiService.pauseOutTasks(taskList);
return R.ok("鍙栨秷浠诲姟宸插彂閫佽嚦WCS").add(result);
}
throw new CoolException("reason浠呮敮鎸�1鎴�2");
--
Gitblit v1.9.1