From d7cd456fbe7aa0e0895bb6e1d3605bafc5a6875c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 17 Sep 2025 17:03:56 +0800
Subject: [PATCH] =?UTF-8?q?2025-09-17=20=E5=88=A0=E9=99=A4=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=89=A9=E6=96=99=E6=97=B6=E6=8A=80=E6=9C=AF=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8D=A1=E7=9A=84=E6=A0=A1=E9=AA=8Cwhere=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8AprojectId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/service/impl/PartInformationServiceImpl.java  | 2 +-
 .../sampleManagement/dao/TechnicalSpecificationMapper.java     | 3 ++-
 .../mapper/sampleManagement/TechnicalSpecificationMapper.xml   | 3 +++
 3 files changed, 6 insertions(+), 2 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 80d2262a..4c1d0bc3 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
@@ -4700,7 +4700,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         }
 
         // 技术参数卡检验
-        List<PlmTechnicalSpecificationSheetData> technicalSpecificationList = technicalSpecificationMapper.getTechnicalSpecificationByPart(data.getSite(), data.getBuNo(), data.getTestPartNo(), data.getFinalPartNo());
+        List<PlmTechnicalSpecificationSheetData> technicalSpecificationList = technicalSpecificationMapper.getTechnicalSpecificationByPart(data.getSite(), data.getBuNo(), data.getTestPartNo(), data.getFinalPartNo(), data.getProjectId());
         if (!technicalSpecificationList.isEmpty()) {
             throw new RuntimeException("该项目物料已存在技术参数卡，不允许删除！");
         }
diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
index 92b24e96..dc0dc396 100644
--- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
+++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
@@ -1238,7 +1238,8 @@ public interface TechnicalSpecificationMapper {
 
     void deleteBMPrepressToolByCodeNo(PlmBmPrepressTool data);
 
-    List<PlmTechnicalSpecificationSheetData> getTechnicalSpecificationByPart(@Param("site") String site, @Param("buNo") String buNo, @Param("testPartNo") String testPartNo, @Param("finalPartNo") String finalPartNo);
+    List<PlmTechnicalSpecificationSheetData> getTechnicalSpecificationByPart(@Param("site") String site, @Param("buNo") String buNo, @Param("testPartNo") String testPartNo,
+                                                                             @Param("finalPartNo") String finalPartNo, @Param("projectId") String projectId);
 
     void deleteBmBom(@Param("site") String site, @Param("codeNo") String docNo);
 
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 46e904e0..b61bd774 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -3110,6 +3110,9 @@
         <if test="finalPartNo != null and finalPartNo != ''">
             and b.final_part_no = #{finalPartNo}
         </if>
+        <if test="projectId != null and projectId != ''">
+            and a.project_id = #{projectId}
+        </if>
     </select>
 
     <delete id="deleteBmBom">