From bd07dc56f2d923f204a2b40504175e2658258cb4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 29 八月 2024 16:59:41 +0800
Subject: [PATCH] 报警信息调整

---
 Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs |   56 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
index 2cf82fb..6eaa5e1 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
@@ -1,12 +1,4 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-using Admin.NET.Core;
-using System.ComponentModel.DataAnnotations;
-
+锘�
 namespace WCS.Application;
 
 /// <summary>
@@ -17,12 +9,17 @@
     /// <summary>
     /// PLCIP鍦板潃
     /// </summary>
-    public virtual string? PlcIP { get; set; }
+    public virtual string PlcIP { get; set; }
+
+    /// <summary>
+    /// PLCIP鍦板潃
+    /// </summary>
+    public virtual int PlcPort { get; set; }
 
     /// <summary>
     /// 鎶ヨ缂栧彿
     /// </summary>
-    public virtual string? AlarmCode { get; set; }
+    public virtual string AlarmCode { get; set; }
 
     /// <summary>
     /// 鎶ヨ鎻忚堪
@@ -37,12 +34,12 @@
     /// <summary>
     /// 鐘舵��
     /// </summary>
-    public virtual YesNoEnum Status { get; set; } = YesNoEnum.N;
+    public virtual int? Status { get; set; }
 
     /// <summary>
     /// 璁惧绫诲瀷
     /// </summary>
-    public virtual string? Type { get; set; }
+    public virtual PLCTypeEnum Type { get; set; }
 
     /// <summary>
     /// 鎶ヨ鏃ユ湡
@@ -52,7 +49,7 @@
     /// <summary>
     /// LED鐘舵��
     /// </summary>
-    public virtual YesNoEnum LedStatus { get; set; } = YesNoEnum.N;
+    public virtual int? LedStatus { get; set; }
 
     /// <summary>
     /// 鍒涘缓鏃堕棿
@@ -117,9 +114,14 @@
     public string? PlcIP { get; set; }
 
     /// <summary>
+    /// 鐘舵��
+    /// </summary>
+    public YesNoEnum? Status { get; set; }
+
+    /// <summary>
     /// 璁惧绫诲瀷
     /// </summary>
-    public string? Type { get; set; }
+    public PLCTypeEnum? Type { get; set; }
 
 }
 
@@ -129,6 +131,30 @@
 public class AddWcsAlarmInfoInput : WcsAlarmInfoBaseInput
 {
     /// <summary>
+    /// PLCIP鍦板潃
+    /// </summary>
+    [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
+    public override string PlcIP { get; set; }
+
+    /// <summary>
+    /// PLCIP鍦板潃
+    /// </summary>
+    [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
+    public override int PlcPort { get; set; }
+
+    /// <summary>
+    /// 鎶ヨ缂栧彿
+    /// </summary>
+    [Required(ErrorMessage = "鎶ヨ缂栧彿涓嶈兘涓虹┖")]
+    public override string AlarmCode { get; set; }
+
+    /// <summary>
+    /// 璁惧绫诲瀷
+    /// </summary>
+    [Required(ErrorMessage = "璁惧绫诲瀷涓嶈兘涓虹┖")]
+    public override PLCTypeEnum Type { get; set; }
+
+    /// <summary>
     /// 杞垹闄�
     /// </summary>
     [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]

--
Gitblit v1.8.0