From dbde3162fd361dcba4316b58754ccecf39a81a9f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 09 六月 2025 08:52:18 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 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..25b843b 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,22 @@
/// <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 StationNum { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ缂栧彿
+ /// </summary>
+ public virtual string AlarmCode { get; set; }
/// <summary>
/// 鎶ヨ鎻忚堪
@@ -37,12 +39,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 +54,7 @@
/// <summary>
/// LED鐘舵��
/// </summary>
- public virtual YesNoEnum LedStatus { get; set; } = YesNoEnum.N;
+ public virtual int? LedStatus { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -117,9 +119,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; }
}
@@ -128,6 +135,36 @@
/// </summary>
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 StationNum { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ缂栧彿
+ /// </summary>
+ [Required(ErrorMessage = "鎶ヨ缂栧彿涓嶈兘涓虹┖")]
+ public override string AlarmCode { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "璁惧绫诲瀷涓嶈兘涓虹┖")]
+ public override PLCTypeEnum Type { get; set; }
+
/// <summary>
/// 杞垹闄�
/// </summary>
@@ -163,3 +200,9 @@
{
}
+
+public class ResetInput
+{
+ [Required(ErrorMessage = "妤煎眰涓嶈兘涓虹┖")]
+ public int layer { get; set; }
+}
\ No newline at end of file
--
Gitblit v1.8.0