diff --git a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java index 55a5772..31b82d1 100644 --- a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java @@ -293,6 +293,8 @@ public interface QcMapper { */ int copyIQCRecordForMachineInspect(QcFAIRecordData data); + List selectMachineInspectNosBySourceInspectionNo(QcFAIRecordData data); + void saveSQCRecord(QcFAIRecordData qcFAIRecordData); IPage qcIPQCInspectionSearch(Page qcFAIRecordDataPage,@Param("query") QcFAIRecordData data); diff --git a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java index b99aac5..0251934 100644 --- a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java @@ -4143,6 +4143,11 @@ public class QcServiceImpl implements QcService { if (partInformationList.isEmpty()) { throw new RuntimeException("未查到该物料数据!"); } + List machineInspectNos = qcMapper.selectMachineInspectNosBySourceInspectionNo(qcData); + if (machineInspectNos != null && !machineInspectNos.isEmpty()) { + throw new RuntimeException("检验单号 " + qcData.getInspectionNo() + " 已生成上机检验任务单【" + + String.join("、", machineInspectNos) + "】,不允许取消审核!"); + } /*if ("G".equals(partInformationList.get(0).getControlMes())) { throw new RuntimeException("检验单物料的管控类型为不适用,不允许取消审核 {" + qcData.getInspectionNo() + "} !"); }*/ diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index aa6244f..efd5808 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2597,6 +2597,13 @@ WHERE inspection_no = #{inspectionNo} AND site = #{site} AND bu_no = #{buNo} + + INSERT INTO qc_sqc_record (inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,