diff --git a/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx b/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx
new file mode 100644
index 00000000..16bc7e42
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/17c4cbf0-405e-47cd-9c6d-7c09f592e00f.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx b/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx
new file mode 100644
index 00000000..be9add90
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/3a7d4d14-6f80-4bf9-888d-4da9e3812652.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx b/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx
new file mode 100644
index 00000000..332fe2da
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/487d5983-1b1e-48e6-9d56-ec079e1c717b.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx b/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx
new file mode 100644
index 00000000..02206011
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/8fc155b2-466d-417e-aee1-d1b34c03ea6d.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 62577941..2943e142 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo 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 9416371f..2faa3f90 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/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index 134e0039..f9f56c9e 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -243,23 +243,26 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                     {
                         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
                     {
-                        
-                        App.Current.Dispatcher.BeginInvoke((Action)(() =>
+                        if(info.Count > 0)
                         {
-                            foreach (var item in info)
+                            info = info.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1).ToList();
+                            App.Current.Dispatcher.BeginInvoke((Action)(() =>
                             {
-                                item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
-                                taskItems.Add(item);
-                            }
-
-                            InstoreTask = taskItems;
-                        }));
+                                foreach (var item in info)
+                                {
+                                    item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
+                                    taskItems.Add(item);
+                                }
+
+                                InstoreTask = taskItems;
+                            }));
+                        }
                     }
                     catch (Exception ex)
                     {
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 075f4307..ea6828b3 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/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index 715b851c..596fa0f7 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ