diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs
index e039791..4f7e841 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<MmMaterialExcelDto> material = new();
+            List<MmMaterialExcelDto2> material = new();
             using (var stream = formFile.OpenReadStream())
             {
-                material = stream.Query<MmMaterialExcelDto>(startCell: "A2").ToList();
+                material = stream.Query<MmMaterialExcelDto2>(startCell: "A2").ToList();
             }
 
             return SUCCESS(_MmMaterialService.Importmaterial(material));
diff --git a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
index b041cff..fdaab7a 100644
--- a/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
+++ b/DOAN.Service/MES/Material/IService/IMmMaterialService.cs
@@ -29,7 +29,7 @@ namespace DOAN.Service.BZFM.IBZFMService
         /// <returns></returns>
         ImportResultDto Importmaterial(List<MmMaterialExcelDto> material);
 
-        public PagedInfo<MmMaterialExcelDto> SelectMaterialList(MmMaterialQueryDto material, PagerInfo pager);
+        public PagedInfo<MmMaterialExcelDto2> SelectMaterialList(MmMaterialQueryDto material, PagerInfo pager);
 
     }
 }
diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index 76c7795..279829a 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<MmMaterialExcelDto> material)
+        public ImportResultDto Importmaterial(List<MmMaterialExcelDto2> 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.MaterialCode }) //如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
+                .WhereColumns(it => new { it.Id, it.物料编码 }) //如果不是主键可以这样实现（多字段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;
         }