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