From 93080f419f6906bee0d2b8de6eae3e14da51104e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 12 Nov 2025 15:36:17 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-12=20qc=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boxManage/data/SoReceiveCasesData.java    |  1 +
 .../boxManage/entity/SoReceiveCases.java      |  1 +
 .../pms/service/Impl/QcServiceImpl.java       | 35 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index a96d672..e8c2237 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -52,5 +52,6 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
 
 
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index 8b0973c..b901e11 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -195,5 +195,6 @@ public class SoReceiveCases {
 
 
 
+
 
 
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 11c4ac0..a1a0bc1 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
@@ -1643,13 +1643,14 @@ public class QcServiceImpl implements QcService {
             // 发送邮件
             if ("不合格".equals(recordData.getInspectionResult())) {
                 // 更新"收货入库任务"的状态为"已完成"
-                try {
-                    List<QcFAIRecordData> list = qcMapper.iqcDetailSearch(recordData);
-                    recordData.setItemList(list);
-                    sendMailIQC(recordData, "IQC");
-                } catch (Exception e) {
-                    logger.info(e.getMessage());
-                }
+                qcMapper.updateInboundNotificationStatus(recordData.getSite(), recordData.getBuNo(), recordData.getDocumentNo(), "已完成");
+//                try {
+//                    List<QcFAIRecordData> list = qcMapper.iqcDetailSearch(recordData);
+//                    recordData.setItemList(list);
+//                    sendMailIQC(recordData, "IQC");
+//                } catch (Exception e) {
+//                    logger.info(e.getMessage());
+//                }
             }
         }
     }
@@ -1661,14 +1662,14 @@ public class QcServiceImpl implements QcService {
     @Transactional
     public void cancelApproval(QcFAIRecordData data) {
         for (QcFAIRecordData qcData : data.getSubmitList()) {
-            // 物料的controlMes为G的不允许取消审核
-            List<QcFAIRecordData> partInformationList = qcMapper.getPartInformation(qcData);
-            if (partInformationList.isEmpty()) {
-                throw new RuntimeException("未查到该物料数据!");
-            }
-            if ("G".equals(partInformationList.get(0).getControlMes())) {
-                throw new RuntimeException("检验单物料的管控类型为不适用，不允许取消审核 {" + qcData.getInspectionNo() + "} ！");
-            }
+//            // 物料的controlMes为G的不允许取消审核
+//            List<QcFAIRecordData> partInformationList = qcMapper.getPartInformation(qcData);
+//            if (partInformationList.isEmpty()) {
+//                throw new RuntimeException("未查到该物料数据!");
+//            }
+//            if ("G".equals(partInformationList.get(0).getControlMes())) {
+//                throw new RuntimeException("检验单物料的管控类型为不适用，不允许取消审核 {" + qcData.getInspectionNo() + "} ！");
+//            }
             // po_order_roll_no里如果有数据则不允许取消审核
             List<PoOrderRollNoData> rollNos = qcMapper.selectInfoByInspectionNo(qcData);
             if (!rollNos.isEmpty()) {
@@ -1678,8 +1679,8 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateIQCMasterSubmitFlag2(qcData);
             qcMapper.updateIQCDetailSubmitFlag2(qcData);
             qcMapper.updateIQCSubDetailSubmitFlag2(qcData);
-            // 删除相应task表的数据
-            qcMapper.deleteReceivingTaskByInspectionNo(qcData);
+//            // 删除相应task表的数据
+//            qcMapper.deleteReceivingTaskByInspectionNo(qcData);
         }
     }