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

调整列表查询

Browse Source
This commit is contained in:
18942506660
2023-10-28 14:56:59 +08:00
parent 8abdbd9746
commit f5cc13f422
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -153,14 +153,16 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<(List<OutStockTaskQueryInfoResponse> list, int total)> GetListAsync(OutStockTaskQueryRequest dto)
{
var query = _context.OutStockTask
.OrderByDescending(o => o.Id)
var query = _context.OutStockTaskDetails
.GroupJoin(_context.OutStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.OrderByDescending(o => o.order.Id)
.Where(adv => 1 == 1);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.OperateTime >= dto.CreateBeginDate);
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
query = query.Where(w => w.OperateTime <= dto.CreateEndDate);
query = query.Where(w => w.order.OperateTime <= dto.CreateEndDate);
//组装
int total = await query.CountAsync();
var list = await query.Select(s => new OutStockTaskQueryInfoResponse()
@@ -169,7 +171,7 @@ namespace WMS.Web.Repositories
Id = 0,
Status = "",
Type = "",
CreateTime = s.OperateTime.DateToStringSeconds(),
CreateTime = s.order.OperateTime.DateToStringSeconds(),
Stock = "",
SourceBillNo = "",
SaleBillNo = "",