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:03:12 +08:00
parent a21b9245f5
commit 1125b4d9b7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,10 +202,18 @@ public class QmsPdiInspectionResultsControllerService {
.update(); .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() long unfilledResults = inspectionResultsService.lambdaQuery()
.eq(QmsPdiInspectionResults::getTaskId, request.getTaskId()) .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) .isNull(QmsPdiInspectionResults::getInspectionItemResults)
.count(); .count();
if (unfilledResults > 0) { if (unfilledResults > 0) {
@ -225,7 +233,8 @@ public class QmsPdiInspectionResultsControllerService {
// 4. 查询不合格检测项（type=0/1/3，装车前不计入） // 4. 查询不合格检测项（type=0/1/3，装车前不计入）
List<QmsPdiInspectionResults> failedItems = inspectionResultsService.lambdaQuery() List<QmsPdiInspectionResults> failedItems = inspectionResultsService.lambdaQuery()
.eq(QmsPdiInspectionResults::getTaskId, request.getTaskId()) .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) .eq(QmsPdiInspectionResults::getInspectionItemResults, false)
.list(); .list();