diff --git a/.vs/HighWayIot/FileContentIndex/4e78f1af-df1f-4396-968b-db5a1a1a1fbc.vsidx b/.vs/HighWayIot/FileContentIndex/4e78f1af-df1f-4396-968b-db5a1a1a1fbc.vsidx new file mode 100644 index 00000000..556c040c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/4e78f1af-df1f-4396-968b-db5a1a1a1fbc.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/56818877-0eb3-4814-ba3b-51bc3ea74f52.vsidx b/.vs/HighWayIot/FileContentIndex/56818877-0eb3-4814-ba3b-51bc3ea74f52.vsidx new file mode 100644 index 00000000..04bc00b8 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/56818877-0eb3-4814-ba3b-51bc3ea74f52.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx b/.vs/HighWayIot/FileContentIndex/588a694c-e680-4018-8ed9-2706da0088ea.vsidx similarity index 67% rename from .vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx rename to .vs/HighWayIot/FileContentIndex/588a694c-e680-4018-8ed9-2706da0088ea.vsidx index 6d9bdcd5..e1392acd 100644 Binary files a/.vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx and b/.vs/HighWayIot/FileContentIndex/588a694c-e680-4018-8ed9-2706da0088ea.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx b/.vs/HighWayIot/FileContentIndex/ff66222b-0f78-4f82-a788-8761757f140e.vsidx similarity index 65% rename from .vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx rename to .vs/HighWayIot/FileContentIndex/ff66222b-0f78-4f82-a788-8761757f140e.vsidx index 10b7f384..b41b1ff1 100644 Binary files a/.vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx and b/.vs/HighWayIot/FileContentIndex/ff66222b-0f78-4f82-a788-8761757f140e.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 8e4cd68a..a55a833e 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index f31c09b4..92753ea6 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -103,9 +103,9 @@ namespace Aucma.Scada.Business //Task.Run(() => //{ // Thread.Sleep(6000); - // for (int i = 1; i < 15; i++) + // for (int i = 1; i < 3; i++) // { - // InStore("F2340600122510190" + i.ToString().PadLeft(2,'0')); + // InStore("F2340600122510190" + i.ToString().PadLeft(2, '0')); // Thread.Sleep(1000); // } //}); diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index c1518365..13153e7b 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 f588e891..3a4e8508 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/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index a2850863..1835d205 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.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index c1518365..13153e7b 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 f588e891..3a4e8508 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/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index d3269d88..adcf72c4 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.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index c1518365..13153e7b 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 f588e891..3a4e8508 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.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 40528e2f..154175e5 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 ba72eab6..24f7c5c1 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/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 9d6da8e9..6f44751a 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 40528e2f..154175e5 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 14318ee0..62147513 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 ba72eab6..24f7c5c1 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.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref index 46f22ffa..f3caf620 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,4 +1,4 @@ -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs + FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; 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/MainWindow.baml b/Aucma.Scada.UI/obj/Debug/MainWindow.baml index 87646e25..9678fb42 100644 Binary files a/Aucma.Scada.UI/obj/Debug/MainWindow.baml and b/Aucma.Scada.UI/obj/Debug/MainWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs index 1951b60e..bd7f1ab6 100644 --- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs +++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "638A8878353241AB42E35E5685925D9F0CFF05E8C4379C5912D6CA9388326C41" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABE42667B526D4F2B0598785A37321B62458FBBD8BF44BD41D21D42410859ADD" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml index b93d0bfc..f808581b 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 89219b25..21cf7beb 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}" "430915393B7A687977740039B60BB56C199BB3E802591274D005F1B9698F1B23" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC24A1F20A67FD0EDFFAEE4607BA434052DADE4FF94D21C5A849EFFE3DB35D6A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index be030bc3..d8c8f4c5 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -257,6 +257,9 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// public void Init() { + + Query(); + ChartValues achievement = new ChartValues(); MaterialNameList = new List(); @@ -294,7 +297,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo { if (isFinsih) { - Query(); Init(); } else diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index be9b150d..f0f6b71a 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