From 9123d1ed571d381f7c25e0b3f8a5a8e68b3145a1 Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Thu, 8 Jan 2026 14:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Service/MES/Material/MmMaterialService.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index 1e62b12..f07139d 100644
--- a/DOAN.Service/MES/Material/MmMaterialService.cs
+++ b/DOAN.Service/MES/Material/MmMaterialService.cs
@@ -143,7 +143,7 @@ namespace DOAN.Service.BZFM
         /// </summary>
         /// <param name="formFile"></param>
         /// <returns></returns>
-        public int Importmaterial(IFormFile formFile)
+        public ImportResultDto Importmaterial(IFormFile formFile)
         {
 
             // TODO 1.构建空的待导入数据集合MmMaterialExcelDto，多余部分删除
@@ -168,7 +168,7 @@ namespace DOAN.Service.BZFM
                         IRow currentRow = sheet.GetRow(row);
                         if (currentRow != null) // 确保行不为空
                         {
-                            MmMaterial material = new MmMaterial();
+                            MmMaterialExcelDto material = new MmMaterialExcelDto();
 
                             //00 ID
                             NPOI.SS.UserModel.ICell currentCell_00 = currentRow.GetCell(0);
@@ -272,8 +272,6 @@ namespace DOAN.Service.BZFM
                                 continue;
                             }
 
-                            //
-
                             //10 状态
                             NPOI.SS.UserModel.ICell currentCell_10 = currentRow.GetCell(10);