From d56e614fcbef8612ef58da67b23ae1c612157186 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 29 Oct 2025 18:00:23 +0800
Subject: [PATCH] =?UTF-8?q?1.0.24=20=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/erp/domain/vo/ErpContractInfoVo.java   |  2 +-
 .../erp/domain/vo/ErpContractMaterialVo.java  | 22 ++++++++
 .../impl/ErpContractInfoServiceImpl.java      |  3 +-
 .../oa/erp/ErpContractMaterialMapper.xml      | 51 +++++++++++--------
 4 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
index 8b04a589..e8dcf729 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
@@ -222,7 +222,7 @@ public class ErpContractInfoVo implements Serializable {
     /**
      * 合同物料List
      */
-    private List<ErpContractMaterial> contractMaterialList;
+    private List<ErpContractMaterialVo> contractMaterialList;
 
     /**
      * 甲方公司名称
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java
index 42780dd5..762350d0 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java
@@ -139,5 +139,27 @@ public class ErpContractMaterialVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 物料编号
+     */
+    @ExcelProperty(value = "物料编号")
+    private String materialCode;
 
+    /**
+     * 物料名称
+     */
+    @ExcelProperty(value = "物料名称")
+    private String materialName;
+
+    /**
+     * 销售物料名称
+     */
+    @ExcelProperty(value = "销售物料名称")
+    private String saleMaterialName;
+
+    /**
+     * 计量单位名称
+     */
+    @ExcelProperty(value = "计量单位名称")
+    private String unitName;
 }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
index fa9c8263..fd6cdb62 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
@@ -18,6 +18,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.oa.erp.domain.ErpContractMaterial;
+import org.dromara.oa.erp.domain.vo.ErpContractMaterialVo;
 import org.dromara.oa.erp.mapper.ErpContractMaterialMapper;
 import org.dromara.workflow.api.RemoteWorkflowService;
 import org.dromara.workflow.api.domain.RemoteStartProcess;
@@ -64,7 +65,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
         MPJLambdaWrapper<ErpContractMaterial> lqw = JoinWrappers.lambda(ErpContractMaterial.class)
             .selectAll(ErpContractMaterial.class)
             .eq(contractId != null, ErpContractMaterial::getContractId, contractId);
-        List<ErpContractMaterial> contractMaterialList = contractMaterialMapper.selectList(lqw);
+        List<ErpContractMaterialVo> contractMaterialList = contractMaterialMapper.selectCustomErpContractMaterialVoList(lqw);
         contractInfoVo.setContractMaterialList(contractMaterialList);
         return contractInfoVo;
     }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml
index 2590d653..f0c66dbf 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml
@@ -7,29 +7,36 @@
     </resultMap>
 
     <select id="selectCustomErpContractMaterialVoList" resultMap="ErpContractMaterialResult">
-        select contract_material_id,
-               tenant_id,
-               plan_flag,
-               contract_id,
-               product_name,
-               specification_description,
-               material_id,
-               relation_material_id,
-               amount,
-               unit_id,
-               before_price,
-               tax_rate,
-               including_price,
-               subtotal,
-               remark,
-               active_flag,
-               del_flag,
-               create_dept,
-               create_by,
-               create_time,
-               update_by,
-               update_time
+        select t.contract_material_id,
+               t.tenant_id,
+               t.plan_flag,
+               t.contract_id,
+               t.product_name,
+               t.specification_description,
+               t.material_id,
+               t.relation_material_id,
+               t.amount,
+               t.unit_id,
+               t.before_price,
+               t.tax_rate,
+               t.including_price,
+               t.subtotal,
+               t.remark,
+               t.active_flag,
+               t.del_flag,
+               t.create_dept,
+               t.create_by,
+               t.create_time,
+               t.update_by,
+               t.update_time,
+               m.material_code,
+               m.material_name,
+               r.sale_material_name,
+               u.unit_name
         from erp_contract_material t
+                 left join base_material_info m on m.material_id = t.material_id
+                 left join base_relation_material r on r.relation_material_id = t.relation_material_id
+                 left join base_unit_info u on u.unit_id = t.unit_id
             ${ew.getCustomSqlSegment}
     </select>