|
|
@ -850,7 +850,7 @@ namespace BBWY.Server.Business |
|
|
|
po.OrderState == Enums.PurchaseOrderState.部分发货) |
|
|
|
.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待收货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待收货 || |
|
|
|
po.OrderState == Enums.PurchaseOrderState.部分收货) |
|
|
|
.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName) |
|
|
|
.WhereIf(!string.IsNullOrEmpty(request.PurchaserName), (po, pa) => po.PurchaserName == request.PurchaserName) |
|
|
|
.WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate) |
|
|
|
.WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate); |
|
|
|
} |
|
|
@ -907,7 +907,7 @@ namespace BBWY.Server.Business |
|
|
|
var httpResult = restApiService.SendRequest("http://bbwyb.qiyue666.com", |
|
|
|
"api/order/BatchGetPurchaseExpressOrderList", |
|
|
|
purchaseOrderIdList, |
|
|
|
new Dictionary<string, string>() { { "Authorization", $"Bearer {token}" } }, |
|
|
|
new Dictionary<string, string>() { { "Authorization", $"{token}" } }, |
|
|
|
HttpMethod.Post); |
|
|
|
if (httpResult.StatusCode == System.Net.HttpStatusCode.OK) |
|
|
|
{ |
|
|
@ -919,7 +919,7 @@ namespace BBWY.Server.Business |
|
|
|
foreach (var purchaseOrderSku in purchaseOrder.ItemList) |
|
|
|
{ |
|
|
|
purchaseOrderSku.PurchaseExpressOrderList = response.Data.Where(x => !string.IsNullOrEmpty(x.BelongSkuIds) && |
|
|
|
x.PurchaseOrderId == purchaseOrder.Id && |
|
|
|
x.OrderId == purchaseOrder.Id && |
|
|
|
x.BelongSkuIds.Contains(purchaseOrderSku.PurchaseSkuIds)) |
|
|
|
.ToList(); |
|
|
|
} |
|
|
|