From bfb96778f6afe8c6cd9989c3aaef31f81c9a6364 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 20 Apr 2026 11:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9COA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java    | 5 +++++
 .../repository/service/impl/QmsCoaTaskServiceImpl.java   | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java
index 1cca263d..1f14d1f6 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsCoaTaskMaterialVO.java
@@ -37,4 +37,9 @@ public class QmsCoaTaskMaterialVO {
      * 物料类别全路径名称
      */
     private String materialCategoryCodePathName;
+
+    /**
+     * 报告模板
+     */
+    private String reportTemplate;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
index 172529e3..a041b4fe 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
@@ -406,6 +406,10 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl<QmsCoaTaskMapper, QmsCoaT
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
 
+        // 建立 materialId → task 映射（取每个物料对应的第一条任务记录）
+        Map<Long, QmsCoaTask> materialTaskMap = tasks.stream()
+                .collect(Collectors.toMap(QmsCoaTask::getMaterialId, t -> t, (t1, t2) -> t1));
+
         // 构建物料查询条件
         var query = qcMaterialService.lambdaQuery()
                 .in(QmsQcMaterial::getId, materialIds)
@@ -424,6 +428,11 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl<QmsCoaTaskMapper, QmsCoaT
             vo.setMaterialDesc(m.getMaterialDesc());
             vo.setMaterialCategoryCode(m.getMaterialCategoryCode());
             vo.setMaterialCategoryCodePathName(m.getMaterialCategoryCodePathName());
+            // 填充报告模板
+            QmsCoaTask task = materialTaskMap.get(m.getId());
+            if (Objects.nonNull(task)) {
+                vo.setReportTemplate(task.getReportTemplate());
+            }
             return vo;
         }).collect(Collectors.toList());