diff --git a/.vs/HighWayIot/FileContentIndex/0e473ff0-62ed-4cca-bda2-1967a1426d3a.vsidx b/.vs/HighWayIot/FileContentIndex/0e473ff0-62ed-4cca-bda2-1967a1426d3a.vsidx
new file mode 100644
index 00000000..8244e725
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/0e473ff0-62ed-4cca-bda2-1967a1426d3a.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/280d9ff4-74fe-4866-9b0a-8bdd8b8e518c.vsidx b/.vs/HighWayIot/FileContentIndex/280d9ff4-74fe-4866-9b0a-8bdd8b8e518c.vsidx
new file mode 100644
index 00000000..49a7d250
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/280d9ff4-74fe-4866-9b0a-8bdd8b8e518c.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/3016b17b-5aac-46b5-9b87-ae988a739edd.vsidx b/.vs/HighWayIot/FileContentIndex/3016b17b-5aac-46b5-9b87-ae988a739edd.vsidx
new file mode 100644
index 00000000..e8af46ce
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/3016b17b-5aac-46b5-9b87-ae988a739edd.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/df24f53e-6585-430e-afe0-266ad7546d80.vsidx b/.vs/HighWayIot/FileContentIndex/df24f53e-6585-430e-afe0-266ad7546d80.vsidx
new file mode 100644
index 00000000..1640e6ce
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/df24f53e-6585-430e-afe0-266ad7546d80.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 7e565e39..7d1fe801 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 3571e898..9d320c74 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -104,8 +104,8 @@ namespace Aucma.Scada.Business
             //    {
             //        InStore(appConfig.shellStoreCode, "B2360000078110240" + i.ToString().PadLeft(2, '0'));
             //        Thread.Sleep(1000);
-            //        InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
-            //        Thread.Sleep(1000);
+            //        //InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
+            //        //Thread.Sleep(1000);
             //    }
             //});
 
@@ -194,6 +194,7 @@ namespace Aucma.Scada.Business
 
             Task.Run(() =>
             {
+                Thread.Sleep(5000);
                 while (true)
                 {
                     PassDownShellTask();
@@ -203,6 +204,7 @@ namespace Aucma.Scada.Business
 
             Task.Run(() =>
             {
+                Thread.Sleep(5000);
                 while (true)
                 {
                     PassDownLinerTask();
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index f3c6be64..4a1cedbf 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 4eb4ed62..92ea9035 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 92548a06..7af272cd 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 f3c6be64..4a1cedbf 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 4eb4ed62..92ea9035 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 cb2b0a34..f6880d7c 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 f3c6be64..4a1cedbf 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 4eb4ed62..92ea9035 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 8346ee2b..5c5e9988 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 dfc23699..b2eecdc1 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 107f2ccd..72c1f013 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 8346ee2b..5c5e9988 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.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index dfc23699..b2eecdc1 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/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index f9f56c9e..08ce70b1 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -227,29 +227,28 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
             lock (string.Empty)
             {
-                #region 通过数据库获取数据进行刷新
-                var info = inStoreBusiness.GetInStoreTask();
-                if (info != null)
+                try
                 {
-                    if (materialTypeCombox == "箱壳")
-                    {
-                        materialTypeCombox = appConfig.shellStoreCode;
-                    }
-                    else if (materialTypeCombox == "内胆")
-                    {
-                        materialTypeCombox = appConfig.linerStoreCode;
-                    }
-                    else if (materialTypeCombox == "所有")
-                    {
-                        materialTypeCombox = string.Empty;
-                    }
-                    
-
                     taskItems = new ObservableCollection<RealTaskInfo>();
-                    //info.ForEach(x => RefreshInStoreTask(x));
-                    try
+                    #region 通过数据库获取数据进行刷新
+                    var info = inStoreBusiness.GetInStoreTask();
+                    if (info != null)
                     {
-                        if(info.Count > 0)
+                        if (materialTypeCombox == "箱壳")
+                        {
+                            materialTypeCombox = appConfig.shellStoreCode;
+                        }
+                        else if (materialTypeCombox == "内胆")
+                        {
+                            materialTypeCombox = appConfig.linerStoreCode;
+                        }
+                        else if (materialTypeCombox == "所有")
+                        {
+                            materialTypeCombox = string.Empty;
+                        }
+
+                        //info.ForEach(x => RefreshInStoreTask(x));
+                        try
                         {
                             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)(() =>
@@ -263,13 +262,16 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                                 InstoreTask = taskItems;
                             }));
                         }
+                        catch (Exception ex)
+                        {
+                            logHelper.Error("入库任务列表刷新异常", ex);
+                        }
                     }
-                    catch (Exception ex)
-                    {
-                        logHelper.Error("入库任务列表刷新异常", ex);
-                    }
+                    #endregion
+                }catch(Exception ex)
+                {
+                    logHelper.Error("入库任务加载异常", ex);
                 }
-                #endregion
             }
         }
 
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index d2a1b77a..db5fd47c 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 edf0435c..a0b34a89 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ