From e20d057b0ee325757e6f7510a65ca22e545010d7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 19:15:33 +0800
Subject: [PATCH] 修复移库任务下发给wcs

---
 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..4d4f1ff 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -726,7 +726,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 +912,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 +943,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 +1061,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());

--
Gitblit v1.9.1