From 9404ecc255d2e7b81b97f7d9cae0fe8c0d816d72 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Thu, 16 Apr 2026 13:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E9=A1=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/common/pojo/vo/QmsInspectionItemVO.java    |  5 +++++
 .../service/impl/QmsInspectionItemServiceImpl.java | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java
index 4e1a4aa0..041f0d17 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java
@@ -18,6 +18,11 @@ public class QmsInspectionItemVO {
      */
     private Long materialTypeId;
 
+    /**
+     * 物料类别名称
+     */
+    private String materialCategoryName;
+
     /**
      * 检测类型：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 b4086adf..07a50311 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
@@ -18,9 +18,11 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionItemVO;
 import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.repository.entity.QmsInspectionItem;
 import com.nflg.wms.repository.entity.QmsInspectionItemDetails;
+import com.nflg.wms.repository.entity.QmsQcMaterialCategory;
 import com.nflg.wms.repository.mapper.QmsInspectionItemMapper;
 import com.nflg.wms.repository.service.IQmsInspectionItemDetailsService;
 import com.nflg.wms.repository.service.IQmsInspectionItemService;
+import com.nflg.wms.repository.service.IQmsQcMaterialCategoryService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +45,9 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
     @Resource
     private IQmsInspectionItemDetailsService detailsService;
 
+    @Resource
+    private IQmsQcMaterialCategoryService materialCategoryService;
+
     // ==================== 新增（主表 + 一条明细） ====================
 
     @Transactional
@@ -306,6 +311,15 @@ 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());
+            if (Objects.nonNull(category)) {
+                vo.setMaterialCategoryName(category.getCategoryName());
+            }
+        }
+        
         vo.setDetectionType(item.getDetectionType());
         vo.setInspectionItemName(item.getInspectionItemName());
         vo.setInspectionNo(item.getInspectionNo());