From 1e7849282875b5bcd237d93f7b496aecb6ede4b6 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 05 五月 2025 10:01:11 +0800 Subject: [PATCH] 1. 任务历史档报错问题修复 2. 单据添加收货单明细不显示问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java index b38ff1e..c9cc4f7 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java @@ -3,17 +3,29 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.manager.entity.Wave; +import com.vincent.rsf.server.manager.entity.WaveItem; +import java.util.List; import java.util.Map; public interface WaveService extends IService<Wave> { /** + * @param + * @param loginUserId + * @return * @author Ryan * @description 娉㈡浠诲姟涓嬪彂 - * @param - * @return * @time 2025/4/25 16:24 */ - R publicTask(Map<String, Object> map); + R publicTask(Map<String, Object> map, Long loginUserId); + + /** + * @author Ryan + * @description 棰勮娉㈡涓嬪彂浠诲姟 + * @param + * @return + * @time 2025/4/27 11:08 + */ + List<WaveItem> mergeWavePreview(Long waveId); } -- Gitblit v1.9.1