diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java index 19e01341..228347ef 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java @@ -56,5 +56,16 @@ public class WmsOrderDetailVo { @ExcelProperty(value = "备注") private String remark; + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String productName; + /** + * 产品编码 + */ + @ExcelProperty(value = "产品编码") + private String productCode; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java index 4524e543..964cc324 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java @@ -68,5 +68,10 @@ public class WmsPurchasePlanDetailVo { @ExcelProperty(value = "备注") private String remark; + @ExcelProperty(value = "原材料名称") + private String rawMaterialName; + @ExcelProperty(value = "原材料编码") + private String rawMaterialCode; + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java index 5ba8310b..d6dcf8e2 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java @@ -3,6 +3,9 @@ package com.klp.mapper; import com.klp.domain.WmsOrderDetail; import com.klp.domain.vo.WmsOrderDetailVo; import com.klp.common.core.mapper.BaseMapperPlus; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import java.util.List; /** @@ -18,4 +21,8 @@ public interface WmsOrderDetailMapper extends BaseMapperPlus selectVoListByOrderId(Long orderId); + /** + * 分页联查产品名称和编码,支持Wrapper动态条件,返回Page + */ + Page selectVoPagePlus(Page page, @Param("ew") Wrapper wrapper); } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java index c4d48d30..aceb0390 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java @@ -1,5 +1,7 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.domain.WmsPurchasePlanDetail; import com.klp.domain.vo.WmsPurchasePlanDetailVo; import com.klp.common.core.mapper.BaseMapperPlus; @@ -12,4 +14,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsPurchasePlanDetailMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build, LambdaQueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java index 94449833..0157cb13 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java @@ -45,7 +45,7 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService { @Override public TableDataInfo queryPageList(WmsOrderDetailBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java index 3a139320..761200bd 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java @@ -45,7 +45,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS @Override public TableDataInfo queryPageList(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -74,7 +74,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS */ @Override public Boolean insertByBo(WmsPurchasePlanDetailBo bo) { - + WmsPurchasePlanDetail add = BeanUtil.toBean(bo, WmsPurchasePlanDetail.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml index 41db7374..8e27dff8 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml @@ -22,4 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM wms_order_detail WHERE order_id = #{orderId} AND del_flag = 0 + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml index 814ce903..16b50630 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml @@ -19,6 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +