From cff60cb1cccf70fe33ed9c951c46143fe41fc43a Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 19:09:52 +0800
Subject: [PATCH] 设备呼叫空托跺

---
 Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs |   68 ++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
index d933188..396fd7a 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
@@ -1,10 +1,4 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-namespace WCS.Application;
+锘縩amespace WCS.Application;
 
 /// <summary>
 /// 鎶ヨ淇℃伅琛ㄨ緭鍑哄弬鏁�
@@ -15,92 +9,102 @@
     /// 涓婚敭Id
     /// </summary>
     public long Id { get; set; }
-    
+
     /// <summary>
     /// PLCIP鍦板潃
     /// </summary>
-    public string? PlcIP { get; set; }
-    
+    public string PlcIP { get; set; }
+
+    /// <summary>
+    /// PLCIP鍦板潃
+    /// </summary>
+    public int PlcPort { get; set; }
+
+    /// <summary>
+    /// 宸ヤ綅鍙�
+    /// </summary>
+    public string StationNum { get; set; }
+
     /// <summary>
     /// 鎶ヨ缂栧彿
     /// </summary>
-    public string? AlarmCode { get; set; }
-    
+    public string AlarmCode { get; set; }
+
     /// <summary>
     /// 鎶ヨ鎻忚堪
     /// </summary>
     public string? AlarmName { get; set; }
-    
+
     /// <summary>
     /// 鏄剧ず灞廼p鍦板潃
     /// </summary>
     public string? LedIP { get; set; }
-    
+
     /// <summary>
     /// 鐘舵��
     /// </summary>
-    public YesNoEnum Status { get; set; }
-    
+    public YesNoEnum? Status { get; set; }
+
     /// <summary>
     /// 璁惧绫诲瀷
     /// </summary>
-    public string? Type { get; set; }
-    
+    public PLCTypeEnum Type { get; set; }
+
     /// <summary>
     /// 鎶ヨ鏃ユ湡
     /// </summary>
     public DateTime? AlarmTime { get; set; }
-    
+
     /// <summary>
     /// LED鐘舵��
     /// </summary>
-    public YesNoEnum LedStatus { get; set; }
-    
+    public int? LedStatus { get; set; }
+
     /// <summary>
     /// 鍒涘缓鏃堕棿
     /// </summary>
     public DateTime? CreateTime { get; set; }
-    
+
     /// <summary>
     /// 鏇存柊鏃堕棿
     /// </summary>
     public DateTime? UpdateTime { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰匢d
     /// </summary>
     public long? CreateUserId { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呭鍚�
     /// </summary>
     public string? CreateUserName { get; set; }
-    
+
     /// <summary>
     /// 淇敼鑰匢d
     /// </summary>
     public long? UpdateUserId { get; set; }
-    
+
     /// <summary>
     /// 淇敼鑰呭鍚�
     /// </summary>
     public string? UpdateUserName { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呴儴闂↖d
     /// </summary>
     public long? CreateOrgId { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
     /// </summary>
     public string? CreateOrgName { get; set; }
-    
+
     /// <summary>
     /// 杞垹闄�
     /// </summary>
     public bool IsDelete { get; set; }
-    
-    }
- 
+
+}
+
 

--
Gitblit v1.8.0