diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 35ef554..a06e331 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -299,11 +299,9 @@ namespace BBWYB.Server.Business .ToList(); if (currentSku_PurchaseSkuIdList.Count() > 0) { - var currentSku_PurchaseSkuList = orderPurchaseSkuInfoList.Where(posku => posku.OrderId == order.Id && - posku.PurchaseOrderId == purchaseOrder.PurchaseOrderId && - currentSku_PurchaseSkuIdList.Contains(posku.PurchaseSkuId)) - .ToList(); - if (currentSku_PurchaseSkuList.Count() > 0) + var currentSku_PurchaseSkuList = purchaseOrder.OrderPurchaseSkuInfoList?.Where(posku => currentSku_PurchaseSkuIdList.Contains(posku.PurchaseSkuId)) + ?.ToList(); + if (currentSku_PurchaseSkuList != null && currentSku_PurchaseSkuList.Count() > 0) { var totalCount = currentSku_PurchaseSkuList.Count(); var shipCount = currentSku_PurchaseSkuList.Count(posku => !string.IsNullOrEmpty(posku.WaybillNo));