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 deliveryItemIds = deliveryItemService.lambdaQuery() + Set 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);