18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
tongfei
2023-12-26 15:22:35 +08:00
parent cec7a13dfe
commit c095390b8c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
View File

@@ -73,7 +73,7 @@ namespace WMS.Web.Core.Dto
/// 操作时间 /// 操作时间
/// </summary> /// </summary>
[Column("操作时间")] [Column("操作时间")]
public DateTime CreateTime { get; set; } public string CreateTime { get; set; }
/// <summary> /// <summary>
/// 操作人 /// 操作人
/// </summary> /// </summary>

5
src/WMS.Web.Repositories/BackRecordRepositories.cs
View File

@@ -87,6 +87,9 @@ namespace WMS.Web.Repositories
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box })
.Where(adv => 1 == 1); .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) if (dto.SubStockId.HasValue)
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value); query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
@@ -110,7 +113,7 @@ namespace WMS.Web.Repositories
BoxBillNo = s.box.BoxBillNo, BoxBillNo = s.box.BoxBillNo,
Type = s.order.Type.GetRemark(), Type = s.order.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), 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), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),