diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanCoilOperateMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanCoilOperateMapper.java index 484b4ca4..437e3660 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanCoilOperateMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanCoilOperateMapper.java @@ -1,5 +1,7 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.domain.WmsDeliveryPlanCoilOperate; import com.klp.domain.vo.WmsDeliveryPlanCoilOperateVo; import com.klp.common.core.mapper.BaseMapperPlus; @@ -26,4 +28,6 @@ public interface WmsDeliveryPlanCoilOperateMapper extends BaseMapperPlus selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java index c1a99ca5..060408ef 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.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.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -47,11 +48,21 @@ public class WmsDeliveryPlanCoilOperateServiceImpl implements IWmsDeliveryPlanCo */ @Override public TableDataInfo queryPageList(WmsDeliveryPlanCoilOperateBo 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(WmsDeliveryPlanCoilOperateBo bo) { + QueryWrapper lqw = Wrappers.query(); + lqw.eq(bo.getPlanId() != null, "dpco.plan_id", bo.getPlanId()); + lqw.eq(bo.getCoilId() != null, "dpco.coil_id", bo.getCoilId()); + lqw.eq(StringUtils.isNotBlank(bo.getOperateType()), "dpco.operate_type", bo.getOperateType()); + // 默认按操作时间倒序排列 + lqw.orderByDesc("dpco.create_time"); + return lqw; + } + /** * 查询发货计划钢卷操作记录列表 */ diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml index 6ef499e9..44e73341 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml @@ -35,6 +35,93 @@ AND 1 = 2 + + +