2025-05-27

项目料号转正之后，在项目料号导入时，需要排除自身与Part表的PLM_PART_NO相同的物料

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -1661,6 +1661,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.updateChangeReject2(paramData);
 
         // 修改当前流程记录的退回标记为Y，并记录当前节点
+        // 2025-05-26 会签节点时，其中一个人驳回就算驳回
         changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
         List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
         ProcessFormEntity processForm = processFormList.get(0);

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -943,7 +943,7 @@
     <update id="updateProcessReject" parameterType="string">
         update plm_process_form
         set reject_flag = 'Y'
-        where site = #{site} and bu = #{bu} and request_id = #{requestId} and domain_control_account = #{domainControlAccount} and is_remark = 0
+        where site = #{site} and bu = #{bu} and request_id = #{requestId} and is_remark = 0
     </update>
 
     <select id="getProcessNodeId" parameterType="string" resultType="ProcessFormEntity">

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -1432,10 +1432,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.part_no = b.test_part_no
+        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
         where a.site = #{query.site}
           and a.active = '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=",">
             #{item}

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -2220,7 +2220,9 @@
         from view_Project_final_Part as a
         left join plm_project_info as c on a.site = c.site and a.project_id = c.project_id
         left join plm_customer_part_info as pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
+        left join plm_technical_specification_sheet d on a.site = d.site  and a.test_part_no = d.test_part_no
         <where>
+            and d.test_part_no is null
             and a.site = #{query.site}
             <if test="query.projectId != null and query.projectId != ''">
                 AND a.project_id like #{query.projectId}