diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 18199767..e9b4aa90 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -6191,6 +6191,11 @@ 产品型号 + + + 产品名称 + + 入库时间 diff --git a/Admin.Core.Model/ViewModels/EnterLibView.cs b/Admin.Core.Model/ViewModels/EnterLibView.cs index 335dc52a..d935c70d 100644 --- a/Admin.Core.Model/ViewModels/EnterLibView.cs +++ b/Admin.Core.Model/ViewModels/EnterLibView.cs @@ -29,6 +29,10 @@ namespace Admin.Core.Model.ViewModels /// public string MaterialType { get; set; } /// + /// 产品名称 + /// + public string MaterialName { get; set; } + /// /// 入库时间 /// public DateTime InstoreTime { get; set; } diff --git a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs index 245b3f06..e611e354 100644 --- a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs +++ b/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, }); diff --git a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml index 371327c4..95e20aab 100644 --- a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml @@ -107,10 +107,10 @@ - + x:Name="BeginTime" FontSize="16" + Width="200" Margin="10 0" BorderBrush="White" + materialDesign:CalendarAssist.IsHeaderVisible="False"> + @@ -121,10 +121,10 @@ - + - - - + + + +