待配置条件更新

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -47,7 +47,7 @@ namespace BBWYB.Server.Business
                                           .WhereIf(!string.IsNullOrEmpty(request.Sku), osku => osku.SkuId == request.Sku)
                                           .WhereIf(!string.IsNullOrEmpty(request.SourceSku), osku => osku.BelongSkuId == request.SourceSku)
                                           .WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId)
-                                          .WhereIf(request.IsWaitConfig, osku => osku.PackConfigState == Enums.PackConfigState.待配置);
+                                          .WhereIf(request.IsWaitConfig, osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
                     select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消)
                                    .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
                                    .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IsPurchased == true)
@@ -608,7 +608,7 @@ namespace BBWYB.Server.Business
                                                           OrderCount = g.Count()
                                                       });
 
-            var childSelect = fsql.Select<OrderSku>().As("osku").Where(osku => osku.PackConfigState == Enums.PackConfigState.待配置);
+            var childSelect = fsql.Select<OrderSku>().As("osku").Where(osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
             var waitConfigCount = fsql.Select<Order>().Where(o => o.ShopId == shopId)
                                                       .Where(o => !noOrderStateList.Contains(o.OrderState.Value))
                                                       .Where(o => o.IntoStoreType == Enums.IntoStoreType.发回齐越)