From 8d3663df439a125dbee48a9a0ebc6acc4c02d304 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 15 May 2026 13:46:54 +0800
Subject: [PATCH] =?UTF-8?q?2026-05-15=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 | 10 ++++++++++
 .../resources/mapper/project/ProjectDao.xml    | 18 +++++++++++++++++-
 src/main/resources/mapper/rohs/RohsMapper.xml  |  4 +++-
 3 files changed, 30 insertions(+), 2 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 990e737d..43da7476 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -201,6 +201,16 @@ public class RohsEntity implements Serializable {
      */
     private String hsfStandard;
 
+    /**
+     * HSF审批人（;分隔）
+     */
+    private String hsfApprover;
+
+    /**
+     * Inform Related people
+     */
+    private String relatedPeople;
+
     /**
      * 有效期
      */
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 2ccd05b7..26df571f 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -8,6 +8,13 @@
                a.ori_project_id,
                a.project_type_db,
                a.project_name,
+               (select top 1 vp.bu_no
+                from view_Project_Part vp
+                where vp.site = a.site
+                  and vp.project_id = a.project_id
+                  and vp.bu_no is not null
+                  and vp.bu_no <![CDATA[<>]]> ''
+                order by vp.bu_no)                                                     as buNo,
                a.status,
                a.project_source,
                a.customer_id,
@@ -664,12 +671,21 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
     <select id="queryProject" resultType="com.spring.modules.project.data.PlmProjectInfoData">
         select project_id,
                project_name,
+               (select top 1 vp.bu_no
+                from view_Project_Part vp
+                where vp.site = plm_project_info.site
+                  and vp.project_id = plm_project_info.project_id
+                  and vp.bu_no is not null
+                  and vp.bu_no <![CDATA[<>]]> ''
+                order by vp.bu_no) as buNo,
                final_customer_id,
                dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
         from plm_project_info
         where site = #{site}
           and project_id = #{projectId}
-          and customer_id = #{customerId}
+        <if test="customerId != null and customerId != ''">
+          and (customer_id = #{customerId} or final_customer_id = #{customerId})
+        </if>
     </select>
 
     <select id="queryProjectPart" resultType="com.spring.modules.project.entity.PlmProjectPart">
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index fa768f08..2c283099 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -39,6 +39,8 @@
         <result column="expired_date" property="expiredDate" />
         <result column="fiber_information" property="fiberInformation" />
         <result column="hsf_standard" property="hsfStandard" />
+        <result column="hsf_approver" property="hsfApprover" />
+        <result column="related_people" property="relatedPeople" />
         <result column="valid_until" property="validUntil" />
         <result column="is_meet_rohs_requirement" property="isMeetRohsRequirement" />
         <result column="is_ah_grade" property="isAhGrade" />
@@ -74,7 +76,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.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, 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">