pdi提回调修改
This commit is contained in:
parent
1125b4d9b7
commit
cfbb1f3e33
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue