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 /// /// /// - 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; }