diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs index 31e3044f..5e18f81f 100644 --- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs +++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs @@ -28,7 +28,7 @@ namespace WMS.Web.Core.Dto.SerialNumbers /// /// 完成装箱时间 /// - public DateTime? CompleteCartonTime { get; set; } + public string CompleteCartonTime { get; set; } /// /// 出库单对应销售订单号 /// diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 2558570b..7a4cb11a 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -120,7 +120,7 @@ namespace WMS.Web.Repositories MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId), - CompleteCartonTime = s.CompleteCartonTime, + CompleteCartonTime = s.CompleteCartonTime.DateToStringSeconds(), InStockTime = s.InStockTime.DateToStringSeconds(), OutStockTime = s.OutStockTime.DateToStringSeconds(), PurchaseBillNo = s.PurchaseBillNo,