From b400f0a1a7fbdcb47f397897510fc8ff35352998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 10 Jun 2026 14:52:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(export):=20=E4=BF=AE=E5=A4=8D=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E9=A1=B9=E7=9B=AE=E5=AF=BC=E5=87=BA=E6=97=B6=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将导出DTO中的materialTypeId字段改为materialTypeCode字符串类型
- 更新Excel列标题从"物料类别ID*"为"物料类别*"
- 在导出服务中通过关联查询获取物料类别编码并设置到导出对象
- 修复详情流处理中的物料类别赋值逻辑
- 清理VO转换中的多余空行代码格式化
---
 .../pojo/dto/QmsInspectionItemExportDTO.java     |  6 +++---
 .../impl/QmsInspectionItemServiceImpl.java       | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java
index 6bc52ed8..4cfb3b70 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java
@@ -11,10 +11,10 @@ import org.ttzero.excel.annotation.MediaColumn;
 public class QmsInspectionItemExportDTO {
 
     /**
-     * 物料类别ID
+     * 物料类别
      */
-    @ExcelColumn("物料类别ID*")
-    private Long materialTypeId;
+    @ExcelColumn("物料类别*")
+    private String materialTypeCode;
 
     /**
      * 检测类型：0=定向，1=定量
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 3b873ec7..12d5d2b8 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
@@ -247,12 +247,20 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
         }
         List<QmsInspectionItem> items = query.orderByAsc(QmsInspectionItem::getCreateTime).list();
 
+        List<QmsQcMaterialCategory> categories= materialCategoryService.lambdaQuery()
+                .in(QmsQcMaterialCategory::getId, items.stream().map(QmsInspectionItem::getMaterialTypeId).collect(Collectors.toList()))
+                .list();
+
         // 按主表记录展开到明细行（一行一条明细，无明细也输出主表行）
         return items.stream().flatMap(item -> {
             List<QmsInspectionItemDetails> details = detailsService.listByItemId(item.getId());
+            QmsQcMaterialCategory category=categories.stream()
+                    .filter(c -> c.getId().equals(item.getMaterialTypeId()))
+                    .findFirst()
+                    .get();
             if (details.isEmpty()) {
                 QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO();
-                dto.setMaterialTypeId(item.getMaterialTypeId());
+                dto.setMaterialTypeCode(category.getCategoryCode());
                 dto.setDetectionType(item.getDetectionType());
                 dto.setInspectionItemName(item.getInspectionItemName());
                 dto.setInspectionNo(item.getInspectionNo());
@@ -260,7 +268,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
             }
             return details.stream().map(d -> {
                 QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO();
-                dto.setMaterialTypeId(item.getMaterialTypeId());
+                dto.setMaterialTypeCode(category.getCategoryCode());
                 dto.setDetectionType(item.getDetectionType());
                 dto.setInspectionItemName(item.getInspectionItemName());
                 dto.setInspectionNo(item.getInspectionNo());
@@ -359,7 +367,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
         QmsInspectionItemVO vo = new QmsInspectionItemVO();
         vo.setId(item.getId());
         vo.setMaterialTypeId(item.getMaterialTypeId());
-        
+
         // 查询物料类别名称
         if (Objects.nonNull(item.getMaterialTypeId())) {
             QmsQcMaterialCategory category = materialCategoryService.getById(item.getMaterialTypeId());
@@ -367,7 +375,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
                 vo.setMaterialCategoryName(category.getCategoryName());
             }
         }
-        
+
         vo.setDetectionType(item.getDetectionType());
         vo.setInspectionItemName(item.getInspectionItemName());
         vo.setInspectionNo(item.getInspectionNo());