rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pdi提回调修改

This commit is contained in:
yf001217 2026-06-15 20:56:58 +08:00
parent 1125b4d9b7
commit cfbb1f3e33
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -3405,7 +3405,8 @@ public class QmsIssueTicketControllerService {
if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) { if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) {
QmsPdiTaskRecord originalTask = createPdiRepairTask(ticket.getSourceId(), now); QmsPdiTaskRecord originalTask = createPdiRepairTask(ticket.getSourceId(), now);
if (originalTask != null) { if (originalTask != null) {
callbackPdiInspectionTask(originalTask, true); // 业务确认暂时关闭PDI回调WMS
// callbackPdiInspectionTask(originalTask, true);
} }
} }

11
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java
View File

@ -202,12 +202,16 @@ public class QmsPdiInspectionResultsControllerService {
.update(); .update();
}); });
List<Long> deliveryItemIds = deliveryItemService.lambdaQuery() Set<Long> deliveryItemIds = deliveryItemService.lambdaQuery()
.eq(QmsPdiDetectionRulesDeliveryItem::getDetectionRulesId, taskRecord.getDetectionRulesId()) .eq(QmsPdiDetectionRulesDeliveryItem::getDetectionRulesId, taskRecord.getDetectionRulesId())
.list() .list()
.stream() .stream()
.map(QmsPdiDetectionRulesDeliveryItem::getId) .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 是否都有结果，装车前检查项不参与检测项结果校验 // 2. 检查 type=0/1/3 是否都有结果，装车前检查项不参与检测项结果校验
long unfilledResults = inspectionResultsService.lambdaQuery() long unfilledResults = inspectionResultsService.lambdaQuery()
@ -268,7 +272,8 @@ public class QmsPdiInspectionResultsControllerService {
.setDetectionCompletionTime(now) .setDetectionCompletionTime(now)
.setOverdue(overdueValue) .setOverdue(overdueValue)
.setInspectionEnable(hasDefect ? 3 : 2); .setInspectionEnable(hasDefect ? 3 : 2);
wmsPdiInspectionTaskCallbackService.callBack(taskRecord, overallResult); // 业务确认暂时关闭PDI回调WMS
// wmsPdiInspectionTaskCallbackService.callBack(taskRecord, overallResult);
// 8. 返回不合格项（转换为VO，图片改为List格式） // 8. 返回不合格项（转换为VO，图片改为List格式）
return buildInspectionResultVOList(failedItems); return buildInspectionResultVOList(failedItems);