diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
index a0a51780..2aa8fa0f 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b14cee841cc126714bd9974bfb490340b0c3a348")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
index 90a3f1b9..b3b30e6b 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
@@ -1 +1 @@
-084e48044896d89835d97ecf2b6482131ddb1364494a27aefb0b1990a1319ddf
+3c08b2a6f95957043123cba0d01dcd1675663fc7
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
index 124dffb6..e43b7078 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.Common
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\
-build_property.EnableComHosting = 
-build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\
diff --git a/Admin.Core.sln b/Admin.Core.sln
index 67ec2494..bbd02f6e 100644
--- a/Admin.Core.sln
+++ b/Admin.Core.sln
@@ -83,6 +83,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetal", "Au
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.DataCollector", "Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj", "{DF628848-79A6-4234-A0F6-F961DFC16A0E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ProductOffLine", "Aucma.Core.ProductOffLine\Aucma.Core.ProductOffLine.csproj", "{1582FB18-5185-41A0-B185-914501B3FBFA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -213,6 +215,10 @@ Global
 		{DF628848-79A6-4234-A0F6-F961DFC16A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF628848-79A6-4234-A0F6-F961DFC16A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF628848-79A6-4234-A0F6-F961DFC16A0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1582FB18-5185-41A0-B185-914501B3FBFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1582FB18-5185-41A0-B185-914501B3FBFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1582FB18-5185-41A0-B185-914501B3FBFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1582FB18-5185-41A0-B185-914501B3FBFA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -252,6 +258,7 @@ Global
 		{B6955077-EEE5-429B-8A79-EDE749A8B034} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
 		{D452CA9F-2CF9-4978-B0BE-7365F1F7A4EB} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
 		{DF628848-79A6-4234-A0F6-F961DFC16A0E} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
+		{1582FB18-5185-41A0-B185-914501B3FBFA} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8047AB56-042B-4AE4-B06A-34137067A86A}
diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
index 9f319776..d9663bde 100644
--- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
+++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
@@ -292,8 +292,8 @@ namespace Aucma.Core.Palletiz.Business
             {
                 item.SpaceCode = ExtractNumber(item.SpaceName);
                 var plcAddress = _appConfig.plcAddr.Where(x => x.spaceCode.ToString() == item.SpaceCode && x.spaceArea == item.SpaceArea).First();
-                int isFlag = _plc.ReadInt16(plcAddress.address);
-                if (isFlag == 1)
+                bool isFlag = _plc.ReadBool(plcAddress.address);
+                if (isFlag)
                 {
                     item.SpaceStatus = 3;
                 }
diff --git a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
index 381dabac..ae3dc75a 100644
--- a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
@@ -52,6 +52,7 @@ namespace Aucma.Core.Palletiz.ViewModels
                 foreach (ProductAllModel info in list)
                 {
                     MaterialDataGrid.Add(info);
+                   
                 }
             });
         }
diff --git a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
index 08348c86..e56f017c 100644
--- a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
@@ -51,8 +51,11 @@ namespace Aucma.Core.Palletiz.ViewModels
         /// <returns></returns>
         public void AddData(RecordInStore record)
         {
+            App.Current.Dispatcher.Invoke(() =>
+            {
             MaterialDataGrid.Add(record);
             CountInstoreEvent?.Invoke(MaterialDataGrid.Count);
+            });
         }
 
         #region 加载DataGrid数据
@@ -66,15 +69,18 @@ namespace Aucma.Core.Palletiz.ViewModels
                       List<RecordInStore> list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.InStoreTime >= DateTime.Today).Result;
                       if (list != null && list.Count > 0)
                       {
-                          CountInstoreEvent?.Invoke(list.Count);
-                          list.OrderByDescending(x => x.InStoreTime);
-                          foreach (RecordInStore record in list)
+                          App.Current.Dispatcher.Invoke(() =>
                           {
-                              App.Current.Dispatcher.Invoke(() =>
+                              MaterialDataGrid.Clear();
+                              CountInstoreEvent?.Invoke(list.Count);
+                              list.OrderByDescending(x => x.InStoreTime);
+                              foreach (RecordInStore record in list)
                               {
+
                                   MaterialDataGrid.Add(record);
-                              });
-                          }
+
+                              }
+                          });
                       }
                   }
                   catch (Exception ex)
diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
index e5b71fd6..951174e9 100644
--- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
+++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
@@ -113,7 +113,7 @@
                     <Border Grid.Row="1"  BorderThickness="4" >
                         <DataGrid  ItemsSource="{Binding MaterialDataGrid}" Height="{Binding Path=ActualHeight, ElementName=HeightPanel}"
                            HorizontalAlignment="Left" VerticalAlignment="Top"  AlternationCount="2"      RowHeaderWidth="0"
-                    ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" 
+                     ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" 
                        SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged" >
                             <DataGrid.Columns>
                                 <!--<DataGridTextColumn Binding="{Binding OrderCode}" Width="*" Header="订单编码"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>-->