From 76b63d955e90f66fff58496c0311b74b692f7320 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 29 五月 2025 13:57:09 +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 | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..2e04767 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;
@@ -158,7 +156,6 @@
}
task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
-
}
if (!taskService.save(task)) {
@@ -173,6 +170,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)
@@ -301,6 +301,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