From 37c4da42e6bc67a0c40ef1d4f2527a5577f86a2e Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 21 八月 2024 07:56:21 +0800
Subject: [PATCH] plc设备信息页面优化
---
Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcInput.cs | 180 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 94 insertions(+), 86 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcInput.cs b/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcInput.cs
index 70fbf15..68983b8 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcInput.cs
@@ -1,106 +1,114 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-using Admin.NET.Core;
-using System.ComponentModel.DataAnnotations;
-
+锘�
namespace WCS.Application;
+/// <summary>
+/// PLC鍩虹杈撳叆鍙傛暟
+/// </summary>
+public class WcsPlcBaseInput
+{
/// <summary>
- /// PLC鍩虹杈撳叆鍙傛暟
+ /// PLCIP鍦板潃
/// </summary>
- public class WcsPlcBaseInput
- {
- /// <summary>
- /// PLCIP鍦板潃
- /// </summary>
- public virtual string IP { get; set; }
-
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- public virtual PLCTypeEnum Type { get; set; }
-
- /// <summary>
- /// 浠撳簱鍙�
- /// </summary>
- public virtual string? WareHouseNo { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public virtual string? Text { get; set; }
-
- }
+ public virtual string IP { get; set; }
/// <summary>
- /// PLC鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+ /// PLC绫诲瀷
/// </summary>
- public class PageWcsPlcInput : BasePageInput
- {
- /// <summary>
- /// 鍏抽敭瀛楁煡璇�
- /// </summary>
- public string? SearchKey { get; set; }
-
- /// <summary>
- /// PLCIP鍦板潃
- /// </summary>
- public string? IP { get; set; }
-
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- public PLCTypeEnum? Type { get; set; }
-
- }
+ public virtual PLCEnum PLCType { get; set; }
/// <summary>
- /// PLC澧炲姞杈撳叆鍙傛暟
+ /// 璁惧绫诲瀷
/// </summary>
- public class AddWcsPlcInput : WcsPlcBaseInput
- {
- /// <summary>
- /// PLCIP鍦板潃
- /// </summary>
- [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
- public override string IP { get; set; }
-
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- [Required(ErrorMessage = "璁惧绫诲瀷涓嶈兘涓虹┖")]
- public override PLCTypeEnum Type { get; set; }
-
- }
+ public virtual PLCTypeEnum Type { get; set; }
/// <summary>
- /// PLC鍒犻櫎杈撳叆鍙傛暟
+ /// 浠撳簱鍙�
/// </summary>
- public class DeleteWcsPlcInput : BaseIdInput
- {
- }
+ public virtual string? WareHouseNo { get; set; }
/// <summary>
- /// PLC鏇存柊杈撳叆鍙傛暟
+ /// 鎻忚堪
/// </summary>
- public class UpdateWcsPlcInput : WcsPlcBaseInput
- {
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
- public long Id { get; set; }
-
- }
+ public virtual string? Text { get; set; }
+
+}
+
+/// <summary>
+/// PLC鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class PageWcsPlcInput : BasePageInput
+{
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
/// <summary>
- /// PLC涓婚敭鏌ヨ杈撳叆鍙傛暟
+ /// PLCIP鍦板潃
/// </summary>
- public class QueryByIdWcsPlcInput : DeleteWcsPlcInput
- {
+ public string? IP { get; set; }
- }
+ /// <summary>
+ /// PLC绫诲瀷
+ /// </summary>
+ public PLCEnum? PLCType { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ public PLCTypeEnum? Type { get; set; }
+
+}
+
+/// <summary>
+/// PLC澧炲姞杈撳叆鍙傛暟
+/// </summary>
+public class AddWcsPlcInput : WcsPlcBaseInput
+{
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
+ public override string IP { get; set; }
+
+ /// <summary>
+ /// PLC绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "PLC绫诲瀷涓嶈兘涓虹┖")]
+ public override PLCEnum PLCType { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "璁惧绫诲瀷涓嶈兘涓虹┖")]
+ public override PLCTypeEnum Type { get; set; }
+
+}
+
+/// <summary>
+/// PLC鍒犻櫎杈撳叆鍙傛暟
+/// </summary>
+public class DeleteWcsPlcInput : BaseIdInput
+{
+}
+
+/// <summary>
+/// PLC鏇存柊杈撳叆鍙傛暟
+/// </summary>
+public class UpdateWcsPlcInput : WcsPlcBaseInput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+}
+
+/// <summary>
+/// PLC涓婚敭鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class QueryByIdWcsPlcInput : DeleteWcsPlcInput
+{
+
+}
--
Gitblit v1.8.0