diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java index c970623..20a39a1 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java @@ -35,6 +35,8 @@ public interface QcMapper { QcFAIRecordData checkFAIIsSubmit(SubDetailValues data); + QcFAIRecordData getFAIRecordStatus(QcFAIRecordData data); + List selectFAISubDetailValue(String inspectionNo, String itemNo); void deleteFAISubDetailedRecord(QcFAIRecordData data); @@ -125,6 +127,8 @@ public interface QcMapper { QcFAIRecordData checkIQCIsSubmit(SubDetailValues data); + QcFAIRecordData getIQCRecordStatus(QcFAIRecordData data); + void delIQCSubDetailedRecord(QcSubDetailInformationData data); void saveIQCSubDetailed(List subDetailValues); @@ -185,6 +189,8 @@ public interface QcMapper { QcFAIRecordData checkFQCIsSubmit(SubDetailValues data); + QcFAIRecordData getFQCRecordStatus(QcFAIRecordData data); + List selectFQCSubDetailValue(String inspectionNo, String itemNo, String site); String selectFQCInspectionNo(QcFAIRecordData data); diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java index 6a1b3e7..94a9aff 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java @@ -204,6 +204,12 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveFAIDetailedRecord(QcFAIRecordData data) { + // 校验:查询当前数据库中的状态,如果已审核完成则禁止保存 + QcFAIRecordData currentRecord = qcMapper.getFAIRecordStatus(data); + if (currentRecord != null && ("Y".equals(currentRecord.getSubmitFlag()) || "已完成".equals(currentRecord.getState()))) { + throw new RuntimeException("该检验单已审核完成,无法修改!"); + } + if ("1".equals(data.getType())) { // 应用 data.setState("待检验"); } else { // 保存 @@ -624,6 +630,12 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveFQCDetailedRecord(QcFAIRecordData data) { + // 校验:查询当前数据库中的状态,如果已审核完成则禁止保存 + QcFAIRecordData currentRecord = qcMapper.getFQCRecordStatus(data); + if (currentRecord != null && ("Y".equals(currentRecord.getSubmitFlag()) || "已完成".equals(currentRecord.getState()))) { + throw new RuntimeException("该检验单已审核完成,无法修改!"); + } + if ("1".equals(data.getType())) { // 应用 data.setState("待检验"); } else { // 保存 @@ -1485,6 +1497,12 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveIQCDetailedRecord(QcFAIRecordData data) { + // 校验:查询当前数据库中的状态,如果已审核完成则禁止保存 + QcFAIRecordData currentRecord = qcMapper.getIQCRecordStatus(data); + if (currentRecord != null && ("Y".equals(currentRecord.getSubmitFlag()) || "已完成".equals(currentRecord.getState()))) { + throw new RuntimeException("该检验单已审核完成,无法修改!"); + } + if ("1".equals(data.getType())) { // 应用 data.setState("待检验"); } else { // 保存 diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 72df59f..e8b4605 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -396,6 +396,13 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + + DELETE FROM qc_fai_sub_detail_record @@ -1182,6 +1189,13 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} + + + DELETE FROM qc_iqc_sub_detail_record @@ -1630,6 +1644,13 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + +