From 8b0d749cfbec8bf0afe71a8956bfeeed6f27cdfc Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 16 一月 2025 15:32:30 +0800
Subject: [PATCH] Merge branch 'csc'

---
 Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcDto.cs |   79 ++++++++++++++++++++++-----------------
 1 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcDto.cs b/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcDto.cs
index 6be8c4c..48c1876 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/Dto/WcsPlcDto.cs
@@ -1,39 +1,48 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐d换锛屾垜浠笉鎵挎媴浠讳綍璐d换锛�
-
+锘�
 namespace WCS.Application;
 
+/// <summary>
+/// PLC杈撳嚭鍙傛暟
+/// </summary>
+public class WcsPlcDto
+{
     /// <summary>
-    /// PLC杈撳嚭鍙傛暟
+    /// 涓婚敭Id
     /// </summary>
-    public class WcsPlcDto
-    {
-        /// <summary>
-        /// 涓婚敭Id
-        /// </summary>
-        public long Id { get; set; }
-        
-        /// <summary>
-        /// PLCIP鍦板潃
-        /// </summary>
-        public string IP { get; set; }
-        
-        /// <summary>
-        /// 璁惧绫诲瀷
-        /// </summary>
-        public PLCTypeEnum Type { get; set; }
-        
-        /// <summary>
-        /// 浠撳簱鍙�
-        /// </summary>
-        public string? WareHouseNo { get; set; }
-        
-        /// <summary>
-        /// 鎻忚堪
-        /// </summary>
-        public string? Text { get; set; }
-        
-    }
+    public long Id { get; set; }
+
+    /// <summary>
+    /// PLCIP鍦板潃
+    /// </summary>
+    public string IP { get; set; }
+
+    /// <summary>
+    /// PLC绔彛鍙�
+    /// </summary>
+    public int Port { get; set; }
+
+    /// <summary>
+    /// 璁惧绫诲瀷
+    /// </summary>
+    public PLCEnum PLCType { get; set; }
+
+    /// <summary>
+    /// 璁惧绫诲瀷
+    /// </summary>
+    public PLCTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// 浠撳簱鍙�
+    /// </summary>
+    public string? WareHouseNo { get; set; }
+
+    /// <summary>
+    /// 鎻忚堪
+    /// </summary>
+    public string? Text { get; set; }
+
+    /// <summary>
+    /// 鏄惁鍚敤
+    /// </summary>
+    public YesNoEnum Enable { get; set; }
+}

--
Gitblit v1.8.0