diff --git a/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx b/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx
deleted file mode 100644
index 1dfcdfa4..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx b/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx
new file mode 100644
index 00000000..0ab02d9e
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx b/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx
deleted file mode 100644
index 01a3ab93..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx b/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx
new file mode 100644
index 00000000..e85be5b1
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx b/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx
new file mode 100644
index 00000000..f06fde4b
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx b/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx
deleted file mode 100644
index dd74726f..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx b/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx
new file mode 100644
index 00000000..ca82795c
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index ad9e84d7..87b12dac 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index f86597fa..e98ddc2e 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
index fc1ff439..2614c25e 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.dll
index 4ffd9364..e60d6a2b 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.pdb
index 8b269176..f26b87a0 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll
index b58367ed..838d0195 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb
index 784bd7d9..4fd4e3bc 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll
index b0940503..28704f3f 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb
index 6644af2b..c2d7e187 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
index ebfca430..b608ae61 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
index ba8e0b1d..14d571d1 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.dll
index b1b00841..5e008b08 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.pdb
index 82924f8b..5d2bda89 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.pdb differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
index bb2e19b9..6d5fa655 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache
index 1092783b..2cd35c62 100644
--- a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache
+++ b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-583c5b6c645debe49d04428230dc2fe6d47bad28
+fc3d09b7d5a7b7e0dc9fb01d4cdd7deca8d1e7c3
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt
index f204a33e..d70fe168 100644
--- a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt
+++ b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt
@@ -132,3 +132,52 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.dll
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.pdb
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.xml
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\SqlSugar.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HslCommunication.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
index f86597fa..e98ddc2e 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
index fc1ff439..2614c25e 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.dll b/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.dll
index 4ffd9364..e60d6a2b 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.dll and b/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.dll differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.pdb b/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.pdb
index 8b269176..f26b87a0 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.pdb and b/Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.pdb differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.dll and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.dll differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.pdb and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.dll and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.pdb and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
index 411459be..25e46a2f 100644
Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
index 59ad5870..d8ebb060 100644
--- a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
+++ b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-62462d30f462e01d406676454f558c2316152f02
+3eb32e1004be51a33739d5edaf789c03063b8825
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt
index 001a9b35..b24acc6d 100644
--- a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt
+++ b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt
@@ -32,3 +32,20 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.dll b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.dll
index 4ffd9364..e60d6a2b 100644
Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.dll and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.dll differ
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.pdb b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.pdb
index 8b269176..f26b87a0 100644
Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.pdb and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.pdb differ
diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll
index b58367ed..838d0195 100644
Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll differ
diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb
index 784bd7d9..4fd4e3bc 100644
Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
index 0767cbb8..091978bd 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache
index aec059bb..358e26eb 100644
--- a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache
+++ b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-936f1a7acc7fd093726a38678830636b5a490d72
+0950971ed41497fad7d277ed90ba33c6b3992ef2
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt
index 8d643975..43d39b6f 100644
--- a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt
+++ b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt
@@ -14,3 +14,11 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.cspro
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
 E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\SqlSugar.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll
index b58367ed..838d0195 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb
index 784bd7d9..4fd4e3bc 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
index f86597fa..e98ddc2e 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
index fc1ff439..2614c25e 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.dll
index 4ffd9364..e60d6a2b 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.pdb
index 8b269176..f26b87a0 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll
index b58367ed..838d0195 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb
index 784bd7d9..4fd4e3bc 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 004acebe..3897f7c8 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
index d3998770..91acf67e 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll
index b0940503..28704f3f 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb
index 6644af2b..c2d7e187 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
index ebfca430..b608ae61 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
index ba8e0b1d..14d571d1 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.dll
index b1b00841..5e008b08 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.pdb
index 82924f8b..5d2bda89 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.TouchSocket.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
index f8ae2d01..02e93231 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
index 004acebe..3897f7c8 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index d3998770..91acf67e 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
index e7b5f0e3..c7462e07 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
@@ -9,12 +9,15 @@ using HighWayIot.Common;
 using HighWayIot.Config;
 using HighWayIot.Repository.service;
 using LiveCharts;
+using LiveCharts.Defaults;
 using LiveCharts.Wpf;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
@@ -45,6 +48,12 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             outStoreBusiness.RefreshAssemblyPlanInitEvent += RefreshPlanInfoDataGrid;
             assemblyPlanBusiness.PrintMessageEvent += PrintMessage;
             Init();
+
+            Task.Run(() =>
+            {
+                Thread.Sleep(10000);
+                RefreshHourAmount();
+            });
         }
 
         #region 参数定义
@@ -504,7 +513,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                     Achievement.Clear();
                     ProductionHourList.Clear();
                     ProductionHourList = new List<string>();
-                    ChartValues<double> hourAchievement = new ChartValues<double>();
+                    ChartValues<ObservablePoint> hourAchievement = new ChartValues<ObservablePoint>();
+                    int i = 0;
                     foreach (var item in hourAmount)
                     {
                         if(DateTime.Now.Hour>=8 && DateTime.Now.Hour <= 20)//白班
@@ -512,7 +522,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                             if (int.Parse(item.PRODUCT_HOUR) >= 8 && int.Parse(item.PRODUCT_HOUR) < 20)
                             {
                                 ProductionHourList.Add(item.PRODUCT_HOUR);
-                                hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
+                                
+                                hourAchievement.Add(new ObservablePoint(i++, Convert.ToDouble(item.PRODUCT_AMOUNT)));
                             }
                         }
                         else
@@ -520,11 +531,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                             if (int.Parse(item.PRODUCT_HOUR) < 8 || int.Parse(item.PRODUCT_HOUR) >= 20) //夜班
                             {
                                 ProductionHourList.Add(item.PRODUCT_HOUR);
-                                hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
+                                hourAchievement.Add(new ObservablePoint(i++, Convert.ToDouble(item.PRODUCT_AMOUNT)));
                             }
                         }
-                        
-                       
+                      
                     }
                     var houeColumn = new ColumnSeries();
                     houeColumn.DataLabels = true;
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index 53533bd5..d1ecd9c9 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache
index b892ae87..2af98b5a 100644
--- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cc485710ee7abbf37329b9de5fbe565ab0eced44
+ab08d6d9e81661c4a30f788cc7edd459395aab0b
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt
index c73289b9..b095d3ea 100644
--- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt
@@ -82,3 +82,15 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.cspro
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
index de4620e9..14eb7ade 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache
index 49a0015c..6a9d3488 100644
--- a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-071e6bee6b7b08fc187cd293e005ec97edd9a03b
+4a736cc23d6374b411d9c1707e05948754591004
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt
index 036e4eca..5699c159 100644
--- a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt
@@ -54,3 +54,17 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.cspro
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache
index 32039e4d..896fffee 100644
--- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-703e552de3965c09411e20a995cd0166bd015281
+a3b47c704bcb402ad4db59cfbb314435fb05a51c
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
index 222bfda5..a2b04dd3 100644
--- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
@@ -52,3 +52,11 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csp
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll
index b0940503..28704f3f 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll differ
diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb
index 6644af2b..c2d7e187 100644
Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
index 75505b7e..d14ceb94 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache
index 69905190..96435032 100644
--- a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-609886f02da4a2aae3fff771db082dba755ebebb
+8183a0a9755b329030b4405e31ff3cdff26d35b0
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt
index 0006e616..93619870 100644
--- a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt
@@ -103,3 +103,18 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.Core
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HslCommunication.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll
index b0940503..28704f3f 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb
index 6644af2b..c2d7e187 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll
index b58367ed..838d0195 100644
Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb
index 784bd7d9..4fd4e3bc 100644
Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
index ebfca430..b608ae61 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
index ba8e0b1d..14d571d1 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 460beb8b..5241478a 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
index 4a12ee4a..d6b1d364 100644
--- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-aeaf432ff22cb494ff7d06020a0edeeea20c10ca
+8268ef75e934b3c7467087a35ed671c833a8cc6c
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
index 461bfe63..96cdac67 100644
--- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
@@ -136,3 +136,28 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Reposito
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\Oracle.ManagedDataAccess.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\System.Memory.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\System.Threading.Tasks.Extensions.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\System.Numerics.Vectors.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\System.Buffers.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
index ebfca430..b608ae61 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
index ba8e0b1d..14d571d1 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.dll
index 3f7a2093..4fb5cd58 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.dll differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.pdb
index ff0f9b41..1f408284 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Common.pdb differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.dll
index 7ea4be2e..220f8bdf 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.pdb
index 757a1df0..f46de720 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.dll
index 939e2dfd..68230cbb 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.pdb
index fabd3cf5..40475460 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll
index b1b00841..5e008b08 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll differ
diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb
index 82924f8b..5d2bda89 100644
Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb differ
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache
index 1657914e..2ff28152 100644
Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache
index 1892d63e..d242fc74 100644
--- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0f429a5489c25f94703d4202b0aaf003bce72300
+86549dbecb37bee94a470146da86847d5b340df6
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
index a451ef58..aa2dd37a 100644
--- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
+++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
@@ -64,3 +64,23 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.TouchSocket\bin\Debug\log4net.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Config.pdb
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Common.pdb
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\TouchSocket.Core.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\TouchSocket.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\TouchSocket.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\TouchSocket.Core.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll
index b1b00841..5e008b08 100644
Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll differ
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb
index 82924f8b..5d2bda89 100644
Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb differ