Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1240,7 +1240,7 @@ namespace BBWY.Server.Business
         {
             var select = fsql.Select<OrderSku, Order, OrderCostDetail, PurchaseOrder, Product>()
                               .InnerJoin((osku, o, ocd, po, p) => osku.OrderId == o.Id)
-                              .LeftJoin((osku, o, ocd, po, p) => osku.OrderId == ocd.OrderId && osku.SkuId == ocd.SkuId)
+                              .LeftJoin((osku, o, ocd, po, p) => osku.OrderId == ocd.OrderId && osku.SkuId == ocd.SkuId && ocd.IsEnabled == true)
                               .LeftJoin((osku, o, ocd, po, p) => ocd.PurchaseOrderPKId == po.Id && ocd.IsEnabled == true)
                               .LeftJoin((osku, o, ocd, po, p) => osku.ProductId == p.Id)
                               .WhereIf(request.ShopIds != null && request.ShopIds.Count() > 0, (osku, o, ocd, po, p) => request.ShopIds.Contains(o.ShopId))