|
@ -53,19 +53,6 @@ namespace BBWYB.Server.Business |
|
|
.Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId); |
|
|
.Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId); |
|
|
select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any()); |
|
|
select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any()); |
|
|
} |
|
|
} |
|
|
if (request.OrderState != null) |
|
|
|
|
|
{ |
|
|
|
|
|
if (request.OrderState == Enums.OrderState.待付款 || |
|
|
|
|
|
request.OrderState == Enums.OrderState.打包中 || |
|
|
|
|
|
request.OrderState == Enums.OrderState.待完结 || |
|
|
|
|
|
request.OrderState == Enums.OrderState.已完成 || |
|
|
|
|
|
request.OrderState == Enums.OrderState.已取消) |
|
|
|
|
|
{ |
|
|
|
|
|
select = select.Where((o, ocs, oct) => o.OrderState == request.OrderState); |
|
|
|
|
|
} |
|
|
|
|
|
else if (request.OrderState == Enums.OrderState.等待采购) |
|
|
|
|
|
select = select.Where((o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || o.OrderState == Enums.OrderState.部分采购); |
|
|
|
|
|
} |
|
|
|
|
|
select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 || |
|
|
select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 || |
|
|
request.OrderState == Enums.OrderState.打包中 || |
|
|
request.OrderState == Enums.OrderState.打包中 || |
|
|
request.OrderState == Enums.OrderState.待完结 || |
|
|
request.OrderState == Enums.OrderState.待完结 || |
|
|