diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiInspectionResultsController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiInspectionResultsController.java index ce4bb0de..9176b957 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiInspectionResultsController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPdiInspectionResultsController.java @@ -81,7 +81,7 @@ public class QmsPdiInspectionResultsController extends BaseController { * 根据任务ID + 检测项类型返回对应检测结果及图片URL */ @PostMapping("detail") - public ApiResult> detail( + public ApiResult detail( @Valid @RequestBody QmsPdiTaskRecordStatusItemDetailQO request) { return ApiResult.success(inspectionResultsControllerService.detail(request)); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java index de2c04b4..9d0f3e3b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java @@ -276,10 +276,20 @@ public class QmsPdiInspectionResultsControllerService { /** * 查询检测项详情(平板使用,不分页) - * 根据任务ID + 检测项类型返回对应结果及图片URL + * 根据任务ID + 检测项类型返回对应结果及图片URL,同时返回任务状态 */ - public List detail(QmsPdiTaskRecordStatusItemDetailQO request) { - return taskRecordControllerService.statusItemList(request.getId(), request.getInspectionItemType()); + public QmsPdiTaskRecordDetailVO.DetailWithStatusVO detail(QmsPdiTaskRecordStatusItemDetailQO request) { + QmsPdiTaskRecordDetailVO.DetailWithStatusVO result = new QmsPdiTaskRecordDetailVO.DetailWithStatusVO(); + + // 查询任务状态 + QmsPdiTaskRecord taskRecord = taskRecordService.getById(request.getId()); + if (taskRecord != null) { + result.setInspectionEnable(taskRecord.getInspectionEnable()); + } + + // 查询检测项列表 + result.setItems(taskRecordControllerService.statusItemList(request.getId(), request.getInspectionItemType())); + return result; } // ========================= 任务概要 ========================= diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiInspectionResultsPageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiInspectionResultsPageVO.java index 03200220..68604063 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiInspectionResultsPageVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiInspectionResultsPageVO.java @@ -49,4 +49,9 @@ public class QmsPdiInspectionResultsPageVO { * 要求完成时间 */ private LocalDateTime requiredCompletionTime; + + /** + * 质检状态:0=待检查,1=检验中,2=已完成 + */ + private Integer inspectionEnable; } 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 0f93a154..a482e1d5 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 @@ -132,4 +132,21 @@ public class QmsPdiTaskRecordDetailVO { */ private List inspectionItemImage; } + + /** + * 检测项详情(含任务状态) + */ + @Data + public static class DetailWithStatusVO { + + /** + * 质检状态:0=待检查,1=检验中,2=已完成 + */ + private Integer inspectionEnable; + + /** + * 检测项列表 + */ + private List items; + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml index c9dbf6af..6871cb69 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml @@ -46,7 +46,8 @@ t.task_no AS taskNo, r.inspection_version AS inspectionVersion, t.submission_time AS submissionTime, - t.required_completion_time AS requiredCompletionTime + t.required_completion_time AS requiredCompletionTime, + t.inspection_enable AS inspectionEnable FROM qms_pdi_task_record t LEFT JOIN qms_pdi_detection_rules r ON r.id = t.detection_rules_id