From 49dc3d7ae8a10f4730572d1d61f65bdae3f4961a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 7 May 2026 13:09:57 +0800
Subject: [PATCH] =?UTF-8?q?2026-05-07=20RoHs=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/rohs/entity/RohsEntity.java       | 47 +++++++++++++++++++
 src/main/resources/mapper/rohs/RohsMapper.xml | 11 ++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
index 10d33976..72fe5ec7 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -43,6 +43,23 @@ public class RohsEntity implements Serializable {
      */
     private String process;
 
+    /**
+     * PM人员
+     */
+    private String pm;
+
+    /**
+     * 计划转量产时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date plannedMassProductionDate;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
     /**
      * 供应商
      */
@@ -182,11 +199,21 @@ public class RohsEntity implements Serializable {
      */
     private String hsfStandard;
 
+    /**
+     * 有效期
+     */
+    private String validUntil;
+
     /**
      * 材料是否符合RoHS要求
      */
     private String isMeetRohsRequirement;
 
+    /**
+     * 材料属性是否是AH
+     */
+    private String isAhGrade;
+
     /**
      * 符合HSF供应商等级
      */
@@ -197,6 +224,11 @@ public class RohsEntity implements Serializable {
      */
     private String materialDesc;
 
+    /**
+     * NPD备注说明
+     */
+    private String npdRemark;
+
     /**
      * 现有材料不同规格
      */
@@ -206,4 +238,19 @@ public class RohsEntity implements Serializable {
      * 材料IFS编号
      */
     private String ifsPartNo;
+
+    /**
+     * 商品组1
+     */
+    private String commGroup1;
+
+    /**
+     * 商品组2
+     */
+    private String commGroup2;
+
+    /**
+     * 商品组3
+     */
+    private String commGroup3;
 }
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index bbb7df83..7ca9a50e 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -9,6 +9,9 @@
         <result column="applicant" property="applicant" />
         <result column="application_date" property="applicationDate" />
         <result column="process" property="process" />
+        <result column="pm" property="pm" />
+        <result column="planned_mass_production_date" property="plannedMassProductionDate" />
+        <result column="color" property="color" />
         <result column="vendor_code" property="vendorCode" />
         <result column="vendor_material_code" property="vendorMaterialCode" />
         <result column="material_classify" property="materialClassify" />
@@ -36,16 +39,22 @@
         <result column="expired_date" property="expiredDate" />
         <result column="fiber_information" property="fiberInformation" />
         <result column="hsf_standard" property="hsfStandard" />
+        <result column="valid_until" property="validUntil" />
         <result column="is_meet_rohs_requirement" property="isMeetRohsRequirement" />
+        <result column="is_ah_grade" property="isAhGrade" />
         <result column="hsf_supplier_classification" property="hsfSupplierClassification" />
         <result column="material_desc" property="materialDesc" />
+        <result column="npd_remark" property="npdRemark" />
         <result column="is_same_material_diff_size" property="isSameMaterialDiffSize" />
         <result column="ifs_part_no" property="ifsPartNo" />
+        <result column="comm_group1" property="commGroup1" />
+        <result column="comm_group2" property="commGroup2" />
+        <result column="comm_group3" property="commGroup3" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        site, reference_no, applicant, application_date, process, vendor_code, vendor_material_code, material_classify, other_material_classify, material_use_for, end_customer, project_id, is_macallan_material, need_create_number, npd_engineer, material_validity_time, material_validity_comments, need_deviation, technical_plan, wm_required_spec, is_fiber_material, material_thickness, buyer, expect_report_time, qualification_documents_needed, test_report_including_items, remark, status, sgs_report_number, expired_date, fiber_information, hsf_standard, is_meet_rohs_requirement, hsf_supplier_classification, material_desc, is_same_material_diff_size, ifs_part_no
+        site, reference_no, applicant, application_date, process, pm, planned_mass_production_date, color, vendor_code, vendor_material_code, material_classify, other_material_classify, material_use_for, end_customer, project_id, is_macallan_material, need_create_number, npd_engineer, material_validity_time, material_validity_comments, need_deviation, technical_plan, wm_required_spec, is_fiber_material, material_thickness, buyer, expect_report_time, qualification_documents_needed, test_report_including_items, remark, status, sgs_report_number, expired_date, fiber_information, hsf_standard, valid_until, is_meet_rohs_requirement, is_ah_grade, hsf_supplier_classification, material_desc, npd_remark, is_same_material_diff_size, ifs_part_no, comm_group1, comm_group2, comm_group3
     </sql>
 
     <select id="getApprovalList" resultType="com.spring.modules.change.vo.ProcessFormVo">