From 1a5eadd99e4cfd2a0e084a3662ddb05220a25d0f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 18 Nov 2025 14:44:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=BE=85=E6=93=8D=E4=BD=9C=E8=81=94=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsCoilPendingActionMapper中添加selectVoPagePlus方法支持自定义查询 - 在WmsCoilPendingActionMapper.xml中实现selectVoPagePlus的SQL映射逻辑 - 修改WmsCoilPendingActionServiceImpl中的queryPageList方法以使用新的查询方式 - 新增buildQueryWrapperPlus方法构建更复杂的查询条件 - 在WmsCoilPendingActionVo中增加enterCoilNo、supplierCoilNo、itemId和itemType字段用于展示更多信息 --- .../klp/domain/vo/WmsCoilPendingActionVo.java | 5 ++++ .../mapper/WmsCoilPendingActionMapper.java | 4 ++++ .../impl/WmsCoilPendingActionServiceImpl.java | 21 ++++++++++++++-- .../mapper/klp/WmsCoilPendingActionMapper.xml | 24 +++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java index 6088d306..6e738d0d 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java @@ -145,5 +145,10 @@ public class WmsCoilPendingActionVo extends BaseEntity implements Serializable { * 重量 */ private Double weight; + + private String enterCoilNo; + private String supplierCoilNo; + private Long itemId; + private String itemType; } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java index effe8507..38d3c981 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java @@ -1,8 +1,11 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.common.core.mapper.BaseMapperPlus; import com.klp.domain.WmsCoilPendingAction; import com.klp.domain.vo.WmsCoilPendingActionVo; +import org.apache.ibatis.annotations.Param; /** * 钢卷待操作Mapper接口 @@ -12,5 +15,6 @@ import com.klp.domain.vo.WmsCoilPendingActionVo; */ public interface WmsCoilPendingActionMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index d921be41..6b78f386 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.common.utils.StringUtils; @@ -45,11 +46,27 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer */ @Override public TableDataInfo queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(WmsCoilPendingActionBo bo) { + QueryWrapper qw = Wrappers.query(); + qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId()); + qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo()); + qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType()); + qw.eq(bo.getActionStatus() != null, "wcpa.action_status", bo.getActionStatus()); + qw.eq(bo.getWarehouseId() != null, "wcpa.warehouse_id", bo.getWarehouseId()); + qw.eq(bo.getPriority() != null, "wcpa.priority", bo.getPriority()); + qw.like(StringUtils.isNotBlank(bo.getSourceType()), "wcpa.source_type", bo.getSourceType()); + qw.orderByDesc("wcpa.create_time"); + qw.orderByDesc("wcpa.scan_time"); + //逻辑删除 + qw.eq("wcpa.del_flag", 0); + return qw; + } + /** * 查询钢卷待操作列表 */ diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml index c885ccbe..e0cd523e 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml @@ -26,6 +26,30 @@ +