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

pdi查询检测项方法修改 

pqc返回值修改
This commit is contained in:
yf001217 2026-06-11 11:42:48 +08:00
parent e2a30431a8
commit 869d49941e
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java
View File

@ -259,6 +259,8 @@ public class QmsPdiDetectionRulesControllerService {
.map(item -> new QmsPdiComponentAnagement()
.setDetectionRulesId(newId)
.setComponentName(item.getComponentName())
.setSort(item.getSort())
.setStatus(item.getStatus())
.setCreateBy(operator)
.setCreateTime(now))
.collect(java.util.stream.Collectors.toList());

1
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java
View File

@ -439,7 +439,6 @@ public class QmsPdiStatusItemControllerService {
}
// 2. 提取所有componentsId并去重
List<Long> componentIds = items.stream()
List<Long> componentIds = items.stream()
.map(QmsPdiDetectionRulesStatusItem::getComponentsId)
.filter(Objects::nonNull)

28
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
View File

@ -1036,7 +1036,8 @@ public class QmsPqcTaskRecordControllerService {
}
// 6. 同步生成工单；仅当任务总体不合格时才额外生成重检任务
List<QmsPqcUnqualifiedItemVO> unqualifiedItems = buildUnqualifiedItems(request);
Map<Long, Long> detailIdMap = getTaskDetailIdMap(taskRecord.getId());
List<QmsPqcUnqualifiedItemVO> unqualifiedItems = buildUnqualifiedItems(request, detailIdMap);
if (!unqualifiedItems.isEmpty()) {
handleUnqualifiedTask(taskRecord, currentUserId, currentUserName, now);
return SubmitResult.unqualified(unqualifiedItems);
@ -1439,27 +1440,41 @@ public class QmsPqcTaskRecordControllerService {
.collect(Collectors.joining(","));
}
private List<QmsPqcUnqualifiedItemVO> buildUnqualifiedItems(QmsPqcTaskRecordDraftQO request) {
private Map<Long, Long> getTaskDetailIdMap(Long taskId) {
return pqcTaskRecordDetailsService.lambdaQuery()
.eq(QmsPqcTaskRecordDetails::getTaskId, taskId)
.list()
.stream()
.filter(detail -> detail.getInspectionPointItemId() != null)
.collect(Collectors.toMap(
QmsPqcTaskRecordDetails::getInspectionPointItemId,
QmsPqcTaskRecordDetails::getId,
(first, second) -> first
));
}
private List<QmsPqcUnqualifiedItemVO> buildUnqualifiedItems(QmsPqcTaskRecordDraftQO request, Map<Long, Long> detailIdMap) {
List<QmsPqcUnqualifiedItemVO> items = new ArrayList<>();
if (request.getProcessInspections() != null) {
for (QmsPqcTaskRecordDraftQO.ProcessInspectionItem item : request.getProcessInspections()) {
if (Boolean.FALSE.equals(item.getEnable())) {
items.add(buildUnqualifiedItem(item));
items.add(buildUnqualifiedItem(item, detailIdMap));
}
}
}
if (request.getProcessInspectionsLevel3() != null) {
for (QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item : request.getProcessInspectionsLevel3()) {
if (Boolean.FALSE.equals(item.getEnable())) {
items.add(buildUnqualifiedItem(item));
items.add(buildUnqualifiedItem(item, detailIdMap));
}
}
}
return items;
}
private QmsPqcUnqualifiedItemVO buildUnqualifiedItem(QmsPqcTaskRecordDraftQO.ProcessInspectionItem item) {
private QmsPqcUnqualifiedItemVO buildUnqualifiedItem(QmsPqcTaskRecordDraftQO.ProcessInspectionItem item, Map<Long, Long> detailIdMap) {
QmsPqcUnqualifiedItemVO vo = new QmsPqcUnqualifiedItemVO();
vo.setId(detailIdMap.get(item.getInspectionPointItemId()));
vo.setInspectionContent(item.getInspectionContent());
vo.setInspectionMethods(item.getInspectionMethods());
vo.setInspectionLevel(item.getInspectionLevel());
@ -1473,8 +1488,9 @@ public class QmsPqcTaskRecordControllerService {
return vo;
}
private QmsPqcUnqualifiedItemVO buildUnqualifiedItem(QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item) {
private QmsPqcUnqualifiedItemVO buildUnqualifiedItem(QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item, Map<Long, Long> detailIdMap) {
QmsPqcUnqualifiedItemVO vo = new QmsPqcUnqualifiedItemVO();
vo.setId(detailIdMap.get(item.getInspectionPointItemId()));
vo.setInspectionContent(item.getInspectionContent());
vo.setInspectionMethods(item.getInspectionMethods());
vo.setInspectionLevel(item.getInspectionLevel());

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcUnqualifiedItemVO.java
View File

@ -10,6 +10,11 @@ import java.util.List;
@Data
public class QmsPqcUnqualifiedItemVO {
/**
* PQC任务明细ID
*/
private Long id;
/**
* 检查内容
*/