From 59d54b20a5b4c28bf9d57b1ece91aa9452a09d9b Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Fri, 19 Dec 2025 16:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=8A=A5=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/MES/andon/AndonAlarmRecord.cs          | 14 +++-----------
 ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs   |  4 +---
 ZR.Service/mes/andon/AndonAlarmRecordService.cs | 12 ++++++------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ZR.Model/MES/andon/AndonAlarmRecord.cs b/ZR.Model/MES/andon/AndonAlarmRecord.cs
index 69efeba7..265fcfcb 100644
--- a/ZR.Model/MES/andon/AndonAlarmRecord.cs
+++ b/ZR.Model/MES/andon/AndonAlarmRecord.cs
@@ -19,17 +19,12 @@ namespace ZR.Model.MES.andon
         [SugarColumn(ColumnName = "alarm_code")]
         public string AlarmCode { get; set; }
 
-        /// <summary>
-        /// 产线 
-        /// </summary>
-        [SugarColumn(ColumnName = "line_code")]
-        public string LineCode { get; set; }
 
         /// <summary>
-        /// 产线名称 
+        /// 报警类型编码 
         /// </summary>
-        [SugarColumn(ColumnName = "line_name")]
-        public string LineName { get; set; }
+        [SugarColumn(ColumnName = "alarm_type_code")]
+        public string AlarmTypeCode { get; set; }
 
         /// <summary>
         /// 报警类型 
@@ -112,8 +107,5 @@ namespace ZR.Model.MES.andon
         [SugarColumn(ColumnName = "updated_time")]
         public DateTime? UpdatedTime { get; set; }
 
-        
-        [SugarColumn(ColumnName = "sequcence")]
-        public int Sequcence { get; set; }
     }
 }
\ No newline at end of file
diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
index edc577d0..d6edb38a 100644
--- a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
+++ b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
@@ -21,9 +21,7 @@ namespace ZR.Model.MES.andon.Dto
 
         public string AlarmCode { get; set; }
 
-        public string LineCode { get; set; }
-
-        public string LineName { get; set; }
+        public string AlarmTypeCode { get; set; }
 
         public string AlarmType { get; set; }
 
diff --git a/ZR.Service/mes/andon/AndonAlarmRecordService.cs b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
index 5c0a6afa..a8b568ec 100644
--- a/ZR.Service/mes/andon/AndonAlarmRecordService.cs
+++ b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
@@ -284,18 +284,18 @@ namespace ZR.Service.mes.andon
         public AndonAlarmRecord CreateAndonAlarmRecord(AndonAlarmRecord model)
         {
             string strDay = DateTime.Now.ToString("yyyyMMdd");
-            int Sequcence = 1;
+            int Sequence = 1;
             AndonAlarmRecord item = Queryable()
-                .Where(it => it.AlarmCode.Contains(strDay)).OrderByDescending(it => it.Sequcence).First();
+                .Where(it => it.AlarmCode.Contains(strDay)).OrderByDescending(it => it.Sequence).First();
             if (item != null)
             {
-                Sequcence = item.Sequcence;
-                Sequcence += 1;
+                Sequence = (int)item.Sequence;
+                Sequence += 1;
             }
-            string formattedSequence = Sequcence.ToString("D4");
+            string formattedSequence = Sequence.ToString("D4");
             string strAlarmCode = "Alarm" + strDay + formattedSequence;
             model.AlarmCode = strAlarmCode;
-            model.Sequcence = Sequcence;
+            model.Sequence = Sequence;
             return Context.Insertable(model).ExecuteReturnEntity();
         }