From 006c98e5650b530e5220f279c1e803fefe69d40d Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 25 十一月 2025 15:47:33 +0800
Subject: [PATCH] 优化一些东西;

---
 HMI.AlermInfoManage/Entity/AlarmText.cs |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/HMI.AlermInfoManage/Entity/AlarmText.cs b/HMI.AlermInfoManage/Entity/AlarmText.cs
index e431b70..7f54c98 100644
--- a/HMI.AlermInfoManage/Entity/AlarmText.cs
+++ b/HMI.AlermInfoManage/Entity/AlarmText.cs
@@ -1,4 +1,5 @@
-锘縰sing System.Xml.Serialization;
+锘縰sing HMI.Core;
+using System.Xml.Serialization;
 
 namespace HMI.AlarmInfoManage.Entity
 {
@@ -7,42 +8,50 @@
         /// <summary>
         /// 鎶ヨ浠g爜
         /// </summary>
+        [ExcelColumn("缁勫悎鎶ヨ浠g爜")]
         public string AlarmCode { get; set; }
 
         /// <summary>
         /// 宸ヤ綅缂栧彿
         /// </summary>
+        [ExcelColumn("璁惧鍙�")]
         public string OpNo { get; set; }
 
         /// <summary>
         /// 妯″潡缂栧彿
         /// </summary>
+        [ExcelColumn("妯″潡鍙�")]
         public string ModuleNo { get; set; }
 
         /// <summary>
         /// 妯″潡鍚嶇О(CN)
         /// </summary>
+        [ExcelColumn("妯″潡鍚嶇О-CN")]
         public string ModuleName_CN { get; set; }
 
         /// <summary>
         /// 妯″潡鍚嶇О(EN)
         /// </summary>
+        [ExcelColumn("妯″潡鍚嶇О-US")]
         public string ModuleName_EN { get; set; }
 
 
         /// <summary>
         /// 妯″潡鎶ヨ浠g爜
         /// </summary>
+        [ExcelColumn("鎶ヨ浠g爜")]
         public string MAlarmCode { get; set; }
 
         /// <summary>
         /// 妯″潡鎶ヨ鏂囨湰(CN)
         /// </summary>
+        [ExcelColumn("鎶ヨ淇℃伅鏂囨湰-CN")]
         public string MAlarmText_CN { get; set; }
 
         /// <summary>
         /// 妯″潡鎶ヨ鏂囨湰(EN)
         /// </summary>
+        [ExcelColumn("鎶ヨ淇℃伅鏂囨湰-US")]
         public string MAlarmText_EN { get; set; }
 
         /// <summary>
@@ -50,10 +59,16 @@
         /// </summary>
         public string Time { get; set; }
 
+        [XmlIgnore]
+        public string AlarmInfo { get; set; }
+
         /// <summary>
         /// 鎶ヨ鏉ユ簮
         /// </summary> 
         [XmlIgnore]
         public string Source { get; set; }
+
+        [XmlIgnore]
+        public string PLC_DB_BLOCK { get; set; }
     }
 }

--
Gitblit v1.9.1