From 2f75b4c0a67ccc3a443e7cc4f2f0f909defd9a92 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 01 十一月 2024 09:49:23 +0800
Subject: [PATCH] 版本更新
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
index 5f9498d..2f570aa 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/DTO/DeviceProDTO.cs
@@ -20,6 +20,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Communicator;
namespace WIDESEAWCS_QuartzJob.DTO
{
@@ -29,6 +30,8 @@
/// 鍗忚涓婚敭
/// </summary>
public int DeviceProId { get; set; }
+
+ public string DevicePlcType { get; set; }
/// <summary>
/// 璁惧淇℃伅涓婚敭
@@ -57,7 +60,9 @@
{
get
{
- return DeviceProDataBlock + "." + DeviceProOffset;
+ if (DevicePlcType == nameof(SiemensS7))
+ return DeviceProDataBlock + "." + DeviceProOffset;
+ return Convert.ToInt32(DeviceProOffset) + "";
}
}
--
Gitblit v1.9.3