From 97408899a3f926d32f7609a855fefd1373f30a3e Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 14 Aug 2026 11:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E8=AE=A2=E5=8D=95id=E4=B8=80?= =?UTF-8?q?=E5=AE=9A=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 189 +++++++++--------- AllBase/BaseClass.cs | 2 +- 2 files changed, 98 insertions(+), 93 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 41ae30e..47b70ee 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -923,109 +923,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 3ae5133..5619f20 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -32,7 +32,7 @@ namespace AllBase /// 版本ID /// - 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";