1

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -54,6 +54,24 @@ namespace BBWYB.Server.Business
                                    .Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any());
                 }
 
+                if (request.IsOnlyDisplayPurchaseTimeOut == 1 && (request.OrderState == Enums.OrderState.等待采购 || request.OrderState == Enums.OrderState.部分采购))
+                {
+                    var childSelect = fsql.Select<TimeLimitTask>().As("t")
+                                          .Where(t => t.ShopId == request.ShopId)
+                                          .Where(t => t.TaskType == Enums.TimeLimitTaskType.采购任务)
+                                          .Where(t => t.IsTimely == false);
+                    select = select.Where((o, ocs, oct) => childSelect.Where(t => t.OrderId == o.Id).Any());
+                }
+                if (request.IsOnlyDisplayDeliveryTimeout == 1 && (request.OrderState == Enums.OrderState.待发货 || request.OrderState == Enums.OrderState.部分发货))
+                {
+                    var before24hTime = DateTime.Now.AddHours(-24);
+                    var childSelect = fsql.Select<OrderPurchaseInfo>().As("opi2")
+                                          .Where(opi2 => opi2.ShopId == request.ShopId &&
+                                                         (opi2.OrderState == Enums.PurchaseOrderState.待发货 || opi2.OrderState == Enums.PurchaseOrderState.部分发货) &&
+                                                         opi2.CreateTime < before24hTime);
+                    select = select.Where((o, ocs, oct) => childSelect.Where(opi2 => opi2.OrderId == o.Id).Any());
+                }
+
                 if (!string.IsNullOrEmpty(request.PurchaseOrderId))
                 {
                     var childSelect = fsql.Select<OrderPurchaseInfo>().As("opi")

BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs

@@ -75,10 +75,14 @@
         /// </summary>
         public bool IsWaitConfig { get; set; }
 
-        ///// <summary>
-        ///// 是否过滤已配置
-        ///// </summary>
-        //public bool ExcludeConfigured { get; set; }
+        /// <summary>
+        /// 是否仅显示待采购超时,是=1否=0,只在订单状态为【待采购和部分采购】时生效
+        /// </summary>
+        public int IsOnlyDisplayPurchaseTimeOut { get; set; }
 
+        /// <summary>
+        /// 是否仅显示待发货超时,是=1否=0,只在订单状态为【待发货和部分发货】时生效
+        /// </summary>
+        public int IsOnlyDisplayDeliveryTimeout { get; set; }
     }
 }