From ca5dda28beb5d029c1998998020838e05be4fffd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 26 May 2026 11:54:47 +0800
Subject: [PATCH] =?UTF-8?q?2026-05-26=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/rohs/entity/RohsEntity.java |  5 +++++
 .../mapper/request/RequestManageMapper.xml     | 18 +++++++++++++++---
 src/main/resources/mapper/rohs/RohsMapper.xml  |  3 ++-
 3 files changed, 22 insertions(+), 4 deletions(-)

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 43da7476..a8236c8e 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -211,6 +211,11 @@ public class RohsEntity implements Serializable {
      */
     private String relatedPeople;
 
+    /**
+     * 有效期数值
+     */
+    private Integer validUntilValue;
+
     /**
      * 有效期
      */
diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index 83512882..d3bd57a6 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -272,7 +272,11 @@
     <select id="getFieldList" parameterType="TableData" resultType="PlmFieldData">
         SELECT
         col.name AS fieldId,
-        CONVERT(varchar(50), comm.value)  AS fieldName
+        case
+            when tbl.name = 'plm_rohs' and col.name = 'valid_until_value' then '有效期数值/Valid Until Value'
+            when tbl.name = 'plm_rohs' and col.name = 'valid_until' then '有效期单位/Valid Until Unit'
+            else CONVERT(varchar(50), comm.value)
+        end AS fieldName
         FROM
         sys.columns AS col
         INNER JOIN sys.tables AS tbl ON col.object_id = tbl.object_id
@@ -280,7 +284,11 @@
         INNER JOIN sys.types AS typ ON col.user_type_id = typ.user_type_id
         LEFT JOIN sys.extended_properties AS comm ON comm.major_id = col.object_id AND comm.minor_id = col.column_id AND comm.name = N'MS_Description'
         WHERE
-        tbl.name = #{tableId} and CONVERT(varchar(50), comm.value) is not null and CONVERT(varchar(50), comm.value) <![CDATA[<>]]> ''
+        tbl.name = #{tableId}
+        and (
+            (CONVERT(varchar(50), comm.value) is not null and CONVERT(varchar(50), comm.value) <![CDATA[<>]]> '')
+            or (tbl.name = 'plm_rohs' and col.name in ('valid_until_value', 'valid_until'))
+        )
         ORDER BY col.column_id
     </select>
 
@@ -293,7 +301,11 @@
             b.required
         from (SELECT
                   col.name AS fieldId,
-                  CONVERT(varchar(50), comm.value)  AS fieldName
+                  case
+                      when tbl.name = 'plm_rohs' and col.name = 'valid_until_value' then '有效期数值/Valid Until Value'
+                      when tbl.name = 'plm_rohs' and col.name = 'valid_until' then '有效期单位/Valid Until Unit'
+                      else CONVERT(varchar(50), comm.value)
+                  end AS fieldName
               FROM
                 sys.columns AS col
                 INNER JOIN sys.tables AS tbl ON col.object_id = tbl.object_id
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index 5712865a..1526edf0 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -41,6 +41,7 @@
         <result column="hsf_standard" property="hsfStandard" />
         <result column="hsf_approver" property="hsfApprover" />
         <result column="related_people" property="relatedPeople" />
+        <result column="valid_until_value" property="validUntilValue" />
         <result column="valid_until" property="validUntil" />
         <result column="is_meet_rohs_requirement" property="isMeetRohsRequirement" />
         <result column="is_ah_grade" property="isAhGrade" />
@@ -76,7 +77,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.status, a.sgs_report_number, a.expired_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
+        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.status, a.sgs_report_number, a.expired_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until_value, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
     </sql>
 
     <select id="getApprovalList" resultType="com.spring.modules.change.vo.ProcessFormVo">