优化
This commit is contained in:
@@ -73,7 +73,7 @@ namespace WMS.Web.Core.Dto
|
||||
/// 操作时间
|
||||
/// </summary>
|
||||
[Column("操作时间")]
|
||||
public DateTime CreateTime { get; set; }
|
||||
public string CreateTime { get; set; }
|
||||
/// <summary>
|
||||
/// 操作人
|
||||
/// </summary>
|
||||
|
||||
@@ -87,6 +87,9 @@ namespace WMS.Web.Repositories
|
||||
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box })
|
||||
.Where(adv => 1 == 1);
|
||||
|
||||
if(!string.IsNullOrEmpty(dto.BoxBillNo))
|
||||
query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%"));
|
||||
|
||||
if (dto.SubStockId.HasValue)
|
||||
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
|
||||
|
||||
@@ -110,7 +113,7 @@ namespace WMS.Web.Repositories
|
||||
BoxBillNo = s.box.BoxBillNo,
|
||||
Type = s.order.Type.GetRemark(),
|
||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
|
||||
CreateTime =s.order.CreateTime,
|
||||
CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
|
||||
Reference in New Issue
Block a user