修改西门子读取函数

src/YSAI.DAQ.Samples/YSAI.DAQ.Samples.csproj

@@ -99,7 +99,7 @@
 
   <ItemGroup>
     <PackageReference Include="YSAI.Mqtt" Version="23.360.30183" />
-    <PackageReference Include="YSAI.Opc" Version="23.360.7834" />
+    <PackageReference Include="YSAI.Opc" Version="23.361.15983" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.Siemens/SiemensOperate.cs

@@ -215,7 +215,7 @@ namespace YSAI.Siemens
                                 switch (item.AddressDataType)
                                 {
                                     case DataType.Bool:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Bit, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Bit, dataItem.Count);
                                         break;
 
                                     case DataType.String:
@@ -225,31 +225,31 @@ namespace YSAI.Siemens
                                         break;
 
                                     case DataType.Byte:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Byte, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Byte, dataItem.Count);
                                         break;
 
                                     case DataType.Double:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.LReal, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.LReal, dataItem.Count);
                                         break;
 
                                     case DataType.Float:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Real, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Real, dataItem.Count);
                                         break;
                                     case DataType.Short:
                                     case DataType.Int16:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Int, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Int, dataItem.Count);
                                         break;
                                     case DataType.Ushort:
                                     case DataType.UInt16:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Word, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.Word, dataItem.Count);
                                         break;
                                     case DataType.Int:
                                     case DataType.Int32:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.DInt, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.DInt, dataItem.Count);
                                         break;
                                     case DataType.Uint:
                                     case DataType.UInt32:
-                                        Value = PlcS7.ReadAsync(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.DWord, dataItem.Count).Result;
+                                        Value = PlcS7.Read(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, VarType.DWord, dataItem.Count);
                                         break;
                                     default:
                                         LogHelper.Error($"[ {item.AddressName} ]读取失败：不支持{item.AddressDataType}类型读取");

src/YSAI.Siemens/YSAI.Siemens.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.361.15983</Version>
+    <Version>23.361.20326</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

src/YSAI.Tool.Wpf/YSAI.Tool.Wpf.csproj

@@ -18,25 +18,24 @@
 		<PackageReference Include="PropertyTools.Wpf" Version="3.1.0" />
 		<PackageReference Include="WPF-UI" Version="3.0.0-preview.13" />
 		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
-		<PackageReference Include="YSAI.AllenBradley" Version="23.360.5691" />
-		<PackageReference Include="YSAI.Beckhoff" Version="23.360.5691" />
-		<PackageReference Include="YSAI.DB" Version="23.360.5691" />
+		<PackageReference Include="YSAI.AllenBradley" Version="23.361.15983" />
+		<PackageReference Include="YSAI.Beckhoff" Version="23.361.15983" />
+		<PackageReference Include="YSAI.DB" Version="23.361.15983" />
 		<PackageReference Include="YSAI.Kafka" Version="23.352.38022" />
-		<PackageReference Include="YSAI.Mewtocol" Version="23.360.37135" />
-		<PackageReference Include="YSAI.Mitsubishi" Version="23.360.5691" />
-		<PackageReference Include="YSAI.Modbus" Version="23.360.5691" />
+		<PackageReference Include="YSAI.Mewtocol" Version="23.361.15983" />
+		<PackageReference Include="YSAI.Mitsubishi" Version="23.361.15983" />
+		<PackageReference Include="YSAI.Modbus" Version="23.361.15983" />
 		<PackageReference Include="YSAI.Mqtt" Version="23.360.30183" />
 		<PackageReference Include="YSAI.NetMQ" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Netty" Version="23.352.38022" />
-		<PackageReference Include="YSAI.Omron" Version="23.360.5691" />
-		<PackageReference Include="YSAI.Opc" Version="23.360.7834" />
+		<PackageReference Include="YSAI.Omron" Version="23.361.15983" />
+		<PackageReference Include="YSAI.Opc" Version="23.361.15983" />
 		<PackageReference Include="YSAI.RabbitMQ" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Redis" Version="23.352.38022" />
-		<PackageReference Include="YSAI.Siemens" Version="23.360.36030" />
+		<PackageReference Include="YSAI.Siemens" Version="23.361.15983" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core.Wpf\YSAI.Core.Wpf.csproj" />
-		<ProjectReference Include="..\YSAI.Siemens\YSAI.Siemens.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>