diff --git a/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx b/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx
new file mode 100644
index 00000000..6865bdaf
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx b/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx
new file mode 100644
index 00000000..cc2ca840
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx b/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx
new file mode 100644
index 00000000..4be628d2
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx b/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx
new file mode 100644
index 00000000..ef9674f1
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 7185071b..3974a72f 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 80878e75..46fa644f 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -99,9 +99,9 @@ namespace Aucma.Scada.Business
             //Task.Run(() =>
             //{
             //    Thread.Sleep(6000);
-            //    for (int i = 1; i < 3; i++)
+            //    for (int i = 1; i < 9; i++)
             //    {
-            //        InStore("F23406001225101900" + i);
+            //        InStore("F23406001225101901" + i);
             //    }
             //});
         }
@@ -304,10 +304,11 @@ namespace Aucma.Scada.Business
                     if (spaceInfo != null)
                     {
                         //读取PLC获取货道信息：存放数量、在途数量
+                        //实际应用改为读取PLC库存信息
                         spaceInfo.materialType = taskInfo.materialType;
                         spaceInfo.spaceStock = spaceInfo.spaceStock + 1;
+                        spaceInfo.onRouteAmount -= 1;
                         _spaceInfoService.UpdateSpaceInfo(spaceInfo);
-
                         #region 添加货道明细
                         BaseSpaceDetail spaceDetail = new BaseSpaceDetail();
                         spaceDetail.materialType = taskInfo.materialType;
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index 332ef52c..e4fac451 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 b15c3ddd..b97142ab 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 0a1dc69a..c76c5583 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 332ef52c..e4fac451 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 b15c3ddd..b97142ab 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 b8bb8c30..2c234555 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.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
index 75f86db8..63ddfe65 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.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 332ef52c..e4fac451 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 b15c3ddd..b97142ab 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 88b4f39b..5a7f3487 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 d213d038..8989795d 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 4b034eab..fe19e1e5 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 88b4f39b..5a7f3487 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 d213d038..8989795d 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/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
index 8ef4829b..5f6e555e 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
@@ -259,17 +259,20 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 
         private void RefreshPlanInfoDataGrid()
         {
-            App.Current.Dispatcher.Invoke((Action)(() =>
+            App.Current.Dispatcher.BeginInvoke((Action)(() =>
             {
                 var planInfos = assemblyPlanBusiness.GetEexecutePlanInfosByProductLineCode();
                 RefreshDataGrid(planInfos);
 
-                //加载正在执行的计划
-                planInfos = planInfos.Where(x => x.executeStatus == 2).ToList();
-                if (planInfos.Count > 0)
+                if(planInfos != null)
                 {
-                    ExecutePlanInfo planInfo = planInfos.OrderBy(x => x.executeOrder).First();
-                    RefreshPlanExecute(planInfo);
+                    //加载正在执行的计划
+                    planInfos = planInfos.Where(x => x.executeStatus == 2).ToList();
+                    if (planInfos.Count > 0)
+                    {
+                        ExecutePlanInfo planInfo = planInfos.OrderBy(x => x.executeOrder).First();
+                        RefreshPlanExecute(planInfo);
+                    }
                 }
 
                 OrderCode = string.Empty;
diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index 44bc7fd2..99d071ac 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -212,16 +212,15 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                     //info.ForEach(x => RefreshInStoreTask(x));
                     try
                     {
-                        foreach (var item in info)
+                        App.Current.Dispatcher.BeginInvoke((Action)(() =>
                         {
-
-                            App.Current.Dispatcher.Invoke((Action)(() =>
+                            foreach (var item in info)
                             {
                                 item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
                                 taskItems.Add(item);
                                 InstoreTask = taskItems;
-                            }));
-                        }
+                            }
+                        }));
                     }
                     catch (Exception ex)
                     {
@@ -256,10 +255,8 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
             var info = inStoreBusiness.GetFoamStoreStock();
             
-            App.Current.Dispatcher.Invoke((Action)(() =>
+            App.Current.Dispatcher.BeginInvoke((Action)(() =>
             {
-                Query();
-
                 if (info != null)
                 {
                     Achievement.Clear();
@@ -290,6 +287,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         {
             if (isFinsih)
             {
+                Query();
                 Init();
             }
             else
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index 1f813c1f..b307cd12 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
index 26b6864e..b10e2edd 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
index d88a5f60..21d36cac 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 80d9ed34..bc5f2e1d 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.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
index e42a1f16..418818eb 100644
Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index f016e4d4..4dd23844 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ