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 ecf8732..4297ac9 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
@@ -684,12 +684,21 @@ public class QcServiceImpl implements QcService {
             // 修改子明细记录标识为已提交
             qcMapper.updateFQCSubDetailSubmitFlag(qcData);
 
-            // 发送邮件
-            if ("不合格".equals(qcData.getInspectionResult())) {
-                List<QcFAIRecordData> list = qcMapper.fqcDetailSearch(qcData);
-                qcData.setItemList(list);
-                sendMail(qcData, "FQC");
+            // 判断检验结论是否合格
+            if ("合格".equals(qcData.getInspectionResult()) || "让步接收".equals(qcData.getDisposalMeasures()) || "挑选使用".equals(qcData.getDisposalMeasures())) {
+                // 状态改为待入库
+                qcMapper.updateInboundNotificationStatus(qcData.getSite(), qcData.getBuNo(), qcData.getDocumentNo(), "待入库");
+            } else {
+                // 状态改为'草稿'
+                qcMapper.updateInboundNotificationStatus(qcData.getSite(), qcData.getBuNo(), qcData.getDocumentNo(), "草稿");
             }
+
+//            // 发送邮件
+//            if ("不合格".equals(qcData.getInspectionResult())) {
+//                List<QcFAIRecordData> list = qcMapper.fqcDetailSearch(qcData);
+//                qcData.setItemList(list);
+//                sendMail(qcData, "FQC");
+//            }
         }
     }