From 17bb819887350979eacd884fb133d02af36f0fc3 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Sun, 31 Dec 2023 10:04:51 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AD=E8=8B=B1=E9=9F=A9?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Entitys/AlarmEntity.cs | 46 +++++++++++++++++++++----------
 Rs.SkyLine/Program.cs             |  1 +
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Rs.SkyLine/Entitys/AlarmEntity.cs b/Rs.SkyLine/Entitys/AlarmEntity.cs
index 62b3889..2ffcfdb 100644
--- a/Rs.SkyLine/Entitys/AlarmEntity.cs
+++ b/Rs.SkyLine/Entitys/AlarmEntity.cs
@@ -36,23 +36,39 @@ namespace Rs.MotionPlat.Entitys
                     {
                         for(int i=1;i<rowNum; i++)
                         {
-                            AlarmEntity entity = new AlarmEntity();
-                            IRow row = sheet.GetRow(i);
-                            ICell cell = row.GetCell(0);
-                            entity.AlartID = int.Parse(cell.NumericCellValue.ToString().Trim());
-                            cell = row.GetCell(2);
-                            if (cell != null)
-                                entity.CN = cell.StringCellValue;
-                            cell = row.GetCell(3);
-                            if (cell != null)
-                                entity.EN = cell.StringCellValue;
-                            cell = row.GetCell(4);
-                            if (cell != null)
-                                entity.KO = cell.StringCellValue;
-                            if(!alarmDic.ContainsKey(entity.AlartID))
+                            try
                             {
-                                alarmDic.Add(entity.AlartID, entity);
+                                AlarmEntity entity = new AlarmEntity();
+                                IRow row = sheet.GetRow(i);
+                                ICell cell = row.GetCell(0);
+                                if(cell.CellType== CellType.Numeric)
+                                {
+                                    entity.AlartID = int.Parse(cell.NumericCellValue.ToString().Trim());
+                                }
+                                else if(cell.CellType== CellType.String)
+                                {
+                                    entity.AlartID = int.Parse(cell.StringCellValue.ToString().Trim());
+                                }
+                                cell = row.GetCell(2);
+                                if (cell != null)
+                                    entity.CN = cell.StringCellValue;
+                                cell = row.GetCell(3);
+                                if (cell != null)
+                                    entity.EN = cell.StringCellValue;
+                                cell = row.GetCell(4);
+                                if (cell != null)
+                                    entity.KO = cell.StringCellValue;
+                                if (!alarmDic.ContainsKey(entity.AlartID))
+                                {
+                                    alarmDic.Add(entity.AlartID, entity);
+                                }
                             }
+                            catch (Exception ex)
+                            {
+
+                                
+                            }
+                           
                         }
                     }
                 }
diff --git a/Rs.SkyLine/Program.cs b/Rs.SkyLine/Program.cs
index b21d69d..39ff832 100644
--- a/Rs.SkyLine/Program.cs
+++ b/Rs.SkyLine/Program.cs
@@ -2,6 +2,7 @@
 using Rs.Framework;
 using Rs.MotionPlat.AuxiliaryEquipment;
 using Rs.MotionPlat.Commom;
+using Rs.MotionPlat.Entitys;
 using Rs.MotionPlat.Flow;
 using System;
 using System.Collections.Generic;