From 76ae15e5150b17f90768259e9f5f6737e8088a2e Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 18 Oct 2024 10:36:19 +0800
Subject: [PATCH] 2024-10-18

---
 .../resources/mapper/project/ProjectDao.xml   | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 6f57f724..dac7a51c 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -404,42 +404,46 @@
 </select>
 
 <select id="getProjectPartList" resultType="com.spring.modules.project.data.PlmProjectPartData">
-    select
-    id,
-    site,
-    project_id,
-    test_part_no,
-    part_type,
-    part_desc,
-    part_spec,
-    material_number,
-    remark,
-    create_date,
-    create_by,
-    update_date,
-    part_name,
-    update_by,
-    dbo.get_family_name(site, part_type) as partTypeDesc,
-    final_part_no,
-    code_no,
-    dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
-    group_id,
-    dbo.get_group_name(site, group_id) as groupName,
-    product_group_id1,
-    dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
-    product_group_id2,
-    dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2,
-    um_id,type
-    from view_Project_Part where site=#{site}
+    select vpp.id,
+           vpp.site,
+           vpp.project_id,
+           vpp.test_part_no,
+           vpp.part_type,
+           vpp.part_desc,
+           vpp.part_spec,
+           vpp.material_number,
+           vpp.remark,
+           vpp.create_date,
+           vpp.create_by,
+           vpp.update_date,
+           vpp.part_name,
+           vpp.update_by,
+           dbo.get_family_name(vpp.site, vpp.part_type)                     as partTypeDesc,
+           vpp.final_part_no,
+           vpp.code_no,
+           dbo.get_code_desc(vpp.site, vpp.code_no, 'IP')                   as codeDesc,
+           vpp.group_id,
+           dbo.get_group_name(vpp.site, vpp.group_id)                       as groupName,
+           vpp.product_group_id1,
+           dbo.get_product_group_name(vpp.site, vpp.product_group_id1, '1') as productGroupName1,
+           vpp.product_group_id2,
+           dbo.get_product_group_name(vpp.site, vpp.product_group_id2, '2') as productGroupName2,
+           vpp.um_id,
+           vpp.type,
+           vpp.final_part_no,
+           pcpi.customer_part_no
+    from view_Project_Part vpp
+    left join plm_project_info ppi on vpp.site = ppi.site and vpp.project_id = ppi.project_id
+    left join plm_customer_part_info pcpi on vpp.site = pcpi.site and ppi.customer_id = pcpi.customer_no and vpp.test_part_no = pcpi.part_no
+    where vpp.site = #{site}
     <if test="testPartNo != null and testPartNo != ''">
-        and test_part_no like #{testPartNo}
+        and vpp.test_part_no like #{testPartNo}
     </if>
     <if test="partDesc != null and partDesc != ''">
-        and part_desc like #{partDesc}
+        and vpp.part_desc like #{partDesc}
     </if>
     <if test="projectId != null and projectId != ''">
-        and project_id = #{projectId}
-        and view_Project_Part.project_id = #{projectId}
+        and vpp.project_id = #{projectId}
     </if>
 </select>
     <select id="getProjectPart" resultType="com.spring.modules.project.data.PlmProjectPartData">