diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 44d9aa2d..72a28c60 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.UI/obj/Debug/App.baml b/Aucma.Scada.UI/obj/Debug/App.baml
deleted file mode 100644
index c3b81697..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/App.baml and /dev/null 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 2fc440af..106b84cb 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_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
index f8575746..d83d5696 100644
--- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
+++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
@@ -12,9 +12,9 @@ DEBUG;TRACE
 E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\App.xaml
 201095146790
 1-1257182505
-48295368729
+49-2077820446
 148-1086948104
 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;LoginPageView.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
-False
+True
 
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 769a61bc..820e61ce 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:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
 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;;
diff --git a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 53d52ac3..9ccf2739 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 @@
-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [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 {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        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);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        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);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        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);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        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)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        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/LogInfoControl.baml b/Aucma.Scada.UI/obj/Debug/LogInfoControl.baml
deleted file mode 100644
index 4b93d1f8..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/LogInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/LoginPageView.baml b/Aucma.Scada.UI/obj/Debug/LoginPageView.baml
deleted file mode 100644
index 6bd8fba9..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/LoginPageView.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.baml b/Aucma.Scada.UI/obj/Debug/MainWindow.baml
deleted file mode 100644
index 12b118c7..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/MainWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml
deleted file mode 100644
index 73b75c54..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml
deleted file mode 100644
index 767268f9..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.baml
deleted file mode 100644
index 96d8a532..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/SearchCriteriaWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/SearchCriteriaWindow.baml
deleted file mode 100644
index b9294547..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/SearchCriteriaWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml
deleted file mode 100644
index 152104b1..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml
deleted file mode 100644
index c2235c1d..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml
deleted file mode 100644
index b56a8fa5..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml
deleted file mode 100644
index 074b05b4..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml
deleted file mode 100644
index db0f5d98..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml
deleted file mode 100644
index dc4ca31c..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml
deleted file mode 100644
index 5576d093..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml
deleted file mode 100644
index b7c5a392..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml
deleted file mode 100644
index bb68be36..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml
deleted file mode 100644
index 8c13e550..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/RecordControl.baml b/Aucma.Scada.UI/obj/Debug/RecordControl.baml
deleted file mode 100644
index 53f6a5f4..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/RecordControl.baml and /dev/null differ
diff --git a/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml b/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml
deleted file mode 100644
index f6d047ff..00000000
Binary files a/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml and /dev/null differ