diff --git a/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx b/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx
new file mode 100644
index 00000000..9dc9f508
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx b/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx
deleted file mode 100644
index 0ab02d9e..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/61fcf0e3-6bf7-4404-8070-e991eccc2e72.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx b/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx
deleted file mode 100644
index e85be5b1..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/b2f2f50a-57e8-455c-bf95-f83bb8a9c65b.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx b/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx
new file mode 100644
index 00000000..9a0b7abe
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx b/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx
new file mode 100644
index 00000000..6bd147fc
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx b/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx
deleted file mode 100644
index f06fde4b..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/c81ef664-ada5-4d41-b738-903db2a0d83c.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx b/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx
deleted file mode 100644
index ca82795c..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/e5fe4557-acf7-415c-9aac-f1cc26e93456.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx b/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx
new file mode 100644
index 00000000..07cfb312
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 87b12dac..83df6099 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
index c93e37d7..6bc5c186 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
@@ -183,10 +183,33 @@
                         <RowDefinition Height="13*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="20"/>
+                        <TextBlock Text="泡 后 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
                     </StackPanel>
 
+                    <DataGrid Grid.Row="1" ItemsSource="{Binding FoamMaterialStockDataGrid}" Background="Transparent" 
+                      FontSize="20" ColumnHeaderHeight="35" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+                      Foreground="#FFFFFF" >
+                        <!--resourceStyle 399行修改选中字体颜色-->
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Binding="{Binding typeNameA}" Header="物料型号" Width="2*" IsReadOnly="True"/>
+                            <!--<DataGridTextColumn Binding="{Binding executePlanCode}" Header="物料编码" Width="1*" IsReadOnly="True"/>-->
+                            <DataGridTextColumn Binding="{Binding spaceStock}" Header="在库数量" Width="1*" IsReadOnly="True"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
                 </Grid>
+                <!--<Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="13*"/>
+                    </Grid.RowDefinitions>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="20"/>
+                    </StackPanel>
+
+                </Grid>-->
             </Border>
 
             <Border Grid.Row="2" Grid.Column="1" BorderBrush="#1254AB" BorderThickness="2">
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 3897f7c8..620530c7 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 91acf67e..52110933 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.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
index 3897f7c8..620530c7 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.g.resources b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources
index 049f9ac6..95d14577 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index 91acf67e..52110933 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/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml
index 77374e7f..c99c1093 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.baml differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.cs
index a8c494c7..31ca6a04 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B679D4B17100EEB1BD654A7535A71C0857A955CFA0EB5E7BDC2D6ACEF450324"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1822B6B242A4BF94E086D4EB3617AA3D8297B861C3B64EC9131DE8D2CF4F6CAA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.i.cs
index a8c494c7..31ca6a04 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.i.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B679D4B17100EEB1BD654A7535A71C0857A955CFA0EB5E7BDC2D6ACEF450324"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1822B6B242A4BF94E086D4EB3617AA3D8297B861C3B64EC9131DE8D2CF4F6CAA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs
index d95d9c02..b1d20dad 100644
--- a/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs
@@ -60,6 +60,18 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
             get { return foamBeforeMaterialStockDataGrid; }
             set { foamBeforeMaterialStockDataGrid = value; RaisePropertyChanged(() => FoamBeforeMaterialStockDataGrid); }
 
+        }
+
+        /// <summary>
+        /// 泡后库物料库存DataGrid
+        /// </summary>
+        private ObservableCollection<BaseSpaceInfo> foamMaterialStockDataGrid;
+
+        public ObservableCollection<BaseSpaceInfo> FoamMaterialStockDataGrid
+        {
+            get { return foamMaterialStockDataGrid; }
+            set { foamMaterialStockDataGrid = value; RaisePropertyChanged(() => FoamMaterialStockDataGrid); }
+
         }
         #endregion
 
@@ -119,8 +131,42 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 if (string.IsNullOrEmpty(item.materialType)) continue;
                 FoamBeforeMaterialStockDataGrid.Add(new BaseSpaceInfo() { materialType = item.materialType, spaceStock = item.spaceStock });
             }
+
+
+            //泡后库物料库存
+            FoamMaterialStockDataGrid = new ObservableCollection<BaseSpaceInfo>();
+            List<BaseSpaceInfo> foamList = _inventoryInfoBusiness.GetSpaceInfos(appConfig.foamStoreCode);
+            var foamResult = from m in foamList
+                                   group m by m.typeNameA into g
+                                   select new BaseSpaceInfo()
+                                   {
+                                       typeNameA = GetStringBetweenCommas(g.Key),
+                                       spaceStock = g.Sum(m => m.spaceStock)
+                                   };
+            foreach (var item in foamResult)
+            {
+                if (string.IsNullOrEmpty(item.typeNameA)) continue;
+                FoamMaterialStockDataGrid.Add(new BaseSpaceInfo() { typeNameA = item.typeNameA, spaceStock = item.spaceStock });
+            }
         }
 
+        public static string GetStringBetweenCommas(string input)
+        {
+            if (string.IsNullOrEmpty(input)) return null;
+            int firstCommaIndex = input.IndexOf(',');
+            if (firstCommaIndex != -1)
+            {
+                int secondCommaIndex = input.IndexOf(',', firstCommaIndex + 1);
+                if (secondCommaIndex != -1)
+                {
+                    return input.Substring(firstCommaIndex + 1, secondCommaIndex - firstCommaIndex - 1);
+                }
+            }
+            return null; 
+        }
+
+
+
         private void CloseWindow(object parameter)
         {
             var window = parameter as Window;