From 01c3a3f0e3d8cc6ed6698783d1581f7774f7b15d Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Wed, 21 Jan 2026 10:26:48 +0800
Subject: [PATCH] =?UTF-8?q?PLC=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MDM/Models/Material/MaterialBom.cs            |  2 +-
 MDM/Services/Material/MaterialBomService.cs   |  6 ++---
 .../MES/alarm/AlarmInfoController.cs          | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

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
         /// <summary>
         /// CreatedTime 
         /// </summary>
-        [SugarColumn(ColumnName = "createdTime")]
+        [SugarColumn(ColumnName = "created_time")]
         public DateTime? CreatedTime { get; set; }
 
         /// <summary>
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<MaterialBom, MaterialBomDto>(parm);
 
             return response;
@@ -75,7 +73,7 @@ namespace MDM.Services.Material
                     UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime)
 
 
-                });
+                }).OrderBy("created_time DESC"); // 核心修复：手动指定数据库列名排序;
             var response = query.ToPage<MaterialBomDto, MaterialBomDto>(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));
         }
 
+        /// 导出设备报警信息
+        /// </summary>
+        /// <returns></returns>
+        [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