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
///
[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
///
/// 雪花id
///
- [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
- public string Id { get; set; }
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
///
/// 物料类型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 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
///
///
///
- 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();