From a5b9584af07386c6cbed9ffac3dc2fa305baa284 Mon Sep 17 00:00:00 2001
From: shusir <497819738@qq.com>
Date: Tue, 17 Mar 2026 18:06:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/material/controller/vo/MaterialBatchRespVO.java  | 4 ++++
 .../material/controller/vo/MaterialLifecycleDetailRespVO.java | 4 ++++
 .../qms/resource/material/dal/mapper/MaterialBatchMapper.java | 1 +
 .../material/dal/mapper/MaterialLifecycleDetailMapper.java    | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java
index c83830c9..3ed84b28 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java
@@ -50,6 +50,10 @@ public class MaterialBatchRespVO {
     @ExcelProperty("物料大类型号")
     private String productModelNo;
 
+    @Schema(description = "单位")
+    @ExcelProperty("单位")
+    private String unit;
+
     @Schema(description = "额定容量")
     @ExcelProperty("额定容量")
     private BigDecimal standardCapacity;
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java
index 94b01f16..01f036ab 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java
@@ -46,6 +46,10 @@ public class MaterialLifecycleDetailRespVO {
     @ExcelProperty("保质期")
     private Integer due;
 
+    @Schema(description = "物料规格")
+    @ExcelProperty("物料规格")
+    private String productSpecification;
+
     @Schema(description = "物料大类型号")
     @ExcelProperty("物料大类型号")
     private String productModelNo;
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java
index 3823e9df..26139c5e 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java
@@ -59,6 +59,7 @@ public interface MaterialBatchMapper extends BaseMapperX<MaterialBatchDO> {
                 .selectAs(MaterialProductDO::getStandardCapacity, MaterialBatchRespVO::getStandardCapacity)
                 .selectAs(MaterialProductDO::getSpecification, MaterialBatchRespVO::getProductSpecification)
                 .selectAs(MaterialProductDO::getModelNo, MaterialBatchRespVO::getProductModelNo)
+                .selectAs(MaterialProductDO::getUnit, MaterialBatchRespVO::getUnit)
                 // 标签模板，用于入库
                 .selectAs(MaterialProductDO::getLabelTemplateKey, MaterialBatchRespVO::getLabelTemplateKey)
                 // 生产日期和到期日期，用于验收和入库
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java
index 1aec4f55..b4aa7f56 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java
@@ -45,10 +45,12 @@ public interface MaterialLifecycleDetailMapper extends BaseMapperX<MaterialLifec
                 .selectAll(MaterialLifecycleDetailDO.class)
                 .selectAs("product.NAME", MaterialLifecycleDetailRespVO::getProductName)
                 .selectAs("product.CD", MaterialLifecycleDetailRespVO::getProductCode)
+                .selectAs("product.SPEC", MaterialLifecycleDetailRespVO::getProductSpecification)
                 .selectAs("product.MDL_NO", MaterialLifecycleDetailRespVO::getProductModelNo)
                 .selectAs("product.UNT", MaterialLifecycleDetailRespVO::getUnit)
                 .selectAs("batch.BAT_NO", MaterialLifecycleDetailRespVO::getBatchNo)
                 .selectAs("gongduan.INB_QTY", MaterialLifecycleDetailRespVO::getInfluenceCount)
+                .selectAs("gongduan.ASN_DEPT_NAME", MaterialLifecycleDetailRespVO::getAssignDepartmentName)
                 .leftJoin(MaterialProductDO.class, "product", MaterialProductDO::getId, MaterialLifecycleDetailDO::getProductId)
                 .leftJoin(MaterialBatchDO.class, "batch", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchId)
                 .leftJoin(MaterialBatchDO.class, "gongduan", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchGongduanId)