From fde1466aca383e306a1a40566145d7252da1148a Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 10 Jul 2025 17:05:49 +0800
Subject: [PATCH] 2025/7/10

---
 .../modules/part/vo/PartInformationVo.java    |   1 +
 .../mapper/part/PartInformationMapper.xml     | 105 ++++++++++++------
 2 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
index 67bf0fb6..2c7410e1 100644
--- a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
+++ b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
@@ -175,4 +175,5 @@ public class PartInformationVo extends PartInformationEntity {
     private Boolean manufacturingInfoFlag;
     private Boolean planningInfoFlag;
     private Boolean partItemInfoFlag;
+    private String partNo;
 }
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index a54f2a9f..fcfa2bd6 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1365,36 +1365,49 @@
     </insert>
 
     <!-- 获取当前项目不包含的物料 -->
+<!--    <select id="getProjectPartList1" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">-->
+<!--        select-->
+<!--        a.site,-->
+<!--        a.test_part_no,-->
+<!--        c.part_desc,-->
+<!--        a.bu_no,-->
+<!--        dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,-->
+<!--        c.ifs_part_no as finalPartNo,-->
+<!--        c.plm_part_no-->
+<!--        from  plm_project_part a-->
+<!--        left join plm_project_part b on a.site = b.site and a.bu_no = b.bu_no  and a.project_id = b.project_id and a.test_part_no = b.project_id and b.site = #{query.site} and b.project_id = #{query.projectId}-->
+<!--        left join part as c on a.site = c.site and a.test_part_no = c.part_no-->
+<!--        where b.site is null and c.show_in_query_flag = 'Y'-->
+<!--&#45;&#45;         and c.part_no not in-->
+<!--&lt;!&ndash;        <foreach collection="query.arr" close=")" open="(" item="item" separator=",">&ndash;&gt;-->
+<!--&lt;!&ndash;            #{item}&ndash;&gt;-->
+<!--&lt;!&ndash;        </foreach>&ndash;&gt;-->
+<!--        <if test = "query.partNo != null and query.partNo != ''">-->
+<!--            AND c.part_no like #{query.partNo}-->
+<!--        </if>-->
+<!--        <if test = "query.plmPartNo != null and query.plmPartNo != ''">-->
+<!--            AND c.plm_part_no like #{query.plmPartNo}-->
+<!--        </if>-->
+<!--        <if test = "query.finalPartNo != null and query.finalPartNo != ''">-->
+<!--            AND c.ifs_part_no like #{query.finalPartNo}-->
+<!--        </if>-->
+<!--        <if test = "query.partDesc != null and query.partDesc != ''">-->
+<!--            AND c.part_desc like #{query.partDesc}-->
+<!--        </if>-->
+<!--    </select>-->
     <select id="getProjectPartList1" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">
-        SELECT
-            c.site,
-            c.part_no,
-            c.part_desc,
-            a.bu_no,
-            dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,
-            c.ifs_part_no as finalPartNo,
-            c.plm_part_no
-        FROM (select
-                  prp1.site,
-                  prp1.test_part_no,
-                  prp1.bu_no
-              from plm_project_part as prp1
-              left join plm_project_info as ppi1 on ppi1.site = prp1.site and ppi1.project_id = prp1.project_id
-              where prp1.site = #{query.site} and ppi1.customer_id <![CDATA[<>]]> #{query.customerId}
-              ) as a
-        left join (select
-                       prp2.site,
-                       prp2.test_part_no
-                   from plm_project_part as prp2
-                   left join plm_project_info as ppi2 on ppi2.site = prp2.site and ppi2.project_id = prp2.project_id
-                   where prp2.site = #{query.site} and ppi2.customer_id = #{query.customerId}) as b
-        on a.site = b.site and a.test_part_no = b.test_part_no
+        select
+        a.site,
+        a.test_part_no,
+        c.part_desc,
+        a.bu_no,
+        dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,
+        c.ifs_part_no as finalPartNo,
+        c.plm_part_no
+        from  plm_project_part a
+        left join plm_project_part b on a.site = b.site and a.bu_no = b.bu_no  and a.project_id = b.project_id and a.test_part_no = b.project_id and b.site = #{query.site} and b.project_id = #{query.projectId}
         left join part as c on a.site = c.site and a.test_part_no = c.part_no
-        where b.test_part_no is null and c.show_in_query_flag = 'Y'
-        and c.part_no not in
-        <foreach collection="query.arr" close=")" open="(" item="item" separator=",">
-            #{item}
-        </foreach>
+        where b.site is null and c.show_in_query_flag = 'Y'
         <if test = "query.partNo != null and query.partNo != ''">
             AND c.part_no like #{query.partNo}
         </if>
@@ -1424,6 +1437,38 @@
     </select>
 
     <!-- 获取当前项目不包含的物料 -->
+<!--    <select id="getProjectPartList3" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">-->
+<!--        SELECT-->
+<!--            a.site,-->
+<!--            a.part_no,-->
+<!--            a.part_desc,-->
+<!--            a.ifs_part_no as finalPartNo,-->
+<!--            a.status,-->
+<!--            a.temporary_part_flag,-->
+<!--            a.show_in_query_flag,-->
+<!--            a.plm_part_no-->
+<!--        FROM part as a-->
+<!--&#45;&#45;         left join plm_project_part as b on a.site = b.site and a.plm_part_no = b.test_part_no-->
+<!--        left join plm_project_part as c on a.site = c.site and a.ifs_part_no = c.test_part_no and c.site =#{query.site} and project_id =#{query.projectId}-->
+<!--        where a.site = #{query.site}-->
+<!--        and a.active = 'Y'-->
+<!--        and a.show_in_query_flag = 'Y'-->
+<!--&#45;&#45;         and b.test_part_no is null-->
+<!--        and c.test_part_no is null-->
+<!--        and a.part_no not in-->
+<!--        <foreach collection="query.arr" close=")" open="(" item="item" separator=",">-->
+<!--            #{item}-->
+<!--        </foreach>-->
+<!--        <if test = "query.plmPartNo != null and query.plmPartNo != ''">-->
+<!--            AND a.plm_part_no like #{query.plmPartNo}-->
+<!--        </if>-->
+<!--        <if test = "query.finalPartNo != null and query.finalPartNo != ''">-->
+<!--            AND a.ifs_part_no like #{query.finalPartNo}-->
+<!--        </if>-->
+<!--        <if test = "query.partDesc != null and query.partDesc != ''">-->
+<!--            AND a.part_desc like #{query.partDesc}-->
+<!--        </if>-->
+<!--    </select>-->
     <select id="getProjectPartList3" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">
         SELECT
             a.site,
@@ -1435,12 +1480,10 @@
             a.show_in_query_flag,
             a.plm_part_no
         FROM part as a
-        left join plm_project_part as b on a.site = b.site and a.plm_part_no = b.test_part_no
-        left join plm_project_part as c on a.site = c.site and a.ifs_part_no = c.test_part_no
+        left join plm_project_part as c on a.site = c.site and a.ifs_part_no = c.test_part_no and c.site =#{query.site} and project_id =#{query.projectId}
         where a.site = #{query.site}
         and a.active = 'Y'
         and a.show_in_query_flag = 'Y'
-        and b.test_part_no is null
         and c.test_part_no is null
         and a.part_no not in
         <foreach collection="query.arr" close=")" open="(" item="item" separator=",">