diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductBomVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductBomVo.java index 03f6ff19..45086a0f 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductBomVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductBomVo.java @@ -56,5 +56,22 @@ public class WmsProductBomVo { @ExcelProperty(value = "备注") private String remark; + /** + * 产品名称 + */ + private String productName; + /** + * 产品编码 + */ + private String productCode; + /** + * 原材料名称 + */ + private String rawMaterialName; + /** + * 原材料编码 + */ + private String rawMaterialCode; + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java index aeedcd3c..f1331635 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java @@ -3,6 +3,9 @@ package com.klp.mapper; import com.klp.domain.WmsProductBom; import com.klp.domain.vo.WmsProductBomVo; 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; @@ -15,4 +18,9 @@ import java.util.List; public interface WmsProductBomMapper extends BaseMapperPlus { List listByProductId(Long productId); + + /** + * 分页联查产品和原材料名称编码,支持Wrapper动态条件,返回Page + */ + Page selectVoPagePlus(Page page, @Param("ew") Wrapper wrapper); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java index 818c573e..04fb7d8f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java @@ -45,7 +45,7 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService { @Override public TableDataInfo queryPageList(WmsProductBomBo 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/resources/mapper/klp/WmsProductBomMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml index 7d8acf59..a78c64a2 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml @@ -20,5 +20,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = 0 + +