From 734f0c5fa7c83c73e388e25c9863663b3559fe23 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 30 五月 2025 15:26:44 +0800
Subject: [PATCH] #移库找库位优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 6101454..03ba701 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -41,8 +41,6 @@
     @Autowired
     private DeviceSiteService deviceSiteService;
     @Autowired
-    private SlaveProperties slaveProperties;
-    @Autowired
     private WcsService wcsService;
 
 
@@ -100,6 +98,7 @@
                     .setTaskCode(ruleCode)
                     .setParentId(moveTask.getId())
                     .setTargSite(siteNo)
+                    .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
                     .setUpdateBy(loginUserId)
                     .setCreateBy(loginUserId)
                     .setCreateTime(new Date())
@@ -158,7 +157,6 @@
                 }
 
                 task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
-
             }
 
             if (!taskService.save(task)) {
@@ -173,6 +171,9 @@
                         .setBatch(item.getBatch())
                         .setUpdateBy(loginUserId)
                         .setCreateBy(loginUserId)
+                        .setSource(item.getId())
+                        .setSourceId(item.getLocId())
+                        .setSourceCode(item.getLocCode())
                         .setCreateTime(new Date())
                         .setUpdateTime(new Date())
                         .setOrderType(OrderType.ORDER_OUT.type)
@@ -252,8 +253,10 @@
             }
             TaskInParam param = new TaskInParam();
             param.setIoType(TaskType.TASK_TYPE_OUT.type)
+                    .setOrgLoc(map.getOrgLoc())
                     .setSourceStaNo(Integer.parseInt(deviceSite.getSite()))
-                    .setLocType1(Integer.parseInt(orgLoc.getType()));
+                    .setLocType1(Integer.parseInt(orgLoc.getType())
+                    );
             InTaskMsgDto locNo = null;
             try {
                 locNo = wcsService.getLocNo(param);
@@ -283,8 +286,9 @@
                 .setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type)
                 .setTargLoc(targetLoc.getCode())
                 .setUpdateBy(loginUserId)
+                .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
                 .setUpdateTime(new Date())
-                .setTaskStatus(TaskStsType.GENERATE_IN.id)
+                .setTaskStatus(TaskStsType.GENERATE_OUT.id)
                 .setBarcode(orgLoc.getBarcode());
 
         if (!taskService.save(task)) {
@@ -301,6 +305,9 @@
                         .setAnfme(item.getAnfme())
                         .setBatch(item.getBatch())
                         .setUpdateBy(loginUserId)
+                        .setSourceId(item.getLocId())
+                        .setSourceCode(item.getLocCode())
+                        .setSource(item.getId())
                         .setUpdateTime(new Date())
                         .setOrderType(OrderType.ORDER_IN.type)
                         .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));

--
Gitblit v1.9.1