change-发泡统计页面优化

Admin.Core.Api/Admin.Core.Model.xml

@@ -6191,6 +6191,11 @@
             产品型号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.ViewModels.EnterLibView.MaterialName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.ViewModels.EnterLibView.InstoreTime">
             <summary>
             入库时间

Admin.Core.Model/ViewModels/EnterLibView.cs

@@ -29,6 +29,10 @@ namespace Admin.Core.Model.ViewModels
         /// </summary>
         public string MaterialType { get; set; }
         /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
         /// 入库时间
         /// </summary>
         public DateTime InstoreTime { get; set; }

Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs

@@ -50,7 +50,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
                          SpaceCode = item.SpaceCode,
                          MaterialBarCode = item.BarCodeCode,
                          MaterialType = item.MaterialType,
-                         InstoreTime = item.InStoreTime,
+                         MaterialName = item.MaterialName,
+                        InstoreTime = item.InStoreTime,
                      });
                 };
               
@@ -126,6 +127,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
                             No = ++count,
                             SpaceCode = item.SpaceCode,
                             MaterialBarCode = item.BarCodeCode,
+                            MaterialName = item.MaterialName,
                             MaterialType = item.MaterialType,
                             InstoreTime = item.InStoreTime,
                         });

Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml

@@ -107,10 +107,10 @@
                     <WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
                         <TextBlock Text="开始时间" Margin="10 0" Foreground="White"  FontSize="18"  VerticalAlignment="Center"/>
                         <DatePicker 
-                            x:Name="BeginTime"
-                            Width="200"  Margin="10 0"  Text="2023-10-09" BorderBrush="White" 
-                            materialDesign:CalendarAssist.IsHeaderVisible="False" >
-                            <DatePicker.SelectedDate >
+                            x:Name="BeginTime" FontSize="16"
+                            Width="200"  Margin="10 0"  BorderBrush="White"
+                            materialDesign:CalendarAssist.IsHeaderVisible="False">
+                            <DatePicker.SelectedDate>
                                 <Binding
                                         Path="FutureValidatingDate"
                                         UpdateSourceTrigger="PropertyChanged">
@@ -121,10 +121,10 @@
                         </DatePicker>
 
                         <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="18"  VerticalAlignment="Center"/>
-                        <DatePicker
-                            x:Name="EndTime"  Margin="10 0"  Text="2023-10-09"
-                            Width="200" 
-                            materialDesign:CalendarAssist.IsHeaderVisible="False"  BorderBrush="White">
+                        <DatePicker 
+                            x:Name="EndTime" FontSize="16"
+                            Width="200"  Margin="10 0"  BorderBrush="White"
+                            materialDesign:CalendarAssist.IsHeaderVisible="False">
                             <DatePicker.SelectedDate>
                                 <Binding
                                         Path="FutureValidatingDate"
@@ -156,9 +156,10 @@
                       Foreground="White"  >
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding No}" Header="序号" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
-                                <DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding MaterialType}" Header="产品型号" Width="2*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <!--<DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>-->
+                                <DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品条码" Width="2.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding MaterialType}" Header="产品型号" Width="1.5*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="产品名称" Width="4*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding InstoreTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="入库时间" Width="2*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <!--<DataGridTextColumn Binding="{Binding EnterSpace}" Header="货道" Width="*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding Status}" Header="状态" Width="*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>