2025-06-17

审批中的技术参数卡能够发起多个ECN

src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@@ -193,4 +193,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     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);
 }

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

@@ -180,6 +180,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         executionUpdate(executionInfo);
         // 编辑会签信息
         countersignatureUpdate(executionInfo);
+        // 修改BM的show_in_query_flag字段为"N"
+        for (ChangeRequestDetailEntity bm : detailList) {
+            changeManagementMapper.updateBMShowInQueryFlag(bm.getSite(), bm.getCodeNo(), "N");
+        }
         // 查询变更单明细
         ChangeRequestEntity inData = new ChangeRequestEntity();
         inData.setSite(data.getSite());
@@ -2032,6 +2036,11 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
     public void deleteTempChangeInfo(ChangeRequestVo data) {
         // 删除变更单各表数据
         changeManagementMapper.delete(new LambdaUpdateWrapper<ChangeRequestEntity>().eq(ChangeRequestEntity::getSite, data.getSite()).eq(ChangeRequestEntity::getChangeNo, data.getChangeNo()));
+        // 修改BM的 show_in_query_flag 为"Y"
+        List<ChangeRequestDetailEntity> bmList = changeManagementMapper.requestDetailSearch(data);
+        for (ChangeRequestDetailEntity bm : bmList) {
+            changeManagementMapper.updateBMShowInQueryFlag(bm.getSite(), bm.getCodeNo(), "Y");
+        }
         changeManagementMapper.deleteChangeDetails(data);
         changeManagementMapper.deleteEcnTypeHeaderByChangeNo(data);
         changeManagementMapper.deleteEcnTypeDetailByChangeNo(data);

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -1961,7 +1961,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         // 查询特殊权限 校验是否可以执行操作
         List<ProcessFormEntity> 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();

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
         <where>
-            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'
             <if test = "query.buNo != null and query.buNo != ''">
                 AND b.bu_no = #{query.buNo}
             </if>
@@ -1435,4 +1435,10 @@
         WHERE A.site = #{site} AND document_no = #{docNo} AND a.classification_no IS NOT NULL
         ORDER BY A.ID DESC
     </insert>
+
+    <update id="updateBMShowInQueryFlag">
+        update plm_technical_specification_sheet
+            set show_in_query_flag = #{showInQueryFlag}
+        where site = #{site} and code_no = #{codeNo}
+    </update>
 </mapper>