联查name和code

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;
+
 
 }

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;
+
 
 }

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<WmsOrderDetailMappe
      */
     List<WmsOrderDetailVo> selectVoListByOrderId(Long orderId);
 
+    /**
+     * 分页联查产品名称和编码，支持Wrapper动态条件，返回Page<WmsOrderDetailVo>
+     */
+    Page<WmsOrderDetailVo> selectVoPagePlus(Page<?> page, @Param("ew") Wrapper<WmsOrderDetail> wrapper);
 }

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<WmsPurchasePlanDetailMapper, WmsPurchasePlanDetail, WmsPurchasePlanDetailVo> {
 
+    Page<WmsPurchasePlanDetailVo> selectVoPagePlus(Page<Object> build, LambdaQueryWrapper<WmsPurchasePlanDetail> lqw);
 }

klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java

@@ -45,7 +45,7 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
     @Override
     public TableDataInfo<WmsOrderDetailVo> queryPageList(WmsOrderDetailBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsOrderDetail> lqw = buildQueryWrapper(bo);
-        Page<WmsOrderDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<WmsOrderDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 

klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java

@@ -45,7 +45,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS
     @Override
     public TableDataInfo<WmsPurchasePlanDetailVo> queryPageList(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsPurchasePlanDetail> lqw = buildQueryWrapper(bo);
-        Page<WmsPurchasePlanDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<WmsPurchasePlanDetailVo> 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;

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
     </select>
 
+    <!-- 分页联查产品名称和编码，支持Wrapper动态条件，返回Page<WmsOrderDetailVo> -->
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsOrderDetailVo">
+        SELECT
+            d.*, 
+            p.product_name AS productName,
+            p.product_code AS productCode
+        FROM wms_order_detail d
+        LEFT JOIN wms_product p ON d.product_id = p.product_id
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml

@@ -19,6 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
+    <!-- 联查材料名称编码 -->
+    SELECT
+        wpd.*,
+        wm.raw_material_name AS rawMaterialName,
+        wm.raw_material_code AS rawMaterialCode
+    FROM
+        wms_purchase_plan_detail wpd
+    LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.material_id
+    ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>