From db0e2bca6c4b7eb50c1b8ab65d5aae3a265fb652 Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Thu, 8 Jan 2026 14:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
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, 4 insertions(+), 2 deletions(-)

diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index f07139d..450b3b9 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 ImportResultDto Importmaterial(IFormFile formFile)
+        public ImportResultDto Importmaterial(IFormFile formFile, string username)
         {
 
             // TODO 1.构建空的待导入数据集合MmMaterialExcelDto，多余部分删除
@@ -281,6 +281,8 @@ namespace DOAN.Service.BZFM
                             {
                                 continue;
                             }
+
+                            materialList.Add(material);
                         }
                     }
 
@@ -288,7 +290,7 @@ namespace DOAN.Service.BZFM
                 }
                 catch (Exception ex)
                 {
-                    return -1;
+                    return null;
                 }