From 129882afa114d612b125a8085bfd6e63dee82d54 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 14:20:00 +0800
Subject: [PATCH] 出库优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 9584e8a..8e0e9d8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -6,11 +6,8 @@
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.*;
 import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.WaveExceStatus;
 import com.vincent.rsf.server.manager.mapper.WaveMapper;
 import com.vincent.rsf.server.manager.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -125,9 +122,9 @@
             /***灏嗘湁璐ф湁鐨勬槑缁嗕俊鎭瓨鏀惧埌搴撲綅淇℃伅涓�*/
             for (int i = 0; i < items.size(); i++) {
                 items.get(i)
-                        .setWaveId(param.getWaveId())
-                        .setWaveCode(param.getWaveCode())
-                        .setWaveItemId(param.getId());
+                        .setSourceId(param.getWaveId())
+                        .setSourceCode(param.getWaveCode())
+                        .setSource(param.getId());
             }
             locItemList.addAll(items);
         }
@@ -141,7 +138,7 @@
         listMap.keySet().forEach(key -> {
             List<LocItem> locItems = listMap.get(key);
             LocItem item1 = locItems.stream().findFirst().get();
-            WaveItem waveItem = waveItemService.getById(item1.getWaveItemId());
+            WaveItem waveItem = waveItemService.getById(item1.getSource());
             if (null == waveItem || Objects.isNull(waveItem)) {
                 throw new CoolException("鏁版嵁閿欒锛氭尝娆℃槑缁嗕笉瀛樺湪锛侊紒");
             }
@@ -164,6 +161,7 @@
             task.setTaskCode(ruleCode)
                     .setTaskType(TaskType.TASK_TYPE_OUT.type)
                     .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+                    .setResource(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
                     .setBarcode(loc.getBarcode())
                     .setOrgLoc(loc.getCode())
                     .setCreateBy(loginUserId)
@@ -183,7 +181,7 @@
                         .setId(null)
                         .setSourceCode(wave.getCode())
                         .setSourceId(wave.getId())
-                        .setSource(item.getWaveItemId());
+                        .setSource(item.getSource());
                 taskItems.add(taskItem);
             }
             if (!taskItemService.saveBatch(taskItems)) {

--
Gitblit v1.9.1