From bbe451cb232069e77e1798eabeac5cf82294a927 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 29 Apr 2026 13:07:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsApprovalMapper中新增selectVoListWithDeleted方法用于查询未删除和已删除的审批数据 - 在WmsApprovalTaskMapper中新增selectVoListWithDeleted方法用于查询未删除和已删除的审批任务数据 - 更新WmsApprovalServiceImpl中审批任务查询逻辑，使用新的方法获取包含已删除数据的任务 - 更新WmsApprovalTaskServiceImpl中审批信息查询逻辑，使用新的方法获取包含已删除数据的审批 - 在XML映射文件中添加对应的SQL查询语句，支持按del_flag条件查询数据 --- .../java/com/klp/mapper/WmsApprovalMapper.java | 10 ++++++++++ .../java/com/klp/mapper/WmsApprovalTaskMapper.java | 10 ++++++++++ .../klp/service/impl/WmsApprovalServiceImpl.java | 8 ++------ .../service/impl/WmsApprovalTaskServiceImpl.java | 8 +++----- .../resources/mapper/klp/WmsApprovalMapper.xml | 13 +++++++++++++ .../resources/mapper/klp/WmsApprovalTaskMapper.xml | 14 ++++++++++++++ 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsApprovalMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsApprovalMapper.java index 21889d5f..f588e34d 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsApprovalMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsApprovalMapper.java @@ -3,6 +3,9 @@ package com.klp.mapper; import com.klp.domain.WmsApproval; import com.klp.domain.vo.WmsApprovalVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 通用审批（支持请假/外出等申请的审批）Mapper接口 @@ -12,4 +15,11 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsApprovalMapper extends BaseMapperPlus { + /** + * 查询未删除和已删除的审批数据（del_flag = 0 或 del_flag = 2） + * + * @param approvalIds 审批ID列表 + * @return 审批信息列表 + */ + List selectVoListWithDeleted(@Param("approvalIds") List approvalIds); } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsApprovalTaskMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsApprovalTaskMapper.java index 4cade5d1..f9b26461 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsApprovalTaskMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsApprovalTaskMapper.java @@ -3,6 +3,9 @@ package com.klp.mapper; import com.klp.domain.WmsApprovalTask; import com.klp.domain.vo.WmsApprovalTaskVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 审批任务Mapper接口 @@ -12,4 +15,11 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsApprovalTaskMapper extends BaseMapperPlus { + /** + * 查询未删除和已删除的审批任务数据（del_flag = 0 或 del_flag = 2） + * + * @param approvalIds 审批ID列表 + * @return 审批任务列表 + */ + List selectVoListWithDeleted(@Param("approvalIds") List approvalIds); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java index 9ab03f94..9c8fd8f2 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java @@ -117,12 +117,8 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService { .map(WmsApprovalVo::getApprovalId) .collect(Collectors.toList()); - // 2.1 批量查询所有审批任务 - List allTasks = approvalTaskMapper.selectVoList( - Wrappers.lambdaQuery() - .in(com.klp.domain.WmsApprovalTask::getApprovalId, approvalIds) - .orderByAsc(com.klp.domain.WmsApprovalTask::getCreateTime) - ); + // 2.1 批量查询所有审批任务（包括未删除和已删除的数据） + List allTasks = approvalTaskMapper.selectVoListWithDeleted(approvalIds); // 2.2 按审批ID分组任务 Map> tasksMap = allTasks.stream() diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalTaskServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalTaskServiceImpl.java index c6e5a6d4..63bb7fc9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalTaskServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalTaskServiceImpl.java @@ -9,6 +9,7 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.service.UserService; import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsApproval; import com.klp.domain.WmsApprovalTask; import com.klp.domain.bo.WmsApprovalTaskBo; import com.klp.domain.vo.WmsApprovalTaskVo; @@ -62,16 +63,13 @@ public class WmsApprovalTaskServiceImpl implements IWmsApprovalTaskService { return TableDataInfo.build(new ArrayList<>()); } - // 收集所有approvalId，查询审批信息 + // 收集所有approvalId，查询审批信息（包括未删除和已删除的数据） List approvalIds = taskList.stream() .map(WmsApprovalTaskVo::getApprovalId) .distinct() .collect(Collectors.toList()); - List approvalList = approvalMapper.selectVoList( - Wrappers.lambdaQuery() - .in(com.klp.domain.WmsApproval::getApprovalId, approvalIds) - ); + List approvalList = approvalMapper.selectVoListWithDeleted(approvalIds); Map approvalMap = approvalList.stream() .collect(Collectors.toMap(WmsApprovalVo::getApprovalId, v -> v, (a, b) -> a)); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsApprovalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsApprovalMapper.xml index 8ed0be60..ef3576a5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsApprovalMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsApprovalMapper.xml @@ -24,5 +24,18 @@ + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsApprovalTaskMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsApprovalTaskMapper.xml index 8002d3fe..1d43f6e9 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsApprovalTaskMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsApprovalTaskMapper.xml @@ -35,4 +35,18 @@ + + +