From e2f898fa8bc5a63facb53bb4f9d035e335beba48 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 10 Jul 2026 10:06:42 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-09=20RoHS=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/rohs/RohsMapper.xml | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index b2a1cf91..40767d7c 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -116,8 +116,8 @@
             dbo.get_product_group_name(a.site, a.comm_group1, '1') as commGroup1Desc,
             dbo.get_product_group_name(a.site, a.comm_group2, '2') as commGroup2Desc,
             dbo.get_product_group_name(a.site, a.comm_group3, '5') as commGroup3Desc,
-            isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) as mainIfsPartNo,
-            isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) as mainPartDesc
+            isnull(firstMaterial.final_part_no, '') as mainIfsPartNo,
+            isnull(firstMaterial.part_desc, '') as mainPartDesc
         from plm_rohs a
         left join plm_request_header prh on a.site = prh.site and prh.menu_id = #{params.menuId} and prh.status = 'Y'
         left join plm_request_node d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
@@ -162,10 +162,10 @@
             and dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.reference_no) like #{params.currentApprover}
         </if>
         <if test="params.ifsPartNo != null and params.ifsPartNo != ''">
-            and isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) like #{params.ifsPartNo}
+            and isnull(firstMaterial.final_part_no, '') like #{params.ifsPartNo}
         </if>
         <if test="params.materialDesc != null and params.materialDesc != ''">
-            and isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) like #{params.materialDesc}
+            and isnull(firstMaterial.part_desc, '') like #{params.materialDesc}
         </if>
         <if test="params.applicant != null and params.applicant != ''">
             and a.applicant like #{params.applicant}
@@ -218,10 +218,10 @@
             and dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.reference_no) like #{params.currentApprover}
         </if>
         <if test="params.ifsPartNo != null and params.ifsPartNo != ''">
-            and isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) like #{params.ifsPartNo}
+            and isnull(firstMaterial.final_part_no, '') like #{params.ifsPartNo}
         </if>
         <if test="params.materialDesc != null and params.materialDesc != ''">
-            and isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) like #{params.materialDesc}
+            and isnull(firstMaterial.part_desc, '') like #{params.materialDesc}
         </if>
         <if test="params.applicant != null and params.applicant != ''">
             and a.applicant like #{params.applicant}
@@ -244,8 +244,8 @@
             dbo.get_product_group_name(a.site, a.comm_group1, '1') as commGroup1Desc,
             dbo.get_product_group_name(a.site, a.comm_group2, '2') as commGroup2Desc,
             dbo.get_product_group_name(a.site, a.comm_group3, '5') as commGroup3Desc,
-            isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) as mainIfsPartNo,
-            isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) as mainPartDesc
+            isnull(firstMaterial.final_part_no, '') as mainIfsPartNo,
+            isnull(firstMaterial.part_desc, '') as mainPartDesc
         from plm_rohs a
         left join plm_request_header prh on a.site = prh.site and prh.menu_id = #{params.menuId} and prh.status = 'Y'
         left join plm_request_node d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
@@ -290,10 +290,10 @@
             and dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.reference_no) like #{params.currentApprover}
         </if>
         <if test="params.ifsPartNo != null and params.ifsPartNo != ''">
-            and isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) like #{params.ifsPartNo}
+            and isnull(firstMaterial.final_part_no, '') like #{params.ifsPartNo}
         </if>
         <if test="params.materialDesc != null and params.materialDesc != ''">
-            and isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) like #{params.materialDesc}
+            and isnull(firstMaterial.part_desc, '') like #{params.materialDesc}
         </if>
         <if test="params.applicant != null and params.applicant != ''">
             and a.applicant like #{params.applicant}
@@ -320,8 +320,8 @@
             dbo.get_product_group_name(a.site, a.comm_group1, '1') as commGroup1Desc,
             dbo.get_product_group_name(a.site, a.comm_group2, '2') as commGroup2Desc,
             dbo.get_product_group_name(a.site, a.comm_group3, '5') as commGroup3Desc,
-            isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) as mainIfsPartNo,
-            isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) as mainPartDesc
+            isnull(firstMaterial.final_part_no, '') as mainIfsPartNo,
+            isnull(firstMaterial.part_desc, '') as mainPartDesc
         from plm_rohs a
         left join plm_request_header prh on a.site = prh.site and prh.menu_id = #{params.menuId} and prh.status = 'Y'
         left join plm_request_node d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
@@ -364,8 +364,8 @@
             dbo.get_product_group_name(a.site, a.comm_group1, '1') as commGroup1Desc,
             dbo.get_product_group_name(a.site, a.comm_group2, '2') as commGroup2Desc,
             dbo.get_product_group_name(a.site, a.comm_group3, '5') as commGroup3Desc,
-            isnull(firstMaterial.final_part_no, isnull(a.ifs_part_no, '')) as mainIfsPartNo,
-            isnull(firstMaterial.part_desc, isnull(a.material_desc, '')) as mainPartDesc
+            isnull(firstMaterial.final_part_no, '') as mainIfsPartNo,
+            isnull(firstMaterial.part_desc, '') as mainPartDesc
         from plm_rohs a
         outer apply (
             select