From 1125b4d9b75c864c2d542d04e4786425e3322460 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 15 Jun 2026 20:03:12 +0800
Subject: [PATCH] =?UTF-8?q?pdi=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QmsPdiInspectionResultsControllerService.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 abaa7cb5..f5ae6a72 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,10 +202,18 @@ public class QmsPdiInspectionResultsControllerService {
                     .update();
         });
 
-        // 2. 检查 type=0/1/3 是否都有结果
+        List<Long> deliveryItemIds = deliveryItemService.lambdaQuery()
+                .eq(QmsPdiDetectionRulesDeliveryItem::getDetectionRulesId, taskRecord.getDetectionRulesId())
+                .list()
+                .stream()
+                .map(QmsPdiDetectionRulesDeliveryItem::getId)
+                .collect(Collectors.toList());
+
+        // 2. 检查 type=0/1/3 是否都有结果，装车前检查项不参与检测项结果校验
         long unfilledResults = inspectionResultsService.lambdaQuery()
                 .eq(QmsPdiInspectionResults::getTaskId, request.getTaskId())
-                .ne(QmsPdiInspectionResults::getInspectionItemType, 2)
+                .in(QmsPdiInspectionResults::getInspectionItemType, Arrays.asList(0, 1, 3))
+                .notIn(!deliveryItemIds.isEmpty(), QmsPdiInspectionResults::getInspectionItemId, deliveryItemIds)
                 .isNull(QmsPdiInspectionResults::getInspectionItemResults)
                 .count();
         if (unfilledResults > 0) {
@@ -225,7 +233,8 @@ public class QmsPdiInspectionResultsControllerService {
         // 4. 查询不合格检测项（type=0/1/3，装车前不计入）
         List<QmsPdiInspectionResults> failedItems = inspectionResultsService.lambdaQuery()
                 .eq(QmsPdiInspectionResults::getTaskId, request.getTaskId())
-                .ne(QmsPdiInspectionResults::getInspectionItemType, 2)
+                .in(QmsPdiInspectionResults::getInspectionItemType, Arrays.asList(0, 1, 3))
+                .notIn(!deliveryItemIds.isEmpty(), QmsPdiInspectionResults::getInspectionItemId, deliveryItemIds)
                 .eq(QmsPdiInspectionResults::getInspectionItemResults, false)
                 .list();