From f2abc28207d55d30c8a26a71296236dd1c565aad Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 24 Nov 2025 11:14:18 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-24=20IPQC=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/boxManage/data/SoReceiveCasesData.java     |  1 +
 .../modules/boxManage/entity/SoReceiveCases.java       |  1 +
 .../gaotao/modules/pms/service/Impl/QcServiceImpl.java |  4 +++-
 src/main/resources/mapper/pms/QcMapper.xml             | 10 ++++++----
 4 files changed, 11 insertions(+), 5 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 b2204f0..d6c57ad 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -64,5 +64,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 029f193..79c3444 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -203,5 +203,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 f7fe4c1..688a307 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
@@ -1641,7 +1641,7 @@ public class QcServiceImpl implements QcService {
                 qcMapper.updateInboundNotificationStatus(recordData.getSite(), recordData.getBuNo(), recordData.getDocumentNo(), "待入库");
             }
             // 发送邮件
-            if ("不合格".equals(recordData.getInspectionResult())) {
+            else if ("不合格".equals(recordData.getInspectionResult())) {
                 // 更新"收货入库任务"的状态为"已完成"
                 qcMapper.updateInboundNotificationStatus(recordData.getSite(), recordData.getBuNo(), recordData.getDocumentNo(), "已完成");
 //                try {
@@ -1679,6 +1679,8 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateIQCMasterSubmitFlag2(qcData);
             qcMapper.updateIQCDetailSubmitFlag2(qcData);
             qcMapper.updateIQCSubDetailSubmitFlag2(qcData);
+            // 修改收货入库单为待检验
+            qcMapper.updateInboundNotificationStatus(qcData.getSite(), qcData.getBuNo(), qcData.getDocumentNo(), "待检验");
 //            // 删除相应task表的数据
 //            qcMapper.deleteReceivingTaskByInspectionNo(qcData);
         }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 37ca345..d187e22 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -870,7 +870,8 @@
             qir.bu_no,
             qir.po_orderNo,
             qir.po_itemNo,
-            qir.roll_count
+            qir.roll_count,
+            qir.document_no
         FROM qc_iqc_record as qir
         LEFT JOIN part p ON qir.part_no = p.partNo and qir.site = p.site
         WHERE qir.site in (select site from AccessSite where userID = #{userName})
@@ -947,7 +948,8 @@
         a.expiration_date,
         a.pass_qty,
         a.not_pass_qty,
-        a.batch_qualified_qty
+        a.batch_qualified_qty,
+        a.document_no
         FROM qc_iqc_record as a
         left join part as d on a.site = d.site and a.bu_no = d.bu_no and a.part_no = d.partNo
         left join view_Supplier as s on a.site = s.site and a.supplier_no = s.SupplierID
@@ -2689,10 +2691,10 @@
     <select id="selectInfoByInspectionNo" resultType="com.gaotao.modules.pms.data.PoOrderRollNoData" parameterType="com.gaotao.modules.pms.data.QcFAIRecordData">
         select
             site,
-            citem_code,
+            bu_no,
             inspection_no
         from po_order_roll_no
-        where site = #{site} and citem_code = #{buNo} and inspection_no = #{inspectionNo}
+        where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
     </select>
 
     <update id="updateIQCMasterSubmitFlag2" parameterType="com.gaotao.modules.pms.data.QcFAIRecordData">