From cdab9a05e806c59fba26aac12932c8ac0665a791 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 27 May 2025 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?2025-05-27=20=E9=A1=B9=E7=9B=AE=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E8=BD=AC=E6=AD=A3=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=99=E5=8F=B7=E5=AF=BC=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8E=92=E9=99=A4=E8=87=AA=E8=BA=AB?=
 =?UTF-8?q?=E4=B8=8EPart=E8=A1=A8=E7=9A=84PLM=5FPART=5FNO=E7=9B=B8?=
 =?UTF-8?q?=E5=90=8C=E7=9A=84=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/service/impl/ChangeManagementServiceImpl.java      | 1 +
 src/main/resources/mapper/change/ChangeManagementMapper.xml   | 2 +-
 src/main/resources/mapper/part/PartInformationMapper.xml      | 4 +++-
 .../mapper/sampleManagement/TechnicalSpecificationMapper.xml  | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 9847c765..45951dd6 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/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);
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 8874c28c..4d0f6e93 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/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">
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 4b8dce46..ad410e6f 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/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}
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 3353462d..2c258531 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/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}