diff --git a/.vs/HighWayIot/FileContentIndex/5a565e98-84ca-4fa1-96e0-7dd77e803d93.vsidx b/.vs/HighWayIot/FileContentIndex/5a565e98-84ca-4fa1-96e0-7dd77e803d93.vsidx
new file mode 100644
index 00000000..c9cbe8eb
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5a565e98-84ca-4fa1-96e0-7dd77e803d93.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/5dffe236-e69e-44a9-b9a5-90983356d344.vsidx b/.vs/HighWayIot/FileContentIndex/5dffe236-e69e-44a9-b9a5-90983356d344.vsidx
new file mode 100644
index 00000000..bd981890
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5dffe236-e69e-44a9-b9a5-90983356d344.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/c0a097c3-e5fa-4d5e-8e02-bc30c7f39b95.vsidx b/.vs/HighWayIot/FileContentIndex/c0a097c3-e5fa-4d5e-8e02-bc30c7f39b95.vsidx
new file mode 100644
index 00000000..89c81171
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/c0a097c3-e5fa-4d5e-8e02-bc30c7f39b95.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/f77a71fa-cb06-4736-b82b-ab9100e8f8f0.vsidx b/.vs/HighWayIot/FileContentIndex/f77a71fa-cb06-4736-b82b-ab9100e8f8f0.vsidx
new file mode 100644
index 00000000..2f0be7c6
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f77a71fa-cb06-4736-b82b-ab9100e8f8f0.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 8ec00df4..72da6925 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 c4b10463..b4cc911e 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -4,8 +4,10 @@ using HighWayIot.Config;
 using HighWayIot.Log4net;
 using HighWayIot.Repository.service;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using static Aucma.Scada.Business.InStoreTaskHandle;
 
 namespace Aucma.Scada.Business
 {
@@ -79,6 +81,7 @@ namespace Aucma.Scada.Business
         {
             _spaceInfoService = registerServices.GetService<IBaseSpaceInfoService>();
             _taskInfoService = registerServices.GetService<IRealTaskInfoService>();
+            taskHandle.InStoreFinsihEvent += TaskFeedback;
             grabImage.RefreshMaterialCodeStrEvent += InStore;
             grabImage.RefreshLogMessageEvent += PrintLogInfoMessage;
             StartPassDown();
@@ -299,28 +302,38 @@ namespace Aucma.Scada.Business
             return taskInfo;
         }
 
+        private void TaskFeedback(string storeCode,string taskCode)
+        {
+            if(storeCode == appConfig.shellStoreCode)
+            {
+                ShellTaskFeedback(taskCode);
+            }
+            else
+            {
+                LinerTaskFeedback(taskCode);
+            }
+        }
+
         /// <summary>
         /// 箱壳执行反馈
         /// </summary>
-        private void ShellTaskFeedback()
+        private void ShellTaskFeedback(string taskCode)
         {
 
-            Thread.Sleep(4000);
-
             PrintLogInfoMessage("箱壳执行完成，自动释放信号量");
 
+            InStoreFinish(appConfig.shellStoreCode, taskCode);
+
             shellSemaphore.Release();
         }
 
         /// <summary>
         /// 内胆执行反馈
         /// </summary>
-        private void LinerTaskFeedback()
+        private void LinerTaskFeedback(string LinerTaskFeedback)
         {
-            Thread.Sleep(8000);
-
             PrintLogInfoMessage("内胆执行完成，自动释放信号量");
-
+            InStoreFinish(appConfig.linerStoreCode, LinerTaskFeedback);
             linerSemaphore.Release();
         }
         #endregion
@@ -380,7 +393,7 @@ namespace Aucma.Scada.Business
         }
 
         /// <summary>
-        /// 截图条码
+        /// 截取条码
         /// </summary>
         /// <param name="materialCode"></param>
         /// <returns></returns>
@@ -394,5 +407,10 @@ namespace Aucma.Scada.Business
 
             return result;
         }
+
+        public List<RealTaskInfo> GetInStoreTask()
+        {
+            return _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode,appConfig.linerStoreCode }, 1);
+        }
     }
 }
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index 54cf72ea..0fc65b67 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 6632ed07..a9a23b37 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 d8473aab..55bc2ace 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 54cf72ea..0fc65b67 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 6632ed07..a9a23b37 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 9f94a758..d7223df3 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 54cf72ea..0fc65b67 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 6632ed07..a9a23b37 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 fcd69524..40a7bdba 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 95536b15..fb473389 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 19b72643..d4f8e85e 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 fcd69524..40a7bdba 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 95536b15..fb473389 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 ab7476f9..a21f5c0c 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -222,6 +222,11 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// </summary>
         public void Query()
         {
+            var info = inStoreBusiness.GetInStoreTask();
+            if (info != null)
+            {
+                info.ForEach(x => RefreshInStoreTask(x));
+            }
             if (materialTypeCombox == "箱壳")
             {
                 materialTypeCombox = "X-001";
@@ -254,6 +259,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// </summary>
         public void Init()
         {
+            Query();
             MaterialNameList = new List<string>()
             {
                 "SC232",
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index df51c114..247847a9 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 8d356c8c..2ac2218a 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.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache
index 8e73522c..ebb1331d 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.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 d6f0f0a1..b5a831a3 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 15d2636a..41faf87e 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 432060d1..7cbfec9a 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 e60976bb..57c4e388 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ