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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 1315844..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 纭鍙栨秷鍚庝細绔嬪嵆鏈湴鍙栨秷骞跺綊妗ｄ换鍔°��
+ // 濡傛灉 WCS 鍚庣画鍙堣ˉ鍙� task_cancel 鍥炶皟锛屾鏃跺綋鍓嶅伐浣滄。宸蹭笉瀛樺湪锛屾寜骞傜瓑鎴愬姛澶勭悊銆�
+ if ("task".equalsIgnoreCase(params.getNotifyType()) && "task_cancel".equalsIgnoreCase(params.getMsgType())) {
+ return R.ok();
+ }
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
@@ -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);
@@ -912,6 +917,11 @@
if (params == null || Cools.isEmpty(params.getLocNo())) {
return R.error("locNo涓嶈兘涓虹┖");
}
+ String s = Utils.WCSLocToWMSLoc(params.getLocNo());
+ if (Cools.isEmpty(params.getLocNo())) {
+ return R.error("locNo<UNK>");
+ }
+ params.setLocNo(s);
LocMast sourceLoc = locMastService.selectById(params.getLocNo());
if (sourceLoc == null) {
return R.error("褰撳墠搴撲綅涓嶅瓨鍦�");
@@ -938,7 +948,7 @@
}
private CrnDepthRuleProfile resolveChangeLocProfile(LocMast sourceLoc) {
- RowLastno rowLastno = rowLastnoService.selectById(sourceLoc.getWhsType());
+ RowLastno rowLastno = rowLastnoService.selectById(3);
return basCrnDepthRuleService.resolveProfile(rowLastno, sourceLoc.getCrnNo(), sourceLoc.getRow1());
}
@@ -1056,8 +1066,8 @@
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L);
- wrkMast.setIoType(CHANGE_LOC_IO_TYPE);
+ wrkMast.setWrkSts(1L);
+ wrkMast.setIoType(11);
wrkMast.setIoPri(10D);
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLoc.getLocNo());
@@ -1365,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