From 2a2f094b447c604ca2884922586df32f0665b81c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 09:27:44 +0800
Subject: [PATCH] 双伸出库改成订单出库 完成转订单

---
 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 986b6ae..1614a15 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -687,6 +687,11 @@
         }
         WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getSuperTaskNo()));
         if (Objects.isNull(mast)) {
+            // pakoutOrderPause 涓鏃讹紝WMS 鍦� WCS 纭鍙栨秷鍚庝細绔嬪嵆鏈湴鍙栨秷骞跺綊妗d换鍔°��
+            // 濡傛灉 WCS 鍚庣画鍙堣ˉ鍙� task_cancel 鍥炶皟锛屾鏃跺綋鍓嶅伐浣滄。宸蹭笉瀛樺湪锛屾寜骞傜瓑鎴愬姛澶勭悊銆�
+            if ("task".equalsIgnoreCase(params.getNotifyType()) && "task_cancel".equalsIgnoreCase(params.getMsgType())) {
+                return R.ok();
+            }
             throw new CoolException("浠诲姟妗d笉瀛樺湪锛侊紒");
         }
 
@@ -726,7 +731,7 @@
             //浠诲姟
             if ("task_complete".equalsIgnoreCase(params.getMsgType())) {
 
-                if (mast.getIoType() == 1 || mast.getIoType() == 2 || mast.getIoType() == 10 || mast.getIoType() == CHANGE_LOC_IO_TYPE) {
+                if (mast.getIoType() == 1 || mast.getIoType() == 2 || mast.getIoType() == 11 || mast.getIoType() == CHANGE_LOC_IO_TYPE) {
                     mast.setWrkSts(4L);
                 } else if (isOutboundTask(mast) && canMarkOutboundTaskComplete(mast)) {
                     mast.setWrkSts(14L);
@@ -1370,7 +1375,7 @@
         if (Objects.isNull(wrkMast)) {
             return;
         }
-        if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) {
+        if (wrkMast.getIoType()==1 || wrkMast.getIoType()==11) {
             wrkMast.setWrkSts(2L);
             wrkMast.setModiTime(new Date());
             wrkMastService.updateById(wrkMast);

--
Gitblit v1.9.1