版本更新

src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffOperate.cs

@@ -363,6 +363,7 @@ namespace YSAI.Beckhoff
                 //遍历
                 foreach (var item in address.AddressArray)
                 {
+                    if (!item.IsEnable) continue;
                     //是不是虚拟地址
                     bool IsVA = false;
                     //初始化虚拟地址
@@ -500,7 +501,11 @@ namespace YSAI.Beckhoff
                 }
                 //失败消息
                 List<string> FailMessage = new List<string>();
-                foreach (var item in address.AddressArray)
+
+                //移除虚拟点
+                List<AddressDetails> Nodes = address.RemoveVirtualAddress();
+
+                foreach (var item in Nodes)
                 {
                     //异步通知结果
                     ResultHandle resultHandle = null;

src/YSAI.DAQ/YSAI.Can/CanOperator.cs

@@ -270,6 +270,7 @@ namespace YSAI.Can
 
                     foreach (var item in address.AddressArray)
                     {
+                        if (!item.IsEnable) continue;
                         //是不是虚拟地址
                         bool IsVA = false;
                         //初始化虚拟地址

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.69</Version>
+    <Version>1.0.0.70</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
+		<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
-		<PackageReference Include="YSAI.Log" Version="1.0.0.9" />
-		<PackageReference Include="YSAI.Unility" Version="1.0.0.25" />
+		<PackageReference Include="YSAI.Log" Version="1.0.0.10" />
+		<PackageReference Include="YSAI.Unility" Version="1.0.0.26" />
 	</ItemGroup>
 
 </Project>

src/YSAI.DAQ/YSAI.Log/YSAI.Log.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	<Version>1.0.0.9</Version>
+	<Version>1.0.0.10</Version>
 	<Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="NModbus" Version="3.0.80" />
-    <PackageReference Include="NModbus.Serial" Version="3.0.80" />
+    <PackageReference Include="NModbus" Version="3.0.81" />
+    <PackageReference Include="NModbus.Serial" Version="3.0.81" />
     <PackageReference Include="YSAI.Core" Version="1.0.0.69" />
   </ItemGroup>
 

src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientOperate.cs

@@ -817,6 +817,7 @@ namespace YSAI.Opc.da.client
                     //循环添加项集合
                     foreach (var item in address.AddressArray)
                     {
+                        if (!item.IsEnable) continue;
                         //是不是虚拟地址
                         bool IsVA = false;
                         //初始化虚拟地址

src/YSAI.DAQ/YSAI.S7/S7Operate.cs

@@ -176,6 +176,7 @@ namespace YSAI.S7
                     //循环添加项集合
                     foreach (var item in address.AddressArray)
                     {
+                        if (!item.IsEnable) continue;
                         //是不是虚拟地址
                         bool IsVA = false;
                         //初始化虚拟地址

src/YSAI.DAQ/YSAI.Unility/YSAI.Unility.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.25</Version>
+		<Version>1.0.0.26</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>