From af5b6c4915cdb2b681d16c99db6e782471aeb8fd Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Tue, 13 Jan 2026 14:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MDM/Controllers/Material/MaterialListController.cs     | 2 +-
 MDM/Models/Material/Dto/MaterialListDto.cs             | 2 +-
 MDM/Models/Material/Dto/MaterialTypeDto.cs             | 2 +-
 MDM/Models/Material/MaterialList.cs                    | 4 ++--
 MDM/Services/Material/IService/IMaterialListService.cs | 2 +-
 MDM/Services/Material/MaterialListService.cs           | 3 +--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/MDM/Controllers/Material/MaterialListController.cs b/MDM/Controllers/Material/MaterialListController.cs
index 7577aa7..4b55175 100644
--- a/MDM/Controllers/Material/MaterialListController.cs
+++ b/MDM/Controllers/Material/MaterialListController.cs
@@ -58,7 +58,7 @@ namespace MDM.Controllers.Material
         /// <returns></returns>
         [HttpGet("{Id}")]
         [ActionPermissionFilter(Permission = "business:materiallist:query")]
-        public IActionResult GetMaterialList(string Id)
+        public IActionResult GetMaterialList(int Id)
         {
             var response = _MaterialListService.GetInfo(Id);
             
diff --git a/MDM/Models/Material/Dto/MaterialListDto.cs b/MDM/Models/Material/Dto/MaterialListDto.cs
index 28d3129..8e54943 100644
--- a/MDM/Models/Material/Dto/MaterialListDto.cs
+++ b/MDM/Models/Material/Dto/MaterialListDto.cs
@@ -21,7 +21,7 @@ namespace MDM.Model.Material.Dto
     public class MaterialListDto
     {
         [Required(ErrorMessage = "雪花id不能为空")]
-        public string Id { get; set; }
+        public int Id { get; set; }
 
         public string FkMaterialTypeCode { get; set; }
 
diff --git a/MDM/Models/Material/Dto/MaterialTypeDto.cs b/MDM/Models/Material/Dto/MaterialTypeDto.cs
index 79924e4..05a6cd2 100644
--- a/MDM/Models/Material/Dto/MaterialTypeDto.cs
+++ b/MDM/Models/Material/Dto/MaterialTypeDto.cs
@@ -32,7 +32,7 @@ namespace MDM.Model.Material.Dto
 
         public int? Status { get; set; }
 
-        public string Remark { get; set; }
+        public string? Remark { get; set; }
 
         public string? CreatedBy { get; set; }
 
diff --git a/MDM/Models/Material/MaterialList.cs b/MDM/Models/Material/MaterialList.cs
index 30333a9..b1a7d10 100644
--- a/MDM/Models/Material/MaterialList.cs
+++ b/MDM/Models/Material/MaterialList.cs
@@ -10,8 +10,8 @@ namespace MDM.Model.Material
         /// <summary>
         /// 雪花id 
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
-        public string Id { get; set; }
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
 
         /// <summary>
         /// 物料类型code 
diff --git a/MDM/Services/Material/IService/IMaterialListService.cs b/MDM/Services/Material/IService/IMaterialListService.cs
index 09b1df4..33f4eb1 100644
--- a/MDM/Services/Material/IService/IMaterialListService.cs
+++ b/MDM/Services/Material/IService/IMaterialListService.cs
@@ -13,7 +13,7 @@ namespace MDM.Services.IMaterialService
     {
         PagedInfo<MaterialListDto> GetList(MaterialListQueryDto parm);
 
-        MaterialList GetInfo(string Id);
+        MaterialList GetInfo(int Id);
 
         MaterialList AddMaterialList(MaterialList parm);
 
diff --git a/MDM/Services/Material/MaterialListService.cs b/MDM/Services/Material/MaterialListService.cs
index 9b8a40f..889606a 100644
--- a/MDM/Services/Material/MaterialListService.cs
+++ b/MDM/Services/Material/MaterialListService.cs
@@ -47,7 +47,7 @@ namespace MDM.Services.Material
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public MaterialList GetInfo(string Id)
+        public MaterialList GetInfo(int Id)
         {
             var response = Queryable()
                 .Where(x => x.Id == Id)
@@ -117,7 +117,6 @@ namespace MDM.Services.Material
                         if (currentRow != null && currentRow.GetCell(0) != null) // 确保行不为空
                         {
                             MaterialList item = new MaterialList();
-                            item.Id = XueHua;
                             //物料类型code
                             if (currentRow.GetCell(0) != null && currentRow.GetCell(0).CellType == CellType.String)
                                 item.FkMaterialTypeCode = currentRow.GetCell(0).ToString();