导入功能

2026-01-08 14:23:13 +08:00
parent 9123d1ed57
commit db0e2bca6c
1 changed files with 4 additions and 2 deletions
--- 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;
                }