diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index d10e61a..f04fba9 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -934,109 +934,114 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			if (order == null)
 				return true;
 
-			if (chkHideGreenFlag.IsChecked == true && order.colour_flag == 4)
-				return true;
-
-			if (!GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == order.shop_id))
-				return true;
-
-			if (!string.IsNullOrEmpty(strSearchAll))
-			{
-				bool isFilter = true;
-				// 买手物流
-				if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_1_waybill.ParseToString().Contains(strSearchAll))))
-					isFilter = false;
-				// 仓库物流
-				else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_2_waybill.ParseToString().Contains(strSearchAll))))
-					isFilter = false;
-				// 退货物流
-				else if (order.refundItems.Any(ri => ri.return_waybill_id.ParseToString().Contains(strSearchAll)))
-					isFilter = false;
-				// 退货单号
-				else if (order.refundItems.Any(ri => ri.after_sale_order_id.ParseToString().Contains(strSearchAll)))
-					isFilter = false;
-				// 仓库采购单号
-				else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no.ParseToString().Contains(strSearchAll))))
-					isFilter = false;
-				// 仓库退款单号
-				else if (order.orderItems.Any(oi => oi.ItemTransitOrderAfterSales.Any(t => t.refund_waybill.ParseToString().Contains(strSearchAll))))
-					isFilter = false;
-				if (isFilter)
-					return true;
-			}
-
-			// 过滤店铺名称
-			if (!string.IsNullOrEmpty(txtShopName.Text.Trim()) && !(";" + txtShopName.Text.Trim() + ";").Contains(";" + order.shop_name + ";"))
-			{
-				return true;
-			}
-			// 过滤商品名称
-			if (!string.IsNullOrEmpty(txtFilterGoodsName.Text.Trim()))
-			{
-				if (orderFilterConfig.FilterGoodsNameType == "标题包含" && !orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
-					return true;
-				else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
-					return true;
-			}
 			// 过滤id
-			if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
+			if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()))
 			{
-				return true;
+				if (!(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
+					return true;
 			}
-			// 过滤多子单订单
-			if (chkNoMultiOrder.IsChecked.ParseToBool() && order.orderItems.Count() > 1)
+			// 其他一级过滤选项
+			else
 			{
-				return true;
-			}
-			// 过滤非中转仓订单
-			if (chkOnlyWarehouseOrder.IsChecked.ParseToBool() && !order.IsWaitBuy &&
-				order.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null) && order.orderItems.All(oi => oi.OrderItemExt?.buy_type != "直发"))
-			{
-				return true;
-			}
-			// 过滤备注
-			if (chkFilterRemark.IsChecked == true && !string.IsNullOrEmpty(txtFilterRemark.Text))
-			{
-				if (cmbFilterRemark.SelectedItem is ComboBoxItem comboBoxItem)
+				if (chkHideGreenFlag.IsChecked == true && order.colour_flag == 4)
+					return true;
+
+				if (!GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == order.shop_id))
+					return true;
+
+				if (!string.IsNullOrEmpty(strSearchAll))
 				{
-					if (comboBoxItem.Content is TextBlock tb)
+					bool isFilter = true;
+					// 买手物流
+					if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_1_waybill.ParseToString().Contains(strSearchAll))))
+						isFilter = false;
+					// 仓库物流
+					else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_2_waybill.ParseToString().Contains(strSearchAll))))
+						isFilter = false;
+					// 退货物流
+					else if (order.refundItems.Any(ri => ri.return_waybill_id.ParseToString().Contains(strSearchAll)))
+						isFilter = false;
+					// 退货单号
+					else if (order.refundItems.Any(ri => ri.after_sale_order_id.ParseToString().Contains(strSearchAll)))
+						isFilter = false;
+					// 仓库采购单号
+					else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no.ParseToString().Contains(strSearchAll))))
+						isFilter = false;
+					// 仓库退款单号
+					else if (order.orderItems.Any(oi => oi.ItemTransitOrderAfterSales.Any(t => t.refund_waybill.ParseToString().Contains(strSearchAll))))
+						isFilter = false;
+					if (isFilter)
+						return true;
+				}
+
+				// 过滤店铺名称
+				if (!string.IsNullOrEmpty(txtShopName.Text.Trim()) && !(";" + txtShopName.Text.Trim() + ";").Contains(";" + order.shop_name + ";"))
+				{
+					return true;
+				}
+				// 过滤商品名称
+				if (!string.IsNullOrEmpty(txtFilterGoodsName.Text.Trim()))
+				{
+					if (orderFilterConfig.FilterGoodsNameType == "标题包含" && !orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
+						return true;
+					else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
+						return true;
+				}
+				// 过滤多子单订单
+				if (chkNoMultiOrder.IsChecked.ParseToBool() && order.orderItems.Count() > 1)
+				{
+					return true;
+				}
+				// 过滤非中转仓订单
+				if (chkOnlyWarehouseOrder.IsChecked.ParseToBool() && !order.IsWaitBuy &&
+					order.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null) && order.orderItems.All(oi => oi.OrderItemExt?.buy_type != "直发"))
+				{
+					return true;
+				}
+				// 过滤备注
+				if (chkFilterRemark.IsChecked == true && !string.IsNullOrEmpty(txtFilterRemark.Text))
+				{
+					if (cmbFilterRemark.SelectedItem is ComboBoxItem comboBoxItem)
 					{
-						if (tb.Text == "店铺备注包含" && !lstFilterText.Contains(order.shop_remark))
-							return true;
-						else if (tb.Text == "软件备注包含" && !lstFilterText.Contains(order.soft_remark))
-							return true;
-						else if (tb.Text == "店铺备注不含" && lstFilterText.Contains(order.shop_remark))
-							return true;
-						else if (tb.Text == "软件备注不含" && lstFilterText.Contains(order.soft_remark))
-							return true;
+						if (comboBoxItem.Content is TextBlock tb)
+						{
+							if (tb.Text == "店铺备注包含" && !lstFilterText.Contains(order.shop_remark))
+								return true;
+							else if (tb.Text == "软件备注包含" && !lstFilterText.Contains(order.soft_remark))
+								return true;
+							else if (tb.Text == "店铺备注不含" && lstFilterText.Contains(order.shop_remark))
+								return true;
+							else if (tb.Text == "软件备注不含" && lstFilterText.Contains(order.soft_remark))
+								return true;
+						}
 					}
 				}
-			}
-			if (!chkDirectOrder.IsChecked == true && order.OrderBuyType == "直发")
-				return true;
-			if (!chkTransitOrder.IsChecked == true && order.OrderBuyType == "云仓")
-				return true;
-			if (!chkTransitChangeDirectOrder.IsChecked == true && order.OrderBuyType == "云改直")
-				return true;
+				if (!chkDirectOrder.IsChecked == true && order.OrderBuyType == "直发")
+					return true;
+				if (!chkTransitOrder.IsChecked == true && order.OrderBuyType == "云仓")
+					return true;
+				if (!chkTransitChangeDirectOrder.IsChecked == true && order.OrderBuyType == "云改直")
+					return true;
 
-			// 过滤时间范围
-			if (cmbTimeType.SelectedItem is ComboBoxItem cbi)
-			{
-				if (cbi.Content is TextBlock tb)
+				// 过滤时间范围
+				if (cmbTimeType.SelectedItem is ComboBoxItem cbi)
 				{
-					if (tb.Text == "更新时间")
+					if (cbi.Content is TextBlock tb)
 					{
-						if (order.UpdateDateTime < dateStart.SelectedDate.Value)
-							return true;
-						if (chkEndDate.IsChecked == true && order.UpdateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
-							return true;
-					}
-					if (tb.Text == "成交时间")
-					{
-						if (order.CreateDateTime < dateStart.SelectedDate.Value)
-							return true;
-						if (chkEndDate.IsChecked == true && order.CreateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
-							return true;
+						if (tb.Text == "更新时间")
+						{
+							if (order.UpdateDateTime < dateStart.SelectedDate.Value)
+								return true;
+							if (chkEndDate.IsChecked == true && order.UpdateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
+								return true;
+						}
+						if (tb.Text == "成交时间")
+						{
+							if (order.CreateDateTime < dateStart.SelectedDate.Value)
+								return true;
+							if (chkEndDate.IsChecked == true && order.CreateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
+								return true;
+						}
 					}
 				}
 			}
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index fe27136..f0b75aa 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -36,7 +36,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-		public static int VersionCount = 229;
+        public static int VersionCount = 230;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";