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

refactor(service): 优化服务依赖注入和代码结构 

- 将 QmsPdiTaskRecord 及 QmsPdiDetectionRules 相关服务替换为 pdiTaskRecordService 和 pdiDetectionRulesService
- 修改不合格结果查询逻辑，使用 pdiInspectionResultsService 服务
- 修正状态项查询，使用 pdiStatusItemService 并根据ID进行查询和映射
- 优化集合流操作，使用 collect(Collectors.toList()) 替换过时方法
- 重构文件详情映射逻辑，显式创建 FileDetailVO 对象设置属性
- QmsIssueTicketProcessMeasureControllerService 新增对 STATE 常量和 NflgException 异常的导入支持
This commit is contained in:
funny 2026-05-08 18:07:37 +08:00
parent b6fed0ec51
commit e8d466b071
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,9 +501,9 @@ public class QmsIssueTicketControllerService {
// 查询工单类型：PDI-新机检测 或 PDI-库存检测 // 查询工单类型：PDI-新机检测 或 PDI-库存检测
if (ticket.getSourceId() != null) { if (ticket.getSourceId() != null) {
QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId()); QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId());
if (taskRecord != null && taskRecord.getDetectionRulesId() != null) { if (taskRecord != null && taskRecord.getDetectionRulesId() != null) {
QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId()); QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId());
if (detectionRules != null && detectionRules.getInspectionType() != null) { if (detectionRules != null && detectionRules.getInspectionType() != null) {
String inspectionTypeStr = detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测"; String inspectionTypeStr = detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测";
vo.setTicketType("PDI-" + inspectionTypeStr); vo.setTicketType("PDI-" + inspectionTypeStr);
@ -748,9 +748,9 @@ public class QmsIssueTicketControllerService {
// 生成主题：机型编号+订单编号+出厂检测/库存检测+检测版本号 // 生成主题：机型编号+订单编号+出厂检测/库存检测+检测版本号
if (ticket.getSourceId() != null) { if (ticket.getSourceId() != null) {
QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId()); QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId());
if (taskRecord != null && taskRecord.getDetectionRulesId() != null) { if (taskRecord != null && taskRecord.getDetectionRulesId() != null) {
QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId()); QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId());
if (detectionRules != null) { if (detectionRules != null) {
String inspectionTypeStr = detectionRules.getInspectionType() != null && detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测"; String inspectionTypeStr = detectionRules.getInspectionType() != null && detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测";
vo.setTicketTitle(detectionRules.getMachineNo() + "-" + detectionRules.getOrderNo() + "-" + inspectionTypeStr + "-" + detectionRules.getInspectionVersion()); vo.setTicketTitle(detectionRules.getMachineNo() + "-" + detectionRules.getOrderNo() + "-" + inspectionTypeStr + "-" + detectionRules.getInspectionVersion());
@ -783,7 +783,7 @@ public class QmsIssueTicketControllerService {
.map(Long::valueOf) .map(Long::valueOf)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<QmsPdiInspectionResults> unqualifiedResults = inspectionResultsService.lambdaQuery() List<QmsPdiInspectionResults> unqualifiedResults = pdiInspectionResultsService.lambdaQuery()
.in(QmsPdiInspectionResults::getId, resultIds) .in(QmsPdiInspectionResults::getId, resultIds)
.eq(QmsPdiInspectionResults::getInspectionItemResults, false) .eq(QmsPdiInspectionResults::getInspectionItemResults, false)
.list(); .list();
@ -791,17 +791,17 @@ public class QmsIssueTicketControllerService {
// 查询检测规则状态项（部件描述、检查内容等） // 查询检测规则状态项（部件描述、检查内容等）
Map<Long, QmsPdiDetectionRulesStatusItem> statusItemMap = new HashMap<>(); Map<Long, QmsPdiDetectionRulesStatusItem> statusItemMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(unqualifiedResults)) { if (CollectionUtil.isNotEmpty(unqualifiedResults)) {
List<Long> inspectionItemIds = unqualifiedResults.stream() List<Long> statusItemIds = unqualifiedResults.stream()
.map(QmsPdiInspectionResults::getInspectionItemId) .map(QmsPdiInspectionResults::getInspectionItemId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.distinct() .distinct()
.toList(); .collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(inspectionItemIds)) { if (CollectionUtil.isNotEmpty(statusItemIds)) {
List<QmsPdiDetectionRulesStatusItem> statusItems = detectionRulesStatusItemService.lambdaQuery() List<QmsPdiDetectionRulesStatusItem> statusItems = pdiStatusItemService.lambdaQuery()
.in(QmsPdiDetectionRulesStatusItem::getInspectionItemId, inspectionItemIds) .in(QmsPdiDetectionRulesStatusItem::getId, statusItemIds)
.list(); .list();
statusItemMap = statusItems.stream() statusItemMap = statusItems.stream()
.collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getInspectionItemId, item -> item, (a, b) -> a)); .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getId, item -> item, (a, b) -> a));
} }
} }
@ -814,7 +814,7 @@ public class QmsIssueTicketControllerService {
.map(String::trim) .map(String::trim)
.map(Long::valueOf) .map(Long::valueOf)
.distinct() .distinct()
.toList(); .collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(allImageIds)) { if (CollectionUtil.isNotEmpty(allImageIds)) {
List<FileUploadRecord> fileRecords = fileUploadRecordService.lambdaQuery() List<FileUploadRecord> fileRecords = fileUploadRecordService.lambdaQuery()
.in(FileUploadRecord::getId, allImageIds) .in(FileUploadRecord::getId, allImageIds)
@ -863,10 +863,13 @@ public class QmsIssueTicketControllerService {
.map(Long::valueOf) .map(Long::valueOf)
.map(fileUploadRecordMap::get) .map(fileUploadRecordMap::get)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map(file -> new QmsPdiTaskRecordDetailVO.FileDetailVO() .map(file -> {
.setId(file.getId()) QmsPdiTaskRecordDetailVO.FileDetailVO fileVO = new QmsPdiTaskRecordDetailVO.FileDetailVO();
.setUrl(file.getUrl()) fileVO.setId(file.getId());
.setFileName(file.getFileName())) fileVO.setUrl(file.getUrl());
fileVO.setFileName(file.getFileName());
return fileVO;
})
.collect(Collectors.toList()); .collect(Collectors.toList());
itemVO.setInspectionItemImage(imageDetails); itemVO.setInspectionItemImage(imageDetails);
} }

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

@ -1,6 +1,8 @@
package com.nflg.qms.admin.service; package com.nflg.qms.admin.service;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessDraftQO; import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessDraftQO;
import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessLeaderDraftQO; import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessLeaderDraftQO;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;