diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java index 6c98028e..56f389c6 100644 --- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java +++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java @@ -193,4 +193,6 @@ public interface ChangeManagementMapper extends BaseMapper{ void updateProcessNodeForReject(@Param("site") String site, @Param("bu") String bu, @Param("requestId") String requestId, @Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId, @Param("nodeConclusion") String nodeConclusion, @Param("rejectOpinion") String rejectOpinion); void saveProcessFormBySql(@Param("site") String site, @Param("docNo") String docNo, @Param("classificationNo") String classificationNo); + + void updateBMShowInQueryFlag(@Param("site") String site, @Param("codeNo") String codeNo, @Param("showInQueryFlag") String showInQueryFlag); } 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 e17a7a58..05d6ed16 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 @@ -180,6 +180,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl().eq(ChangeRequestEntity::getSite, data.getSite()).eq(ChangeRequestEntity::getChangeNo, data.getChangeNo())); + // 修改BM的 show_in_query_flag 为"Y" + List bmList = changeManagementMapper.requestDetailSearch(data); + for (ChangeRequestDetailEntity bm : bmList) { + changeManagementMapper.updateBMShowInQueryFlag(bm.getSite(), bm.getCodeNo(), "Y"); + } changeManagementMapper.deleteChangeDetails(data); changeManagementMapper.deleteEcnTypeHeaderByChangeNo(data); changeManagementMapper.deleteEcnTypeDetailByChangeNo(data); diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 940cc67c..185073e4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1961,7 +1961,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // 查询特殊权限 校验是否可以执行操作 List processFormList = changeManagementMapper.queryRequestId(data.getSite(), "", data.getCodeNo()); if (processFormList.isEmpty()) { - throw new RuntimeException("流程请求ID获取有误!"); + throw new RuntimeException("未发起流程审批,不允许Dead!"); } ProcessFormEntity processForm = processFormList.get(0); PlmProcessControllBaseData cData = new PlmProcessControllBaseData(); diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 6412a0ca..47a33e42 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -25,7 +25,7 @@ LEFT JOIN plm_customer_information j ON j.site = c.site and j.customer_no = c.customer_id left join view_Project_final_Part b on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no - a.site = #{query.site} AND isnull(a.ECN_flag, 'N') = 'N' and a.status = '已完成' + a.site = #{query.site} AND isnull(a.ECN_flag, 'N') = 'N' and a.status = '已完成' and isnull(a.show_in_query_flag, 'Y') = 'Y' AND b.bu_no = #{query.buNo} @@ -255,7 +255,7 @@ p.plm_part_no FROM plm_change_request_detail a left join plm_technical_specification_sheet as b on a.site = b.site and a.code_no = b.code_no - left join part as p on a.site = p.site and a.part_no = p.ifs_part_no and p.show_in_query_flag ='Y' + left join part as p on a.site = p.site and a.part_no = p.ifs_part_no and p.show_in_query_flag = 'Y' where a.site = #{site} and a.change_no = #{changeNo} @@ -1435,4 +1435,10 @@ WHERE A.site = #{site} AND document_no = #{docNo} AND a.classification_no IS NOT NULL ORDER BY A.ID DESC + + + update plm_technical_specification_sheet + set show_in_query_flag = #{showInQueryFlag} + where site = #{site} and code_no = #{codeNo} +