From d7d5e027cb355fbe1352b27b5e33402943b32067 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 31 Oct 2025 13:30:14 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-31=20OQC=E6=A3=80=E9=AA=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=A3=85=E7=AE=B1=E7=9A=84=E7=8A=B6=E6=80=81=E5=92=8C=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
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 +
 .../com/gaotao/modules/pms/mapper/QcMapper.java |  4 ++++
 .../modules/pms/service/Impl/QcServiceImpl.java | 17 +++++++----------
 src/main/resources/mapper/pms/QcMapper.xml      | 12 ++++++++++++
 5 files changed, 25 insertions(+), 10 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 8b995f7..3ff27e7 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -41,3 +41,4 @@ 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 51e0722..254051b 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -184,3 +184,4 @@ public class SoReceiveCases {
 
 
 
+
diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
index 9d7784f..0bf1ff6 100644
--- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
@@ -469,4 +469,8 @@ public interface QcMapper {
     int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo, @Param("resourceId") String resourceId, @Param("seqNo") String seqNo);
 
     List<ResourceData> queryResourceList3();
+
+    void updateSaleBoxManageStatus(@Param("site") String site, @Param("buNo") String buNo, @Param("documentNo") String documentNo, @Param("status") String status);
+
+    void updateSaleBoxManageInspectionFlag(@Param("site") String site, @Param("buNo") String buNo, @Param("documentNo") String documentNo, @Param("inspectionFlag") String inspectionFlag);
 }
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 c490a74..26ad33e 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
@@ -3137,16 +3137,13 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateFQASDetailSubmitFlag(qcData);
             // 修改子明细记录标识为已提交
             qcMapper.updateFQASSubDetailSubmitFlag(qcData);
-
-            if ("生产入库检验".equals(qcData.getOrderRefType())) {
-                // 调用存储过程执行
-                Map<String, Object> resultMap = this.dboSaveFQASSubmitResult(qcData);
-                // 判断是否检验成功
-                String code = String.valueOf(resultMap.get("resultCode"));
-                if ("400".equalsIgnoreCase(code)) {
-                    String msg = String.valueOf(resultMap.get("resultMsg"));
-                    throw new XJException(msg, Integer.parseInt(code));
-                }
+            // 判断检验结论是否合格
+            if ("合格".equals(qcData.getInspectionResult()) || "让步接收".equals(qcData.getDisposalMeasures()) || "挑选使用".equals(qcData.getDisposalMeasures())) {
+                // 销售发货装箱状态改为待出库
+                qcMapper.updateSaleBoxManageStatus(qcData.getSite(), qcData.getBuNo(), qcData.getDocumentNo(), "待出库");
+            } else {
+                // 销售发货装箱是否送检标识改为'N'
+                qcMapper.updateSaleBoxManageInspectionFlag(qcData.getSite(), qcData.getBuNo(), qcData.getDocumentNo(), "N");
             }
         }
     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 60c407d..251d249 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3401,6 +3401,18 @@
     <select id="queryResourceList3" resultType="com.gaotao.modules.pms.data.ResourceData">
         select DISTINCT  ResourceId,ResourceDesc  from  WorkCenterResource
     </select>
+
+    <update id="updateSaleBoxManageStatus">
+        update outbound_notification_head
+            set order_status = #{status}
+        where site = #{site} and bu_no = #{buNo} and order_no = #{documentNo}
+    </update>
+
+    <update id="updateSaleBoxManageInspectionFlag">
+        update outbound_notification_detail
+        set inspection_flag = #{inspectionFlag}
+        where site = #{site} and bu_no = #{buNo} and order_no = #{documentNo}
+    </update>
 </mapper>