diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs
index 4f7e841..e039791 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs
@@ -127,10 +127,10 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
         [ActionPermissionFilter(Permission = "mmmaterial:import")]
         public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
         {
-            List<MmMaterialExcelDto2> material = new();
+            List<MmMaterialExcelDto> material = new();
             using (var stream = formFile.OpenReadStream())
             {
-                material = stream.Query<MmMaterialExcelDto2>(startCell: "A2").ToList();
+                material = stream.Query<MmMaterialExcelDto>(startCell: "A2").ToList();
             }
 
             return SUCCESS(_MmMaterialService.Importmaterial(material));
diff --git a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
index 772e9b7..9776d76 100644
--- a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
@@ -126,55 +126,4 @@ namespace DOAN.Model.BZFM.Dto
         [ExcelColumn(Name = "描述")]
         public string Description { get; set; }
     }
-
-    // <summary>
-    /// 物料清单导入导出
-    /// </summary>
-    public class MmMaterialExcelDto2
-    {
-        [ExcelColumn(Name = "id")]
-        public int Id { get; set; }
-
-        [ExcelColumn(Name = "物料标号")]
-        public string 物料标号 { get; set; }
-
-        [ExcelColumn(Name = "物料编码")]
-        public string 物料编码 { get; set; }
-
-        [ExcelColumn(Name = "物料名称")]
-        public string 物料名称 { get; set; }
-
-        [ExcelColumn(Name = "规格")]
-        public string 规格 { get; set; }
-
-        [ExcelColumn(Name = "物料分类编码")]
-        public string 物料分类编码 { get; set; }
-
-        [ExcelColumn(Name = "物料分类名称")]
-        public string 物料分类名称 { get; set; }
-
-        [ExcelColumn(Name = "计量单位")]
-        public string 计量单位 { get; set; }
-
-        [ExcelColumn(Name = "供应商编码")]
-        public string 供应商编码 { get; set; }
-
-        [ExcelColumn(Name = "供应商名称")]
-        public string 供应商名称 { get; set; }
-
-        [ExcelColumn(Name = "安全库存")]
-        public decimal 安全库存 { get; set; }
-
-        [ExcelColumn(Name = "状态")]
-        public string 状态 { get; set; }
-
-        [ExcelColumn(Name = "创建时间")]
-        public DateTime? 创建时间 { get; set; }
-
-        [ExcelColumn(Name = "更新时间")]
-        public DateTime? 更新时间 { get; set; }
-
-        [ExcelColumn(Name = "描述")]
-        public string 描述 { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
index d12990a..b041cff 100644
--- a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
+++ b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
@@ -27,7 +27,7 @@ namespace DOAN.Service.BZFM.IBZFMService
         /// </summary>
         /// <param name="material"></param>
         /// <returns></returns>
-        ImportResultDto Importmaterial(List<MmMaterialExcelDto2> material);
+        ImportResultDto Importmaterial(List<MmMaterialExcelDto> material);
 
         public PagedInfo<MmMaterialExcelDto> SelectMaterialList(MmMaterialQueryDto material, PagerInfo pager);
 
diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index 279829a..76c7795 100644
--- a/DOAN.Service/MES/Material/MmMaterialService.cs
+++ b/DOAN.Service/MES/Material/MmMaterialService.cs
@@ -138,33 +138,33 @@ namespace DOAN.Service.BZFM
         /// </summary>
         /// <param name="material"></param>
         /// <returns></returns>
-        public ImportResultDto Importmaterial(List<MmMaterialExcelDto2> material)
+        public ImportResultDto Importmaterial(List<MmMaterialExcelDto> material)
         {
             // normalize and set defaults, do not overwrite provided values
-            //material.ForEach(x =>
-            //{
-            //    if (x.CreatedTime == null)
-            //    {
-            //        x.CreatedTime = DateTime.Now;
-            //    }
-            //    if (string.IsNullOrWhiteSpace(x.Status))
-            //    {
-            //        x.Status = "启用";
-            //    }
-            //    if (!string.IsNullOrWhiteSpace(x.MaterialCode))
-            //    {
-            //        x.MaterialCode = x.MaterialCode.Trim();
-            //    }
-            //    if (!string.IsNullOrWhiteSpace(x.MaterialName))
-            //    {
-            //        x.MaterialName = x.MaterialName.Trim();
-            //    }
-            //    x.Description = x.Description.IsEmpty() ? "数据导入" : x.Description;
-            //});
+            material.ForEach(x =>
+            {
+                if (x.CreatedTime == null)
+                {
+                    x.CreatedTime = DateTime.Now;
+                }
+                if (string.IsNullOrWhiteSpace(x.Status))
+                {
+                    x.Status = "启用";
+                }
+                if (!string.IsNullOrWhiteSpace(x.MaterialCode))
+                {
+                    x.MaterialCode = x.MaterialCode.Trim();
+                }
+                if (!string.IsNullOrWhiteSpace(x.MaterialName))
+                {
+                    x.MaterialName = x.MaterialName.Trim();
+                }
+                x.Description = x.Description.IsEmpty() ? "数据导入" : x.Description;
+            });
             var x = Context
                 .Storageable(material)
                 .SplitInsert(it => !it.Any())
-                .WhereColumns(it => new { it.Id, it.物料编码 }) //如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
+                .WhereColumns(it => new { it.Id, it.MaterialCode }) //如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
                 .ToStorage();
             var result = x.AsInsertable.ExecuteCommand(); //插入可插入部分;
 
@@ -182,26 +182,26 @@ namespace DOAN.Service.BZFM
             Console.WriteLine(importResult);
 
             // 收集错误与忽略信息
-            //foreach (var item in x.ErrorList)
-            //{
-            //    importResult.Errors.Add(
-            //        new ImportErrorDto
-            //        {
-            //            MaterialCode = item.Item.MaterialCode,
-            //            Message = item.StorageMessage,
-            //        }
-            //    );
-            //}
-            //foreach (var item in x.IgnoreList)
-            //{
-            //    importResult.Ignored.Add(
-            //        new ImportErrorDto
-            //        {
-            //            MaterialCode = item.Item.MaterialCode,
-            //            Message = item.StorageMessage,
-            //        }
-            //    );
-            //}
+            foreach (var item in x.ErrorList)
+            {
+                importResult.Errors.Add(
+                    new ImportErrorDto
+                    {
+                        MaterialCode = item.Item.MaterialCode,
+                        Message = item.StorageMessage,
+                    }
+                );
+            }
+            foreach (var item in x.IgnoreList)
+            {
+                importResult.Ignored.Add(
+                    new ImportErrorDto
+                    {
+                        MaterialCode = item.Item.MaterialCode,
+                        Message = item.StorageMessage,
+                    }
+                );
+            }
 
             return importResult;
         }