Merge branch 'qms/yf' into qms/develop

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<List<QmsPdiTaskRecordDetailVO.StatusItemVO>> detail(
+    public ApiResult<QmsPdiTaskRecordDetailVO.DetailWithStatusVO> detail(
             @Valid @RequestBody QmsPdiTaskRecordStatusItemDetailQO request) {
         return ApiResult.success(inspectionResultsControllerService.detail(request));
     }

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<QmsPdiTaskRecordDetailVO.StatusItemVO> detail(QmsPdiTaskRecordStatusItemDetailQO request) {
+    public QmsPdiTaskRecordDetailVO.DetailWithStatusVO detail(QmsPdiTaskRecordStatusItemDetailQO request) {
-        return taskRecordControllerService.statusItemList(request.getId(), request.getInspectionItemType());
+        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;
     }
 
     // ========================= 任务概要 =========================

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;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java

@@ -132,4 +132,21 @@ public class QmsPdiTaskRecordDetailVO {
          */
         private List<String> inspectionItemImage;
     }
+
+    /**
+     * 检测项详情（含任务状态）
+     */
+    @Data
+    public static class DetailWithStatusVO {
+
+        /**
+         * 质检状态：0=待检查，1=检验中，2=已完成
+         */
+        private Integer inspectionEnable;
+
+        /**
+         * 检测项列表
+         */
+        private List<StatusItemVO> items;
+    }
 }

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
         <where>