修复bug

This commit is contained in:
18942506660
2023-11-07 10:12:26 +08:00
parent b74e86aceb
commit 0a9d34ba9c
2 changed files with 7 additions and 4 deletions

View File

@@ -92,10 +92,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
/// <summary> /// <summary>
/// 出库开始时间 /// 出库开始时间
///</summary> ///</summary>
public DateTime? OutStockBeginTime { get; set; } public string OutStockBeginTime { get; set; }
/// <summary> /// <summary>
/// 出库结束时间 /// 出库结束时间
///</summary> ///</summary>
public DateTime? OutStockEndTime { get; set; } public string OutStockEndTime { get; set; }
} }
} }

View File

@@ -247,14 +247,17 @@ namespace WMS.Web.Repositories
Status = s.order.Status.GetRemark(), Status = s.order.Status.GetRemark(),
Type = s.order.Type.GetRemark(), Type = s.order.Type.GetRemark(),
CreateTime = s.order.OperateTime.DateToStringSeconds(), CreateTime = s.order.OperateTime.DateToStringSeconds(),
OutStockBeginTime= s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
SourceBillNo = s.order.SourceBillNo, SourceBillNo = s.order.SourceBillNo,
SaleBillNo = s.detail.SaleBillNo, SaleBillNo = s.detail.SaleBillNo,
DeliveryOrg = "", DeliveryOrg = "",
ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId), ReceiptCustomer = "",
MaterialName = "", MaterialName = "",
MaterialNumber = "", MaterialNumber = "",
Specifications = "" Specifications = "",
Unit="",
#endregion #endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();