From 10dbf9aae07dcd7c569521613b072088abae1c2e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 22 五月 2025 17:18:32 +0800
Subject: [PATCH] 库存出库任务联调

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 325480d..1ccabdd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -15,7 +15,7 @@
 import com.vincent.rsf.server.manager.service.*;
 import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
 import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.LocStsType;
 import com.vincent.rsf.server.system.utils.SerialRuleUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -74,7 +74,7 @@
         task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
         taskService.updateById(task);
 
-        basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
+        basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
         basStation.setBarcode(null);
         basStationService.updateById(basStation);
 
@@ -164,8 +164,8 @@
                             String targetSite, String sourceSiteNo, Long loginUserId) {
         Task task = new Task();
         task.setTaskCode(ruleCode)
-                .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
-                .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
+                .setTaskStatus(TaskStsType.GENERATE_IN.id)
+                .setTaskType(TaskType.TASK_TYPE_IN.type)
                 .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.id)
                 .setTargLoc(targetLoc)
                 .setBarcode(barcode)
@@ -327,6 +327,7 @@
 //        locNo.setWorkNo(ruleCode);
 //        return locNo;
 //    }
+    @Override
     public InTaskMsgDto getLocNo(TaskInParam param) {
         String matnr = null;
         String batch = null;
@@ -363,6 +364,9 @@
             case "CTU": //ctu
                 dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
                 break;
+            default:
+                dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
+                break;
         }
         return dto;
     }

--
Gitblit v1.9.1