From 2e3b0ea8ee53574d63f5f7e042aae0deb693f347 Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Wed, 7 Jan 2026 15:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Material/productionMaterial/MmMaterialController.cs    | 4 ++--
 DOAN.Service/MES/Material/IService/IMmMaterialService.cs   | 2 +-
 DOAN.Service/MES/Material/MmMaterialService.cs             | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs
index 0cfd456..431c089 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<MmMaterial> material = new();
+            List<MmMaterialExcelDto> material = new();
             using (var stream = formFile.OpenReadStream())
             {
-                material = stream.Query<MmMaterial>(startCell: "A2").ToList();
+                material = stream.Query<MmMaterialExcelDto>(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 d39104c..2429d14 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<MmMaterial> material);
+        ImportResultDto Importmaterial(List<MmMaterialExcelDto> material);
 
         public PagedInfo<MmMaterial> SelectMaterialList(MmMaterialQueryDto material, PagerInfo pager);
 
diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index 5fb9891..108d1ca 100644
--- a/DOAN.Service/MES/Material/MmMaterialService.cs
+++ b/DOAN.Service/MES/Material/MmMaterialService.cs
@@ -119,7 +119,7 @@ namespace DOAN.Service.BZFM
         /// </summary>
         /// <param name="material"></param>
         /// <returns></returns>
-        public ImportResultDto Importmaterial(List<MmMaterial> material)
+        public ImportResultDto Importmaterial(List<MmMaterialExcelDto> material)
         {
             // normalize and set defaults, do not overwrite provided values
             material.ForEach(x =>
@@ -140,13 +140,10 @@ namespace DOAN.Service.BZFM
                 {
                     x.MaterialName = x.MaterialName.Trim();
                 }
-                x.Remark = x.Remark.IsEmpty() ? "数据导入" : x.Remark;
+                x.Description = x.Description.IsEmpty() ? "数据导入" : x.Description;
             });
             var x = Context.Storageable(material)
                 .SplitInsert(it => !it.Any())
-                .SplitIgnore(it => it.Item.MaterialCode == GlobalConstant.AdminRole)
-                .SplitError(x => x.Item.MaterialCode.IsEmpty(), "物料编码不能为空")
-                .SplitError(x => !Tools.CheckUserName(x.Item.MaterialCode), "物料编码不符合规范")
                 .WhereColumns(it => new { it.Id, it.MaterialCode })//如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
                 .ToStorage();
             var result = x.AsInsertable.ExecuteCommand();//插入可插入部分;