From 15846d38fbf0919fd44a511a9b2a20102a0e27e4 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Wed, 22 Jul 2026 11:26:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0SQC=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E6=96=B9=E6=B3=95=E7=94=A8=E4=BA=8E=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/heai/modules/pms/mapper/QcMapper.java | 2 ++ .../com/heai/modules/pms/service/Impl/QcServiceImpl.java | 4 +++- src/main/resources/mapper/pms/QcMapper.xml | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) 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 560d956..e9e0651 100644 --- a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java @@ -740,6 +740,8 @@ public interface QcMapper { void updateSQCSubDetailSubmitFlag2(QcFAIRecordData qcData); + void updateSQCInspectionResult(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 f384573..0f70771 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 @@ -4106,6 +4106,8 @@ public class QcServiceImpl implements QcService { qcMapper.updateSQCMasterSubmitFlag2(qcData); qcMapper.updateSQCDetailSubmitFlag2(qcData); qcMapper.updateSQCSubDetailSubmitFlag2(qcData); + // 清空检验结果 + qcMapper.updateSQCInspectionResult(qcData); // QMS取消（如存在ref信息） if (StringUtils.isNotBlank(qcData.getRefInfo1())) { inspectService.inspectForQMS( @@ -4119,7 +4121,7 @@ public class QcServiceImpl implements QcService { ); } - // 回滚呆滞刷新日期：将 stagnation_detail.pre_audit_time 回滚到 print_label_record.stagnation_refresh_date + // 回滚呆滞刷新日期 rollbackStagnationRefreshDate(qcData); } } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 5f6550a..1f6313e 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -5609,6 +5609,12 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + + UPDATE qc_sqc_record + SET inspection_result = NULL + 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}