From e05a0476b20bad3bdac2dd4188628f1fe9fb3879 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 19 Jul 2025 17:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BOM=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=81=94=E6=9F=A5name=E5=92=8Ccode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/klp/domain/vo/WmsProductBomVo.java | 17 +++++++++++++++++
 .../com/klp/mapper/WmsProductBomMapper.java     |  8 ++++++++
 .../service/impl/WmsProductBomServiceImpl.java  |  2 +-
 .../mapper/klp/WmsProductBomMapper.xml          | 13 +++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

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<WmsProductBomMapper, WmsProductBom, WmsProductBomVo> {
 
     List<WmsProductBom> listByProductId(Long productId);
+
+    /**
+     * 分页联查产品和原材料名称编码，支持Wrapper动态条件，返回Page<WmsProductBomVo>
+     */
+    Page<WmsProductBomVo> selectVoPagePlus(Page<?> page, @Param("ew") Wrapper<WmsProductBom> 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<WmsProductBomVo> queryPageList(WmsProductBomBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsProductBom> lqw = buildQueryWrapper(bo);
-        Page<WmsProductBomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<WmsProductBomVo> 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
     </select>
 
+    <!-- 分页联查产品和原材料名称编码，支持Wrapper动态条件，返回Page<WmsProductBomVo> -->
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsProductBomVo">
+        SELECT
+            b.*, 
+            p.product_name AS productName,
+            p.product_code AS productCode,
+            r.raw_material_name AS rawMaterialName,
+            r.raw_material_code AS rawMaterialCode
+        FROM wms_product_bom b
+        LEFT JOIN wms_product p ON b.product_id = p.product_id
+        LEFT JOIN wms_raw_material r ON b.raw_material_id = r.raw_material_id
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>