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 technicalSpecificationList = technicalSpecificationMapper.getTechnicalSpecificationByPart(data.getSite(), data.getBuNo(), data.getTestPartNo(), data.getFinalPartNo()); + List 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 getTechnicalSpecificationByPart(@Param("site") String site, @Param("buNo") String buNo, @Param("testPartNo") String testPartNo, @Param("finalPartNo") String finalPartNo); + List 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 @@ and b.final_part_no = #{finalPartNo} + + and a.project_id = #{projectId} +