From 8c6fd742db249ad4cc819cf041eb98d880a3ef73 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 02 一月 2025 15:09:07 +0800
Subject: [PATCH] 1

---
 WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
index 5f9498d..64d5659 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
@@ -20,15 +20,24 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEAWCS_Communicator;
 
 namespace WIDESEAWCS_QuartzJob.DTO
 {
+    /// <summary>
+    /// 璁惧鍗忚淇℃伅DTO
+    /// </summary>
     public class DeviceProDTO
     {
         /// <summary>
         /// 鍗忚涓婚敭
         /// </summary>
         public int DeviceProId { get; set; }
+
+        /// <summary>
+        /// 璁惧PLC绫诲瀷
+        /// </summary>
+        public string DevicePlcType { get; set; }
 
         /// <summary>
         /// 璁惧淇℃伅涓婚敭
@@ -57,7 +66,9 @@
         {
             get
             {
-                return DeviceProDataBlock + "." + DeviceProOffset;
+                if (DevicePlcType == nameof(SiemensS7))
+                    return DeviceProDataBlock + "." + DeviceProOffset;
+                return DeviceProDataBlock + "";
             }
         }
 

--
Gitblit v1.9.3