diff --git a/.vs/HighWayIot/FileContentIndex/1bc3f51b-5d8f-47ce-9eb3-2a3ee066c7ad.vsidx b/.vs/HighWayIot/FileContentIndex/1bc3f51b-5d8f-47ce-9eb3-2a3ee066c7ad.vsidx
deleted file mode 100644
index 5bab1a92..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/1bc3f51b-5d8f-47ce-9eb3-2a3ee066c7ad.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/5571fdc7-4fea-453f-8e56-1c332849ffc8.vsidx b/.vs/HighWayIot/FileContentIndex/5571fdc7-4fea-453f-8e56-1c332849ffc8.vsidx
new file mode 100644
index 00000000..a730bb1b
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5571fdc7-4fea-453f-8e56-1c332849ffc8.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/91f33df6-ff7f-4de2-a95b-748032379d21.vsidx b/.vs/HighWayIot/FileContentIndex/91f33df6-ff7f-4de2-a95b-748032379d21.vsidx
new file mode 100644
index 00000000..c7c4996f
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/91f33df6-ff7f-4de2-a95b-748032379d21.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/b7833387-b22d-49b2-a3a0-cf2d5e600da9.vsidx b/.vs/HighWayIot/FileContentIndex/b7833387-b22d-49b2-a3a0-cf2d5e600da9.vsidx
new file mode 100644
index 00000000..a436e3d4
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/b7833387-b22d-49b2-a3a0-cf2d5e600da9.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/db4a6e07-faf9-4c73-8bbc-70c8f44c031c.vsidx b/.vs/HighWayIot/FileContentIndex/db4a6e07-faf9-4c73-8bbc-70c8f44c031c.vsidx
deleted file mode 100644
index 0a741b57..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/db4a6e07-faf9-4c73-8bbc-70c8f44c031c.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/e4977901-dfe7-4723-9887-30e6bc3109f8.vsidx b/.vs/HighWayIot/FileContentIndex/e4977901-dfe7-4723-9887-30e6bc3109f8.vsidx
deleted file mode 100644
index 8367e77a..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/e4977901-dfe7-4723-9887-30e6bc3109f8.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 9cf570b2..baa45e25 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 3026a941..80699909 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -51,6 +51,8 @@ namespace Aucma.Scada.Business
         private IRealTaskInfoService _taskInfoService;
 
         private IBaseSpaceDetailService _baseSpaceDetailService;
+
+        private IBaseBomInfoService _baseBomInfoService;
         #endregion
 
         #region 委托事件
@@ -85,20 +87,24 @@ namespace Aucma.Scada.Business
             _spaceInfoService = registerServices.GetService<IBaseSpaceInfoService>();
             _taskInfoService = registerServices.GetService<IRealTaskInfoService>();
             _baseSpaceDetailService = registerServices.GetService<IBaseSpaceDetailService>();
+            _baseBomInfoService = registerServices.GetService<IBaseBomInfoService>();
             taskHandle.InStoreFinsihEvent += TaskFeedback;
             grabImage.RefreshMaterialCodeStrEvent += InStore;
             grabImage.RefreshLogMessageEvent += PrintLogInfoMessage;
             StartPassDown();
 
-            //Task.Run(() =>
-            //{
-            //    Thread.Sleep(6000);
-            //    for(int i = 2;i<10;i++)
-            //    {
-            //        InStore(appConfig.shellStoreCode, "B23600000781101900"+i);
-            //        InStore(appConfig.linerStoreCode, "L23600000788101900"+i);
-            //    }
-            //});
+            Task.Run(() =>
+            {
+                Thread.Sleep(6000);
+                //for (int i = 2; i < 10; i++)
+                //{
+                //    InStore(appConfig.shellStoreCode, "B23600000781101900" + i);
+                //    InStore(appConfig.linerStoreCode, "L23600000788101900" + i);
+                //}
+
+                InStore(appConfig.shellStoreCode, "B236000007811019013");
+            });
+
         }
 
         /// <summary>
@@ -116,7 +122,7 @@ namespace Aucma.Scada.Business
                 if (spaceInfo != null)
                 {
                     PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}");
-                    RefreshScanMateriaCodeEvent?.Invoke(materialCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息
+                    RefreshScanMateriaCodeEvent?.Invoke(materialCode, GetMaterialName(materialType), spaceInfo.spaceName, storeCode); //刷新界面扫码信息
                     var result = CreateInStoreTask(spaceInfo, materialCode); //创建入库任务
                     if (result)
                     {
@@ -386,6 +392,7 @@ namespace Aucma.Scada.Business
                         BaseSpaceDetail spaceDetail = new BaseSpaceDetail();
                         spaceDetail.materialType = taskInfo.materialType;
                         spaceDetail.materialCode = taskInfo.materialCode;
+                        spaceDetail.materialName = GetMaterialName(taskInfo.materialType);
                         spaceDetail.storeCode = spaceInfo.storeCode;
                         spaceDetail.spaceCode = spaceInfo.spaceCode;
                         spaceDetail.materialAmount = 1;
@@ -445,5 +452,22 @@ namespace Aucma.Scada.Business
         {
             return _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode,appConfig.linerStoreCode }, 1);
         }
+
+        /// <summary>
+        /// 通过BOM获取物料名称
+        /// </summary>
+        /// <param name="materialType"></param>
+        /// <returns></returns>
+        public string GetMaterialName(string materialType)
+        {
+            string materialName = string.Empty;
+            var info = _baseBomInfoService.GetBomInfoByMaterialCode(materialType);
+            if(info != null)
+            {
+                materialName = info.materialName;
+            }
+
+            return materialName;
+        }
     }
 }
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index d03cdb13..2fc85e20 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 e96339a2..a2f945a4 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/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
index 6ac1ec64..ce2f82af 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
index c30b6f7d..82671712 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.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 352a6a4e..978ba033 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 d03cdb13..2fc85e20 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 e96339a2..a2f945a4 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 6ae48cd8..d56326b2 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 d03cdb13..2fc85e20 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 e96339a2..a2f945a4 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 75af2188..40824b83 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 4d10adb5..dc8240b2 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/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
index 6ac1ec64..ce2f82af 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
index c30b6f7d..82671712 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.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 6a4d5f7c..233b571e 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 75af2188..40824b83 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 4d10adb5..dc8240b2 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 84e1537c..432d5c46 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -238,6 +238,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
                             App.Current.Dispatcher.Invoke((Action)(() =>
                             {
+                                item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
                                 taskItems.Add(item);
                                 InstoreTask = taskItems;
                             }));
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index 60e0cfca..8cb2557e 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 3d3ee81b..aaa6bc79 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 98cbcec2..1e37db33 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/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
index 6ac1ec64..ce2f82af 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
index c30b6f7d..82671712 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 76ee0cf9..f3722424 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.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
index 6ac1ec64..ce2f82af 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
index c30b6f7d..82671712 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/service/IBaseBomInfoService.cs b/HighWayIot.Repository/service/IBaseBomInfoService.cs
index 71eaf860..f7662de0 100644
--- a/HighWayIot.Repository/service/IBaseBomInfoService.cs
+++ b/HighWayIot.Repository/service/IBaseBomInfoService.cs
@@ -14,5 +14,12 @@ namespace HighWayIot.Repository.service
         /// <param name="materialType"></param>
         /// <returns></returns>
         BaseBomInfo GetChildenBomInfoByMaterialCode(string materialCode, string materialType);
+
+        /// <summary>
+        /// 根据物料编号获取BOM信息
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns></returns>
+        BaseBomInfo GetBomInfoByMaterialCode(string materialCode);
     }
 }
diff --git a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs
index dc7c4b7c..51f2a9c9 100644
--- a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs
+++ b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs
@@ -44,6 +44,25 @@ namespace HighWayIot.Repository.service.Impl
             return bomInfo;
         }
 
+        /// <summary>
+        /// 根据物料编号获取BOM信息
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns></returns>
+        public BaseBomInfo GetBomInfoByMaterialCode(string materialCode)
+        {
+            BaseBomInfo bomInfo = null;
+            try
+            {
+                bomInfo = _bomInfoRepository.GetFirst(x=>x.materialCode == materialCode);
+            }
+            catch (Exception ex)
+            {
+                logHelper.Error("根据物料编号获取BOM信息异常", ex);
+            }
+            return bomInfo;
+        }
+
         private List<BaseBomInfo> GetChildenByParentId(string parentId, List<BaseBomInfo> result = null)
         {
             if (result == null)
diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
index f81d0f72..30dca5ab 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/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll
index 6ac1ec64..ce2f82af 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb
index c30b6f7d..82671712 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index bcfbd5ca..02d116c7 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ