diff --git a/MDM/Models/Material/MaterialBom.cs b/MDM/Models/Material/MaterialBom.cs index a1977d2..fa10fa6 100644 --- a/MDM/Models/Material/MaterialBom.cs +++ b/MDM/Models/Material/MaterialBom.cs @@ -62,7 +62,7 @@ namespace MDM.Model.Material /// /// CreatedTime /// - [SugarColumn(ColumnName = "createdTime")] + [SugarColumn(ColumnName = "created_time")] public DateTime? CreatedTime { get; set; } /// diff --git a/MDM/Services/Material/MaterialBomService.cs b/MDM/Services/Material/MaterialBomService.cs index 551b29c..c0f57d6 100644 --- a/MDM/Services/Material/MaterialBomService.cs +++ b/MDM/Services/Material/MaterialBomService.cs @@ -36,11 +36,9 @@ namespace MDM.Services.Material .AndIF(!string.IsNullOrEmpty(parm.SubInvCode), it => it.SubInvCode.Contains(parm.SubInvCode)) ; - - ; - var response = Queryable() .Where(predicate.ToExpression()) + .OrderBy("created_time DESC") .ToPage(parm); return response; @@ -75,7 +73,7 @@ namespace MDM.Services.Material UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime) - }); + }).OrderBy("created_time DESC"); // 核心修复:手动指定数据库列名排序; var response = query.ToPage(parm); diff --git a/RIZO.Admin.WebApi/Controllers/MES/alarm/AlarmInfoController.cs b/RIZO.Admin.WebApi/Controllers/MES/alarm/AlarmInfoController.cs index 695c671..f5b56d4 100644 --- a/RIZO.Admin.WebApi/Controllers/MES/alarm/AlarmInfoController.cs +++ b/RIZO.Admin.WebApi/Controllers/MES/alarm/AlarmInfoController.cs @@ -97,5 +97,30 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.alerm return ToResponse(_AlarmInfoService.Delete(idArr)); } + /// 导出设备报警信息 + /// + /// + [HttpGet("export")] + [Log(Title = "设备报警信息", BusinessType = BusinessType.EXPORT)] + public IActionResult Export([FromQuery] AlarmInfoQueryDto parm) + { + var list = _AlarmInfoService.GetList(parm).Result; + if (list == null || list.Count <= 0) + { + return ToResponse(ResultCode.FAIL, "没有要导出的数据"); + } + var (sFileName, sFilePath) = ExportExcelMini(list, "设备报警信息", "设备报警信息"); + if (string.IsNullOrWhiteSpace(sFilePath)) + { + return ToResponse(ResultCode.FAIL, "Excel生成失败"); + } + return PhysicalFile( + sFilePath, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + sFileName, + true + ); + } + } } \ No newline at end of file