From b2df5b517e6749817d0096ecbf6230e4a99fabba Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Tue, 12 Aug 2025 13:16:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E9=87=87=E8=B4=AD=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8D=95=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=92=8C=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsPurchasePlanDetail 和 WmsPurchasePlanDetailBo 中添加供应商 ID 和合同 ID 字段
- 更新 WmsPurchasePlanDetailMapper 和 XML 映射文件以支持新字段
- 在 WmsPurchasePlanDetailVo 中添加供应商名称和合同编号字段
---
 .../com/klp/domain/WmsPurchasePlanDetail.java | 10 ++++++++++
 .../domain/bo/WmsPurchasePlanDetailBo.java    | 10 ++++++++++
 .../domain/vo/WmsPurchasePlanDetailVo.java    | 20 +++++++++++++++++++
 .../mapper/WmsPurchasePlanDetailMapper.java   |  2 --
 .../klp/WmsPurchasePlanDetailMapper.xml       |  8 +++++++-
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
index 79901db6..3e2bd9c3 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
@@ -63,4 +63,14 @@ public class WmsPurchasePlanDetail extends BaseEntity {
     @TableLogic
     private Integer delFlag;
 
+    /**
+     * 供应商ID
+     */
+    private Long supplierId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
index e7c68b3d..8fa5da79 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
@@ -65,5 +65,15 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 供应商ID
+     */
+    private Long supplierId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
 
 }
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 1546f0a4..721da3f6 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
@@ -91,4 +91,24 @@ public class WmsPurchasePlanDetailVo {
      * 在途量
      */
     private BigDecimal onTheWay;
+
+    /**
+     * 供应商ID
+     */
+    private Long supplierId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+
+    /**
+     * 合同编号
+     */
+    private String contractNo;
 }
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 4951cd50..4fd8a1a6 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsPurchasePlanDetailMapper.java
@@ -1,8 +1,6 @@
 package com.klp.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.domain.WmsPurchasePlanDetail;
 import com.klp.domain.vo.WmsPurchasePlanDetailVo;
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
index fba36565..6e16aabf 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
@@ -19,16 +19,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="contractId" column="contract_id"/>
+        <result property="supplierId" column="supplier_id"/>
     </resultMap>
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
     <!-- 联查材料名称编码 -->
     SELECT
         wpd.*,
         wm.raw_material_name AS rawMaterialName,
-        wm.raw_material_code AS rawMaterialCode
+        wm.raw_material_code AS rawMaterialCode,
+        ws.name AS supplierName,
+        wc.contract_no AS contractNo
     FROM
         wms_purchase_plan_detail wpd
     LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id
+    left join wms_supplier ws on wpd.supplier_id = ws.supplier_id
+    left join wms_contract wc on wpd.contract_id = wc.contract_id
     ${ew.customSqlSegment}
     </select>