From c0b0d329029cff9e91f2d5768074470a50face7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 14:45:34 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 2e04767..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
@@ -98,6 +98,7 @@
                     .setTaskCode(ruleCode)
                     .setParentId(moveTask.getId())
                     .setTargSite(siteNo)
+                    .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
                     .setUpdateBy(loginUserId)
                     .setCreateBy(loginUserId)
                     .setCreateTime(new Date())
@@ -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)) {

--
Gitblit v1.9.1