From 094a8032e067756156cc73c3288e039f2ea1d25d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 08:04:17 +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 |    6 ++++--
 1 files changed, 4 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 36e4db5..e5294ef 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
@@ -117,7 +117,8 @@
                     .setCreateTime(new Date())
                     .setUpdateTime(new Date())
                     .setTaskStatus(TaskStsType.GENERATE_OUT.id)
-                    .setBarcode(loc.getBarcode());
+                    .setBarcode(loc.getBarcode())
+                    .setMemo(map.getMemo());
 
             List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, key));
             if (locItems.isEmpty()) {
@@ -334,7 +335,8 @@
                 .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
                 .setUpdateTime(new Date())
                 .setTaskStatus(TaskStsType.GENERATE_IN.id)
-                .setBarcode(orgLoc.getBarcode());
+                .setBarcode(orgLoc.getBarcode())
+                .setMemo(map.getMemo());
 
         if (!taskService.save(task)) {
             throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");

--
Gitblit v1.9.1