change - 入库查询问题修改,下拉框取值为空

Aucma.Scada.Business/InStoreBusiness.cs

@@ -100,11 +100,11 @@ namespace Aucma.Scada.Business
             //Task.Run(() =>
             //{
             //    Thread.Sleep(6000);
-            //    for (int i = 1; i < 15; i++)
+            //    for (int i = 1; i < 3; i++)
             //    {
-            //        InStore(appConfig.shellStoreCode, "B2360000078110230" + i.ToString().PadLeft(2, '0'));
+            //        InStore(appConfig.shellStoreCode, "B2360000078110240" + i.ToString().PadLeft(2, '0'));
             //        Thread.Sleep(1000);
-            //        InStore(appConfig.linerStoreCode, "L2360000078810230" + i.ToString().PadLeft(2, '0'));
+            //        InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
             //        Thread.Sleep(1000);
             //    }
             //});

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;;

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);
+        }
+    }
+}
 

Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs

@@ -231,6 +231,20 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                 var info = inStoreBusiness.GetInStoreTask();
                 if (info != null)
                 {
+                    if (materialTypeCombox == "箱壳")
+                    {
+                        materialTypeCombox = appConfig.shellStoreCode;
+                    }
+                    else if (materialTypeCombox == "内胆")
+                    {
+                        materialTypeCombox = appConfig.linerStoreCode;
+                    }
+                    else if (materialTypeCombox == "所有")
+                    {
+                        materialTypeCombox = string.Empty;
+                    }
+                    info = info.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1).ToList();
+
                     taskItems = new ObservableCollection<RealTaskInfo>();
                     //info.ForEach(x => RefreshInStoreTask(x));
                     try
@@ -242,8 +256,9 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                             {
                                 item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
                                 taskItems.Add(item);
-                                InstoreTask = taskItems;
                             }
+
+                            InstoreTask = taskItems;
                         }));
                     }
                     catch (Exception ex)
@@ -252,20 +267,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                     }
                 }
                 #endregion
-
-                if (materialTypeCombox == "箱壳")
-                {
-                    materialTypeCombox = "X-001";
-                }
-                else if (materialTypeCombox == "内胆")
-                {
-                    materialTypeCombox = "X-002";
-                }
-                else
-                {
-                    materialTypeCombox = string.Empty;
-                }
-                InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1);
             }
         }
 
@@ -286,6 +287,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// </summary>
         public void Init()
         {
+            Query();
             ChartValues<double> achievement = new ChartValues<double>();
             ChartValues<double> achievement2 = new ChartValues<double>();
             App.Current.Dispatcher.BeginInvoke((Action)(() =>
@@ -335,8 +337,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         {
             if (isFinsih)
             {
-
-                Query();
                 Init();
             }
             else