Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

This commit is contained in:
yf001217 2026-06-09 20:02:52 +08:00
commit 75082498fe
1 changed files with 4 additions and 3 deletions

View File

@ -1583,6 +1583,7 @@ public class QmsIssueTicketControllerService {
}
}
});
records.removeIf(r->r.getUnqualifiedQty()==0);
records.stream()
.filter(record -> StrUtil.isNotBlank(record.getImageIds()))
.forEach(record -> {
@ -2331,7 +2332,7 @@ public class QmsIssueTicketControllerService {
// 6. 查询问题详情不合格项
List<QmsPqcTicketMyDetailVO.PqcIssueDetailVO> issueDetails = new ArrayList<>();
// 查询当前登录人的处理记录
QmsIssueTicketProcess process = issueTicketProcessService.lambdaQuery()
.eq(QmsIssueTicketProcess::getIssueTicketId, id)
@ -2376,7 +2377,7 @@ public class QmsIssueTicketControllerService {
List<QmsPqcTaskRecord> tasks = pqcTaskRecordService.listByIds(pointIds);
taskMap = tasks.stream()
.collect(Collectors.toMap(QmsPqcTaskRecord::getId, t -> t));
Set<Long> inspectionPointIds = tasks.stream()
.map(QmsPqcTaskRecord::getInspectionPointId)
.filter(Objects::nonNull)
@ -2441,7 +2442,7 @@ public class QmsIssueTicketControllerService {
// 检测数据
issueVO.setSelfTestData(detail.getSelfTestData());
issueVO.setQcTestData(detail.getQcTestData());
// 复核意见
issueVO.setReviewOpinion(detail.getReviewOpinion());