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 | 138 ++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 77 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 707bbb7..9aa7192 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -374,77 +374,71 @@
@Override
@Transactional
public R pakoutOrderPause(OpenOrderPakoutPauseParam param) {
- if (param == null || Cools.isEmpty(param.getOrderNo())) {
- throw new CoolException("orderNo is empty");
+ if (param == null || Cools.isEmpty(param.getOrderId())) {
+ throw new CoolException("orderNo涓嶈兘涓虹┖");
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (order == null) {
- order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
- }
- if (order == null) {
- throw new CoolException("order not found: " + param.getOrderNo());
+ if (param.getExecute() == null) {
+ throw new CoolException("reason涓嶈兘涓虹┖");
}
- List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderNo());
- 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;
+ List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
+ if (Objects.equals(param.getExecute(), 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.getExecute(), 2)) {
+ // ERP璇锋眰鍙栨秷浠诲姟锛氱洿鎺ユ敹闆嗕换鍔″彿锛屾寜 taskList 鏍煎紡鍙戦�佺粰 WCS銆�
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderId());
+ result.put("execute", param.getExecute());
+ result.put("taskCount", activeTasks.size());
+ if (activeTasks.isEmpty()) {
+ return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
}
+ 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);
+ }
+ wcsApiService.pauseOutTasks(taskList);
+ return R.ok("鍙栨秷浠诲姟宸插彂閫佽嚦WCS").add(result);
}
-
- if (pausedCount == 0) {
- return R.ok("tasks already paused");
- }
-
- if (!issuedTasks.isEmpty()) {
- wcsApiService.pauseOutTasks(buildStopOutTaskParams(param, issuedTasks));
- }
-
- Map<String, Object> result = new HashMap<>();
- result.put("orderNo", param.getOrderNo());
- result.put("pausedCount", pausedCount);
- result.put("wcsStopCount", issuedTasks.size());
- return R.ok("pause out success").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");
- }
- if (param.getExecute() == null) {
- throw new CoolException("execute is empty");
- }
- if (Objects.equals(param.getExecute(), 1)) {
- return createPakoutTasks(param.getOrderId());
- }
- if (Objects.equals(param.getExecute(), 2)) {
- OpenOrderPakoutPauseParam pauseParam = new OpenOrderPakoutPauseParam();
- pauseParam.setOrderNo(param.getOrderId());
- pauseParam.setReason("OPEN_API_PAUSE");
- return pakoutOrderPause(pauseParam);
- }
- throw new CoolException("execute only supports 1 or 2");
+ return null;
}
private List<WrkMast> findActiveOutboundTasks(String orderNo) {
@@ -461,8 +455,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();
}
@@ -573,24 +567,12 @@
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();
- stopParams.setOrderNo(param.getOrderNo());
- 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;
@@ -1276,7 +1258,7 @@
if (param.getFull() == 1) {
//婊℃墭鐩�
- mat = matService.selectByMatnr(param.getMatnr());
+ mat = matService.selectByMatnr("emptyPallet");
} else if (param.getFull() == 0) {
//绌烘墭鐩�
mat = matService.selectByMatnr("emptyPallet");
@@ -1285,6 +1267,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+// waitPakin.setMatnr(param.getMatnr());
waitPakin.setBatch(String.valueOf(param.getBatchId()));
waitPakin.setZpallet(param.getPalletId()); // 鎵樼洏鐮�
@@ -1335,6 +1318,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