From fc325af3b178771168bfb192d89cf08b5dabe84c Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Fri, 17 Apr 2026 11:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80=E9=A1=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QmsInspectionItemController.java          |  4 ++--
 .../service/IQmsInspectionItemService.java    |  4 ++--
 .../impl/QmsInspectionItemServiceImpl.java    | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java
index 5b54f80d..36da7a35 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java
@@ -96,12 +96,12 @@ public class QmsInspectionItemController extends BaseController {
     }
 
     /**
-     * 按检测项ID查明细列表（不分页）
+     * 按检测项ID查询详情（包含主表信息和明细列表）
      *
      * @param id 检测项ID
      */
     @GetMapping("details")
-    public ApiResult<List<QmsInspectionItemDetailsVO>> details(@NotNull(message = "ID不能为空") Long id) {
+    public ApiResult<QmsInspectionItemVO> details(@NotNull(message = "ID不能为空") Long id) {
         return ApiResult.success(inspectionItemService.getDetails(id));
     }
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java
index 77e9fb85..7a435727 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java
@@ -39,9 +39,9 @@ public interface IQmsInspectionItemService extends IService<QmsInspectionItem> {
     PageData<QmsInspectionItemVO> search(QmsInspectionItemSearchQO qo);
 
     /**
-     * 按检测项ID查询明细列表
+     * 按检测项ID查询详情（包含主表信息和明细列表）
      */
-    List<QmsInspectionItemDetailsVO> getDetails(Long id);
+    QmsInspectionItemVO getDetails(Long id);
 
     /**
      * 查询导出数据
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java
index fba7e810..cf02ccec 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java
@@ -185,13 +185,28 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
     // ==================== 明细查询 ====================
 
     @Override
-    public List<QmsInspectionItemDetailsVO> getDetails(Long id) {
-        return detailsService.lambdaQuery()
+    public QmsInspectionItemVO getDetails(Long id) {
+        // 查询主表信息
+        QmsInspectionItem item = getById(id);
+        if (Objects.isNull(item)) {
+            throw new NflgException(STATE.BusinessError, "检测项不存在");
+        }
+
+        // 转换为主表VO
+        QmsInspectionItemVO vo = toVO(item);
+
+        // 查询明细列表
+        List<QmsInspectionItemDetailsVO> detailsList = detailsService.lambdaQuery()
                 .eq(QmsInspectionItemDetails::getInspectionItemId, id)
                 .list()
                 .stream()
                 .map(this::toDetailsVO)
                 .collect(Collectors.toList());
+
+        // 设置明细列表
+        vo.setDetails(detailsList);
+
+        return vo;
     }
 
     // ==================== 导出 ====================