From 8cd78c8c067f8ca124e6ba81f8c0171583244891 Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 10 Jul 2025 18:51:22 +0800
Subject: [PATCH] 2025/7/10

---
 .../impl/PartInformationServiceImpl.java      |   3 +
 .../mapper/part/PartInformationMapper.xml     | 100 +++++++-----------
 2 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 184eef0c..c4c840e6 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -2515,6 +2515,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             // Project Part
             list = partInformationMapper.getProjectPartList1(new Page<PlmProjectPartData>(data.getPage(), data.getLimit()), data);
         }
+        Set<PartInformationVo> set = new HashSet<>(list.getRecords());
+        List<PartInformationVo> list1 = new ArrayList<>(set);
+        list.setRecords(list1);
         return new PageUtils(list);
     }
 
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index fcfa2bd6..58084ca6 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1365,36 +1365,6 @@
     </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
         a.site,
@@ -1408,6 +1378,10 @@
         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'
+        and c.part_no not in
+        <foreach collection="query.arr" close=")" open="(" item="item" separator=",">
+            #{item}
+        </foreach>
         <if test = "query.partNo != null and query.partNo != ''">
             AND c.part_no like #{query.partNo}
         </if>
@@ -1421,6 +1395,38 @@
             AND c.part_desc like #{query.partDesc}
         </if>
     </select>
+<!--    <select id="getProjectPartList1" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">-->
+<!--        SELECT DISTINCT-->
+<!--        a.site,-->
+<!--        a.test_part_no AS part_no,-->
+<!--        c.part_desc,-->
+<!--        a.bu_no,-->
+<!--        dbo.plm_get_bu_desc (a.site, a.bu_no) AS 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.test_part_no = b.test_part_no-->
+<!--        AND b.site = #{query.site}-->
+<!--        AND b.project_id = #{query.projectId}-->
+<!--        LEFT JOIN part 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 A.test_part_no NOT IN (SELECT test_part_no FROM plm_project_part p WHERE P.site = #{query.site} AND P.project_id = #{query.projectId})-->
+<!--        <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="getProjectPartList2" resultType="com.spring.modules.part.vo.PartInformationVo" parameterType="PlmProjectPartData">
@@ -1437,38 +1443,6 @@
     </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,
@@ -1480,10 +1454,12 @@
             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 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=",">