diff --git a/MDM/Models/Material/Dto/MaterialBomDto.cs b/MDM/Models/Material/Dto/MaterialBomDto.cs index 0902c24..cef3214 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 int Id { get; set; } + public string Id { get; set; } public string? InvCode { get; set; } diff --git a/MDM/Models/Material/Dto/MaterialListDto.cs b/MDM/Models/Material/Dto/MaterialListDto.cs index 866ab02..f748cc2 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 int Id { get; set; } + public string Id { get; set; } public string? FkMaterialTypeCode { get; set; } diff --git a/MDM/Models/Material/MaterialBom.cs b/MDM/Models/Material/MaterialBom.cs index fa10fa6..89b61d5 100644 --- a/MDM/Models/Material/MaterialBom.cs +++ b/MDM/Models/Material/MaterialBom.cs @@ -63,7 +63,7 @@ namespace MDM.Model.Material /// CreatedTime /// [SugarColumn(ColumnName = "created_time")] - public DateTime? CreatedTime { get; set; } + public DateTime CreatedTime { get; set; } /// /// UpdatedBy diff --git a/MDM/Services/Material/MaterialBomService.cs b/MDM/Services/Material/MaterialBomService.cs index c0f57d6..a09c6ed 100644 --- a/MDM/Services/Material/MaterialBomService.cs +++ b/MDM/Services/Material/MaterialBomService.cs @@ -68,12 +68,12 @@ namespace MDM.Services.Material Iusequantity = SqlFunc.AggregateMax(it.Iusequantity), BOMVersion = SqlFunc.AggregateMax(it.BOMVersion), CreatedBy = SqlFunc.AggregateMax(it.CreatedBy), - CreatedTime = SqlFunc.AggregateMax(it.CreatedTime), + //CreatedTime = SqlFunc.AggregateMax(it.CreatedTime), UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy), UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime) - }).OrderBy("created_time DESC"); // 核心修复:手动指定数据库列名排序; + }).OrderBy(it => SqlFunc.AggregateMax(it.CreatedTime), OrderByType.Desc); var response = query.ToPage(parm); @@ -157,10 +157,10 @@ 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(); diff --git a/MDM/Services/Material/MaterialListService.cs b/MDM/Services/Material/MaterialListService.cs index 9c805a1..f16e881 100644 --- a/MDM/Services/Material/MaterialListService.cs +++ b/MDM/Services/Material/MaterialListService.cs @@ -109,7 +109,7 @@ namespace MDM.Services.Material try { IWorkbook workbook = new XSSFWorkbook(stream); - ISheet sheet = workbook.GetSheet("物料类型"); + ISheet sheet = workbook.GetSheet("物料台账"); List materialLists = new List(); // 遍历每一行 for (int row = 1; row <= sheet.LastRowNum; row++) @@ -118,6 +118,7 @@ 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();