From e8a38ae171405f90b3ec924aacc04ebe7529689a Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Wed, 13 May 2026 08:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Epdi=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsPdiTaskRecordController.java | 9 ++++ .../QmsPdiTaskRecordControllerService.java | 43 +++++++++++++++ .../pojo/vo/QmsPdiTaskRecordDetailVO.java | 52 +++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java index 209c0def..b7d6b348 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiTaskRecordController.java @@ -81,4 +81,13 @@ public class QmsPdiTaskRecordController extends BaseController { @NotNull(message = "检测记录ID不能为空") @RequestParam Long id) { return ApiResult.success(taskRecordControllerService.getInspectionImages(id)); } + + /** + * 查询任务详情 + */ + @GetMapping("detail") + public ApiResult detail( + @NotNull(message = "任务记录ID不能为空") @RequestParam Long id) { + return ApiResult.success(taskRecordControllerService.detail(id)); + } } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index aed04ec3..a20f9e69 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -19,12 +19,14 @@ import com.nflg.wms.repository.entity.QmsPdiDetectionRulesStatusItem; import com.nflg.wms.repository.entity.QmsPdiInspectionResults; import com.nflg.wms.repository.entity.QmsPdiTaskRecord; import com.nflg.wms.repository.entity.FileUploadRecord; +import com.nflg.wms.repository.entity.User; import com.nflg.wms.repository.service.IQmsPdiDetectionRulesDeliveryItemService; import com.nflg.wms.repository.service.IQmsPdiDetectionRulesService; import com.nflg.wms.repository.service.IQmsPdiDetectionRulesStatusItemService; import com.nflg.wms.repository.service.IQmsPdiInspectionResultsService; import com.nflg.wms.repository.service.IQmsPdiTaskRecordService; import com.nflg.wms.repository.service.IFileUploadRecordService; +import com.nflg.wms.repository.service.IUserService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -60,6 +62,9 @@ public class QmsPdiTaskRecordControllerService { @Resource private IFileUploadRecordService fileUploadRecordService; + @Resource + private IUserService userService; + // ========================= 转办 ========================= /** @@ -377,4 +382,42 @@ public class QmsPdiTaskRecordControllerService { } return convertImageIdsToVO(result.getInspectionItemImage()); } + + // ========================= 任务详情 ========================= + + /** + * 查询任务详情（订单编号、机型编号、机台编号、检查版本、所属工厂、检测类型、检测结果、质检员、检测完成时间） + */ + public QmsPdiTaskRecordDetailVO.TaskInfoVO detail(Long id) { + QmsPdiTaskRecord record = taskRecordService.getById(id); + if (Objects.isNull(record)) { + throw new NflgException(STATE.BusinessError, "检测任务记录不存在"); + } + + QmsPdiTaskRecordDetailVO.TaskInfoVO vo = new QmsPdiTaskRecordDetailVO.TaskInfoVO(); + vo.setOrderNo(record.getOrderNo()); + vo.setDeviceNo(record.getDeviceNo()); + vo.setFactoryNo(record.getFactoryNo()); + vo.setInspectionInspection(record.getInspectionInspection()); + vo.setDetectionCompletionTime(record.getDetectionCompletionTime()); + + // 关联检测规则，获取机型编号、检查版本、检测类型、质检员 + if (record.getDetectionRulesId() != null) { + QmsPdiDetectionRules rules = detectionRulesService.getById(record.getDetectionRulesId()); + if (rules != null) { + vo.setMachineNo(rules.getMachineNo()); + vo.setInspectionVersion(rules.getInspectionVersion()); + vo.setInspectionType(rules.getInspectionType()); + // 质检员名称 + if (rules.getInspectorId() != null) { + User inspector = userService.getById(rules.getInspectorId()); + if (inspector != null) { + vo.setInspectorName(inspector.getUserName()); + } + } + } + } + + return vo; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java index 317198e1..8e14175a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java @@ -111,6 +111,58 @@ public class QmsPdiTaskRecordDetailVO { private List inspectionItemImage; } + /** + * 任务详情信息VO + */ + @Data + public static class TaskInfoVO { + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 机型编号 + */ + private String machineNo; + + /** + * 机台编号 + */ + private String deviceNo; + + /** + * 检查版本 + */ + private String inspectionVersion; + + /** + * 所属工厂 + */ + private String factoryNo; + + /** + * 检测类型 + */ + private Integer inspectionType; + + /** + * 检测结果：true=合格，false=不合格 + */ + private Boolean inspectionInspection; + + /** + * 质检员名称 + */ + private String inspectorName; + + /** + * 检测完成时间 + */ + private LocalDateTime detectionCompletionTime; + } + /** * 发货前检测项明细VO（图片直接返回URL列表） */