diff --git a/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx b/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx new file mode 100644 index 00000000..1dfcdfa4 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx b/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx deleted file mode 100644 index 52194e0f..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx b/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx new file mode 100644 index 00000000..01a3ab93 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx b/.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx deleted file mode 100644 index 4fa03dd8..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/9969a781-3aa8-4fc8-826a-069fe256bbcc.vsidx b/.vs/HighWayIot/FileContentIndex/9969a781-3aa8-4fc8-826a-069fe256bbcc.vsidx new file mode 100644 index 00000000..2aa126c5 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/9969a781-3aa8-4fc8-826a-069fe256bbcc.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx b/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx deleted file mode 100644 index 8c2374a2..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx b/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx deleted file mode 100644 index 5c22ad28..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx b/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx new file mode 100644 index 00000000..dd74726f Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index b4ec4e49..c74401e7 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo 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 9a2c279c..bb2e19b9 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/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3ec94a4d..23939056 100644 Binary files a/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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 d58a4231..411459be 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/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.HikRobot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1e705724..46e2082a 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.HikRobot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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 85122cca..0767cbb8 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/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index af5a14b5..c36fb8b5 100644 Binary files a/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index ec1714b6..5a346736 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -250,7 +250,7 @@ - + diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml index 820bc9a3..14d3c994 100644 --- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml +++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml @@ -164,7 +164,7 @@ - + diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index c8e5d3c2..12424399 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 979d674a..e98032aa 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/config/Plc.Ini b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini index bb73daf3..b56f0ebe 100644 --- a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini @@ -1,6 +1,6 @@ [plcSystem] ÅݺóPLCIP=10.10.92.49 -ÅݺóPLC¶Ë¿Ú=2015 +ÅݺóPLC¶Ë¿Ú=6000 [foam_inStore_address] Èë¿â»õµÀºÅ=D7000 Èë¿âÓ¦´ð×Ö=D7010 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 6d787821..f8ae2d01 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.csproj.CoreCompileInputs.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache index 3a252b2a..9fd5ac9d 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -66dc833451ad9e0ac999f9d13be269d1f7a6fbe5 +03944b5825fa0e59c458aa58e375ee42c7ce2f0f diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt index e6e90d54..47c1c715 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt @@ -467,3 +467,121 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.dll E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.pdb E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.xml E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\log4net.config +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\MySql.Data.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\SqlSugar.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\MvCodeReaderSDK.Net.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\log4net.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HslCommunication.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Memory.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Threading.Tasks.Extensions.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Numerics.Vectors.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\System.Buffers.dll +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll.config +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SelectType.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SelectType.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\App.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_Content.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\App.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\MainWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\RecordControl.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\templates\style\resourceStyle.baml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.g.resources +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.Properties.Resources.resources +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.GenerateResource.cache +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CoreCompileInputs.cache +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index c8e5d3c2..12424399 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.g.resources b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources index 60f0d004..049f9ac6 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index 979d674a..e98032aa 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/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache index baee2bb3..3471f70f 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache @@ -4,16 +4,16 @@ exe C# .cs -E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\ +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\obj\Debug\ Aucma.Scada.UI none false DEBUG;TRACE -E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml +E:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\App.xaml 19-2058867325 1-1257182505 46975812225 -138-1776864311 +138-632958852 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\AssemblyPlan\QuantityIssuedWindow.xaml;Page\AssemblyPlan\SearchCriteriaWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\SelectType.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\MaterialStatisticsWindow.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; False diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref index 14ae4818..ab938eb4 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,21 +1,21 @@ -E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\LogInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\MainWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\RecordControl.xaml;; -FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; + +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\App.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\LogInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\MainWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\RecordControl.xaml;; +FE:\c#\AUCMA\最新代ç æ•´åˆ\泡åŽåº“\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4f253bcf..6bbe88d6 100644 Binary files a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs index c65238fb..ffa4e1ed 100644 --- a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代ç ç”±å·¥å…·ç”Ÿæˆã€‚ +// è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000 +// +// 对此文件的更改å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为，并且如果 +// é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚ +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml index ca40532e..737e295e 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs index a8d74094..865f5f3a 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BEB53D75A4757A671CE4554930B98D074400F812CFB70A553BCCE7B5000EFCB" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9" //------------------------------------------------------------------------------ // // 此代ç ç”±å·¥å…·ç”Ÿæˆã€‚ diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs index a8d74094..865f5f3a 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BEB53D75A4757A671CE4554930B98D074400F812CFB70A553BCCE7B5000EFCB" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9" //------------------------------------------------------------------------------ // // 此代ç ç”±å·¥å…·ç”Ÿæˆã€‚ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml index a11e5684..a74e563f 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs index f0004e46..915aa5fd 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "416B2196F600FFAA27F093BCE2AD98352E095479A2F612BD81E3D94D8697A743" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1" //------------------------------------------------------------------------------ // // 此代ç ç”±å·¥å…·ç”Ÿæˆã€‚ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs index f0004e46..915aa5fd 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "416B2196F600FFAA27F093BCE2AD98352E095479A2F612BD81E3D94D8697A743" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1" //------------------------------------------------------------------------------ // // 此代ç ç”±å·¥å…·ç”Ÿæˆã€‚ diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index c8d6369c..e7b5f0e3 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -495,12 +495,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan /// private void RefreshHourAmount() { - + //获å–å°æ—¶äº§é‡ + List hourAmount = assemblyPlanBusiness.GetHourAmount(); App.Current.Dispatcher.Invoke((Action)(() => - { - - //获å–å°æ—¶äº§é‡ - List hourAmount = assemblyPlanBusiness.GetHourAmount(); + { if (hourAmount != null) { Achievement.Clear(); @@ -509,8 +507,24 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan ChartValues hourAchievement = new ChartValues(); foreach (var item in hourAmount) { - ProductionHourList.Add(item.PRODUCT_HOUR); - hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT)); + if(DateTime.Now.Hour>=8 && DateTime.Now.Hour <= 20)//ç™½ç­ + { + 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)); + } + } + else + { + 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)); + } + } + + } var houeColumn = new ColumnSeries(); houeColumn.DataLabels = true; diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index 8f22db6d..bc663ea2 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -291,7 +291,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo ChartValues achievement = new ChartValues(); MaterialNameList = new List(); - var info = inStoreBusiness.GetFoamStoreStock(); + var info = inStoreBusiness.GetFoamStoreStock(); App.Current.Dispatcher.BeginInvoke((Action)(() => { @@ -303,12 +303,12 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo if (!string.IsNullOrEmpty(item.materialType)) { string name = inStoreBusiness.GetMaterialName(item.materialType); - MaterialNameList.Add(name.Substring(0,Math.Min(name.Length,10))); + MaterialNameList.Add(GetTextBetweenCommas(name)); achievement.Add(item.storeStock); } } } - + var column = new ColumnSeries(); column.DataLabels = true; column.Title = "泡åŽåº“"; @@ -318,6 +318,30 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo })); } + public static string GetTextBetweenCommas(string input) + { + // 查找第一个逗å·çš„ä½ç½® + int firstCommaIndex = input.IndexOf(','); + + + if (firstCommaIndex == -1) + { + return input; + } + + // 查找第二个逗å·çš„ä½ç½®ï¼Œä»Žç¬¬ä¸€ä¸ªé€—å·çš„下一个ä½ç½®å¼€å§‹æŸ¥æ‰¾ + int secondCommaIndex = input.IndexOf(',', firstCommaIndex + 1); + + // 如果找ä¸åˆ°ç¬¬äºŒä¸ªé€—å·ï¼Œåˆ™è¿”回从第一个逗å·åˆ°å­—符串末尾的å­å­—符串 + if (secondCommaIndex == -1) + { + return input; + } + + // 截å–两个逗å·ä¹‹é—´çš„字符 + return input.Substring(firstCommaIndex + 1, secondCommaIndex - firstCommaIndex - 1); + } + /// /// 刷新入库任务列表 /// diff --git a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fb29dabc..5e2be21f 100644 Binary files a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 4d336766..53533bd5 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.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bf9fb44d..8ff5008d 100644 Binary files a/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index 93f707ea..de4620e9 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.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 58670266..340da102 100644 Binary files a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index b9aef0a8..087037c5 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6b06efbb..b7574019 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index 85a6f63b..a50fcac0 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f5c0fa65..4ec78c5a 100644 Binary files a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 3fd08dff..75505b7e 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.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7af1664a..2e70c435 100644 Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 95cf4047..460beb8b 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.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5e9791b8..11c2fd14 100644 Binary files a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index 51ab490d..b65d5116 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 57409b38..12876cc1 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 7f0f9d35..1657914e 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0d24602e..6601a0af 100644 Binary files a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 3244c7be..f06daf68 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ