From a8029953301875e30b4dfcfc599a6fb4ebcd0c0c Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 22 八月 2024 14:51:18 +0800
Subject: [PATCH] Merge branch 'hwh'

---
 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs |  218 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 114 insertions(+), 104 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
index 52b07b4..69db2d1 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
@@ -1,109 +1,119 @@
 锘�
 namespace WCS.Application;
 
+/// <summary>
+/// 璁惧淇℃伅杈撳嚭鍙傛暟
+/// </summary>
+public class WcsDeviceDto
+{
     /// <summary>
-    /// 璁惧淇℃伅杈撳嚭鍙傛暟
+    /// PlcId
     /// </summary>
-    public class WcsDeviceDto
-    {
-        /// <summary>
-        /// PlcId
-        /// </summary>
-        public string PlcIdIP { get; set; }
-        
-        /// <summary>
-        /// 涓婚敭Id
-        /// </summary>
-        public long Id { get; set; }
-        
-        /// <summary>
-        /// PlcId
-        /// </summary>
-        public long PlcId { get; set; }
-        
-        /// <summary>
-        /// 璁惧绾у埆
-        /// </summary>
-        public DeviceLevelEnum Level { get; set; }
-        
-        /// <summary>
-        /// DB鍖哄煙
-        /// </summary>
-        public string? DbNumber { get; set; }
-        
-        /// <summary>
-        /// 宸ヤ綅鍙�
-        /// </summary>
-        public string? StationNum { get; set; }
-        
-        /// <summary>
-        /// PLC鍋忕Щ閲�
-        /// </summary>
-        public string? PlcPos { get; set; }
-        
-        /// <summary>
-        /// WCS鍋忕Щ閲�
-        /// </summary>
-        public string? WcsPos { get; set; }
-        
-        /// <summary>
-        /// 娴佺▼瀛楃被鍨�
-        /// </summary>
-        public PLCDataTypeEnum? PosType { get; set; }
-        
-        /// <summary>
-        /// 鏄剧ず灞廼p鍦板潃
-        /// </summary>
-        public string? LedIP { get; set; }
-        
-        /// <summary>
-        /// 鎻忚堪
-        /// </summary>
-        public string? Text { 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; }
-        
-    }
+    public string PlcIdIP { get; set; }
+
+    /// <summary>
+    /// 涓婚敭Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// PlcId
+    /// </summary>
+    public long PlcId { get; set; }
+
+    /// <summary>
+    /// 璁惧绾у埆
+    /// </summary>
+    public DeviceLevelEnum Level { get; set; }
+
+    /// <summary>
+    /// 璁惧绫诲瀷
+    /// </summary>
+    public PLCTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// DB鍖哄煙
+    /// </summary>
+    public string? DbNumber { get; set; }
+
+    /// <summary>
+    /// 宸ヤ綅鍙�
+    /// </summary>
+    public string? StationNum { get; set; }
+
+    /// <summary>
+    /// PLC鍋忕Щ閲�
+    /// </summary>
+    public string? PlcPos { get; set; }
+
+    /// <summary>
+    /// WCS鍋忕Щ閲�
+    /// </summary>
+    public string? WcsPos { get; set; }
+
+    /// <summary>
+    /// 娴佺▼瀛楃被鍨�
+    /// </summary>
+    public PLCDataTypeEnum? PosType { get; set; }
+
+    /// <summary>
+    /// 鏄剧ず灞廼p鍦板潃
+    /// </summary>
+    public string? LedIP { get; set; }
+
+    /// <summary>
+    /// 鎻忚堪
+    /// </summary>
+    public string? Text { 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; }
+
+    public dynamic Value { get; set; }
+
+    public PLCUtil PLCUtil { get; set; }
+
+    public List<WcsStation> listStation { get; set; }
+}

--
Gitblit v1.8.0