From 3d09f0ea116b8f91b83029b33df40579a83fd264 Mon Sep 17 00:00:00 2001 From: quowingwang Date: Tue, 13 Jan 2026 18:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99Bom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDM/Controllers/Material/MaterialBomController.cs | 2 +- MDM/Models/Material/Dto/MaterialBomDto.cs | 2 +- MDM/Models/Material/MaterialBom.cs | 2 +- MDM/Services/Material/IService/IMaterialBomService.cs | 2 +- MDM/Services/Material/MaterialBomService.cs | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/MDM/Controllers/Material/MaterialBomController.cs b/MDM/Controllers/Material/MaterialBomController.cs index 2854954..d6aaf57 100644 --- a/MDM/Controllers/Material/MaterialBomController.cs +++ b/MDM/Controllers/Material/MaterialBomController.cs @@ -60,7 +60,7 @@ namespace MDM.Controllers.Material /// [HttpGet("{Id}")] [ActionPermissionFilter(Permission = "business:materialbom:query")] - public IActionResult GetMaterialBom(string Id) + public IActionResult GetMaterialBom(int Id) { var response = _MaterialBomService.GetInfo(Id); diff --git a/MDM/Models/Material/Dto/MaterialBomDto.cs b/MDM/Models/Material/Dto/MaterialBomDto.cs index 039cf3a..0ca55aa 100644 --- a/MDM/Models/Material/Dto/MaterialBomDto.cs +++ b/MDM/Models/Material/Dto/MaterialBomDto.cs @@ -18,7 +18,7 @@ namespace MDM.Model.Material.Dto public class MaterialBomDto { [Required(ErrorMessage = "雪花id不能为空")] - public string Id { get; set; } + public int Id { get; set; } public string InvCode { get; set; } diff --git a/MDM/Models/Material/MaterialBom.cs b/MDM/Models/Material/MaterialBom.cs index c665330..c4d2696 100644 --- a/MDM/Models/Material/MaterialBom.cs +++ b/MDM/Models/Material/MaterialBom.cs @@ -13,7 +13,7 @@ namespace MDM.Model.Material /// 雪花id /// [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] - public string Id { get; set; } + public int Id { get; set; } /// /// 母件编码 diff --git a/MDM/Services/Material/IService/IMaterialBomService.cs b/MDM/Services/Material/IService/IMaterialBomService.cs index 4b6f095..205c780 100644 --- a/MDM/Services/Material/IService/IMaterialBomService.cs +++ b/MDM/Services/Material/IService/IMaterialBomService.cs @@ -18,7 +18,7 @@ namespace MDM.Services.IMaterialService List GetSonInvList(MaterialBomQueryDto parm); - MaterialBom GetInfo(string Id); + MaterialBom GetInfo(int Id); MaterialBom AddMaterialBom(MaterialBom parm); diff --git a/MDM/Services/Material/MaterialBomService.cs b/MDM/Services/Material/MaterialBomService.cs index ce495ee..4b187eb 100644 --- a/MDM/Services/Material/MaterialBomService.cs +++ b/MDM/Services/Material/MaterialBomService.cs @@ -63,7 +63,7 @@ namespace MDM.Services.Material .Select(it => new MaterialBomDto() { - Id = SqlFunc.AggregateMax(it.Id), + //Id = SqlFunc.AggregateMax(it.Id), InvCode = SqlFunc.AggregateMax(it.InvCode), InvName = SqlFunc.AggregateMax(it.InvName), SubInvName = SqlFunc.AggregateMax(it.SubInvName), @@ -100,7 +100,7 @@ namespace MDM.Services.Material /// /// /// - public MaterialBom GetInfo(string Id) + public MaterialBom GetInfo(int Id) { var response = Queryable() .Where(x => x.Id == Id) @@ -159,7 +159,6 @@ namespace MDM.Services.Material if (currentRow != null && currentRow.GetCell(0) != null) // 确保行不为空 { MaterialBom item = new MaterialBom(); - item.Id = XueHua; //母件编码 if (currentRow.GetCell(0) != null && currentRow.GetCell(0).CellType == CellType.String) item.InvCode = currentRow.GetCell(0).ToString();