From cfbb1f3e33d8526a14f5d50eef66c86480d8c23a Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 15 Jun 2026 20:56:58 +0800
Subject: [PATCH] =?UTF-8?q?pdi=E6=8F=90=E5=9B=9E=E8=B0=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/QmsIssueTicketControllerService.java      |  3 ++-
 .../QmsPdiInspectionResultsControllerService.java     | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
index def6d114..9d4733de 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
@@ -3405,7 +3405,8 @@ public class QmsIssueTicketControllerService {
             if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) {
                 QmsPdiTaskRecord originalTask = createPdiRepairTask(ticket.getSourceId(), now);
                 if (originalTask != null) {
-                    callbackPdiInspectionTask(originalTask, true);
+                    // 业务确认暂时关闭PDI回调WMS
+//                    callbackPdiInspectionTask(originalTask, true);
                 }
             }
 
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java
index f5ae6a72..bf11d816 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java
@@ -202,12 +202,16 @@ public class QmsPdiInspectionResultsControllerService {
                     .update();
         });
 
-        List<Long> deliveryItemIds = deliveryItemService.lambdaQuery()
+        Set<Long> deliveryItemIds = deliveryItemService.lambdaQuery()
                 .eq(QmsPdiDetectionRulesDeliveryItem::getDetectionRulesId, taskRecord.getDetectionRulesId())
                 .list()
                 .stream()
                 .map(QmsPdiDetectionRulesDeliveryItem::getId)
-                .collect(Collectors.toList());
+                .collect(Collectors.toSet());
+        request.getLoadingItems().stream()
+                .map(item -> item.getId())
+                .filter(Objects::nonNull)
+                .forEach(deliveryItemIds::add);
 
         // 2. 检查 type=0/1/3 是否都有结果，装车前检查项不参与检测项结果校验
         long unfilledResults = inspectionResultsService.lambdaQuery()
@@ -268,7 +272,8 @@ public class QmsPdiInspectionResultsControllerService {
                 .setDetectionCompletionTime(now)
                 .setOverdue(overdueValue)
                 .setInspectionEnable(hasDefect ? 3 : 2);
-        wmsPdiInspectionTaskCallbackService.callBack(taskRecord, overallResult);
+        // 业务确认暂时关闭PDI回调WMS
+//        wmsPdiInspectionTaskCallbackService.callBack(taskRecord, overallResult);
 
         // 8. 返回不合格项（转换为VO，图片改为List格式）
         return buildInspectionResultVOList(failedItems);