From 777d114b607f1cf3cce59ec1238915ddab298fb2 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 25 Mar 2026 15:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=AB=E8=89=BE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 9 ++++ .../com/heai/modules/pms/mapper/QcMapper.java | 6 +++ .../pms/service/Impl/QcServiceImpl.java | 46 +++++++++++++++++-- .../heai/modules/pms/service/QcService.java | 5 ++ src/main/resources/mapper/pms/QcMapper.xml | 22 +++++++++ 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/heai/modules/pms/controller/QcController.java b/src/main/java/com/heai/modules/pms/controller/QcController.java index 6842e4d..7335f66 100644 --- a/src/main/java/com/heai/modules/pms/controller/QcController.java +++ b/src/main/java/com/heai/modules/pms/controller/QcController.java @@ -1580,6 +1580,15 @@ public class QcController { return R.ok(); } + /** + * SQC取消审核 + */ + @PostMapping("/cancelSQCApproval") + public R cancelSQCApproval(@RequestBody QcFAIRecordData data){ + qcService.cancelSQCApproval(data); + return R.ok(); + } + /** * @description: 删除检验记录 * @author: fengyuan_yang 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 fddb893..7ee6be5 100644 --- a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java @@ -677,6 +677,12 @@ public interface QcMapper { void updatePQCSubDetailSubmitFlag2(QcFAIRecordData qcData); + void updateSQCMasterSubmitFlag2(QcFAIRecordData qcData); + + void updateSQCDetailSubmitFlag2(QcFAIRecordData qcData); + + void updateSQCSubDetailSubmitFlag2(QcFAIRecordData qcData); + void updateFAIMasterSubmitFlag2(QcFAIRecordData qcData); void updateFAIDetailSubmitFlag2(QcFAIRecordData qcData); 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 09c969e..4aaf58c 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 @@ -3221,11 +3221,16 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveSQCSubmitResult(QcFAIRecordData data) { + SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); for (QcFAIRecordData recordData : data.getSubmitList()) { qcMapper.updateSQCMasterSubmitFlag(recordData); qcMapper.updateSQCDetailSubmitFlag(recordData); qcMapper.updateSQCSubDetailSubmitFlag(recordData); + if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ + inspectService.inspectForQMS(data.getSite(), data.getRefInfo1(), Integer.parseInt(data.getRefInfo2()), "submit", data.getInspectionResult(), data.getInspectionRemark(), currentUser.getUsername()); + } + if ("不合格".equals(recordData.getInspectionResult())) { try { List list = qcMapper.sqcDetailSearch(recordData); @@ -3773,7 +3778,7 @@ public class QcServiceImpl implements QcService { // 删除相应task表的数据 qcMapper.deleteReceivingTaskByInspectionNo(qcData); if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ - inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); + inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); } } } @@ -3793,7 +3798,7 @@ public class QcServiceImpl implements QcService { qcMapper.updateFAIDetailSubmitFlag2(qcData); qcMapper.updateFAISubDetailSubmitFlag2(qcData); if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ - inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); + inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); } } } else if ("ipqc".equals(data.getType())) { @@ -3803,7 +3808,7 @@ public class QcServiceImpl implements QcService { qcMapper.updateIPQCDetailSubmitFlag2(qcData); qcMapper.updateIPQCSubDetailSubmitFlag2(qcData); if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ - inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); + inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); } } } else if ("fqc".equals(data.getType())) { @@ -3813,7 +3818,7 @@ public class QcServiceImpl implements QcService { qcMapper.updateFQCDetailSubmitFlag2(qcData); qcMapper.updateFQCSubDetailSubmitFlag2(qcData); if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ - inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); + inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); } } } else if ("pqc".equals(data.getType())) { @@ -3823,12 +3828,43 @@ public class QcServiceImpl implements QcService { qcMapper.updatePQCDetailSubmitFlag2(qcData); qcMapper.updatePQCSubDetailSubmitFlag2(qcData); if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){ - inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); + inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); } } } } + /** + * SQC取消审核 + */ + @Override + @Transactional + public void cancelSQCApproval(QcFAIRecordData data) { + SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + if (data.getSubmitList() == null || data.getSubmitList().isEmpty()) { + return; + } + for (QcFAIRecordData qcData : data.getSubmitList()) { + qcData.setUpdateBy(currentUser.getUsername()); + // 状态改为待检验,并将提交标识改为N + qcMapper.updateSQCMasterSubmitFlag2(qcData); + qcMapper.updateSQCDetailSubmitFlag2(qcData); + qcMapper.updateSQCSubDetailSubmitFlag2(qcData); + // QMS取消（如存在ref信息） + if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())) { + inspectService.inspectForQMS( + qcData.getSite(), + qcData.getRefInfo1(), + Integer.parseInt(qcData.getRefInfo2()), + "cancel", + qcData.getInspectionResult(), + qcData.getInspectionRemark(), + currentUser.getUsername() + ); + } + } + } + @Override public List queryEquipmentFolderLocationList(QCEquipmentFolderLocation inData) { IPage page = new Page<>(inData.getPage(), inData.getPageCount()); diff --git a/src/main/java/com/heai/modules/pms/service/QcService.java b/src/main/java/com/heai/modules/pms/service/QcService.java index 3e0462c..1f7b624 100644 --- a/src/main/java/com/heai/modules/pms/service/QcService.java +++ b/src/main/java/com/heai/modules/pms/service/QcService.java @@ -386,6 +386,11 @@ public interface QcService { void cancelApproval2(QcFAIRecordData data); + /** + * SQC取消审核 + */ + void cancelSQCApproval(QcFAIRecordData data); + List queryEquipmentFolderLocationList(QCEquipmentFolderLocation inData); List getSuffixList(); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 517b962..0305473 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -4874,6 +4874,28 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + + UPDATE qc_sqc_record + SET submit_flag = 'N', + state = '待检验', + cancel_check_by = #{updateBy}, + cancel_check_date = getDate() + WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + + + UPDATE qc_sqc_detailed_record + SET is_submit = 'N' + WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + + + UPDATE qc_sqc_sub_detail_record + SET is_submit = 'N' + WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + delete receiving_task where site = #{site} and citem_code = #{buNo} and inspection_no = #{inspectionNo}