diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs index 75b2fcf..5454370 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs @@ -133,7 +133,14 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM [ActionPermissionFilter(Permission = "mmmaterial:import")] public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile) { - return SUCCESS(_MmMaterialService.Importmaterial(material)); + //return SUCCESS(_MmMaterialService.Importmaterial(material)); + if (formFile == null) + { + return SUCCESS(null); + } + int response = _MmMaterialService.Importmaterial(formFile, HttpContext.GetName()); + + return SUCCESS(response); } /// diff --git a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs index b041cff..0bbb8ac 100644 --- a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs +++ b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs @@ -2,6 +2,7 @@ using DOAN.Model.BZFM; using DOAN.Model.BZFM.Dto; using DOAN.Model.System; using DOAN.Model.System.Dto; +using Microsoft.AspNetCore.Http; namespace DOAN.Service.BZFM.IBZFMService { @@ -27,7 +28,7 @@ namespace DOAN.Service.BZFM.IBZFMService /// /// /// - ImportResultDto Importmaterial(List material); + int Importmaterial(IFormFile formFile, string username); public PagedInfo SelectMaterialList(MmMaterialQueryDto material, PagerInfo pager); diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs index 48cd2fe..21dbe89 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 int Importmaterial(IFormFile formFile) { int result = 0; List materialList = new();