From 74e59b4892e253cba702e792587887cc32ec7e46 Mon Sep 17 00:00:00 2001 From: wule_5900x Date: Sun, 11 Oct 2026 21:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=98=E5=AE=9D=E7=89=A9=E6=B5=81=E8=AF=BB?= =?UTF-8?q?=E5=8F=96cef=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BuyerCtrls/PDDBuyerOrderReadCtrl.xaml | 2 +- .../BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs | 10 +- .../BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs | 25 +- .../BuyerCtrls/TbBuyerOrderReadCtrl.xaml | 4 +- .../BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs | 963 ++++++------------ 29WxOrderWpf/MainWindow.xaml | 18 +- 29WxOrderWpf/MainWindow.xaml.cs | 16 +- .../DBModel/order_pdd_buyer_after_sale.cs | 7 +- .../Model/DBModel/order_pdd_buyer_order.cs | 7 +- .../Model/Result/PddBuyerAfterSaleLiteInfo.cs | 6 +- AllBase/Model/Result/PddBuyerOrderLiteInfo.cs | 16 + AllBase/Model/Result/PddPickInfo.cs | 5 + 12 files changed, 413 insertions(+), 666 deletions(-) diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml index ee3c0e3..128f3ae 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml @@ -58,7 +58,7 @@ VerticalAlignment="Center" BorderBrush="{StaticResource mainColorBrush}" Checked="chkAutoReadBuyerOrder_CheckedChanged" - Content="自动读买手单" + Content="自动读多多买手单" FontSize="12" IsChecked="true" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" /> diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 4834ac3..70bb0b1 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -2802,12 +2802,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls private void btnHideAll_Click(object sender, RoutedEventArgs e) { - if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible) - MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible; - if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1) - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1); + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); else - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); } private void CheckBox_Click(object sender, RoutedEventArgs e) diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs index 06ba8fd..b2c2b25 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs @@ -153,16 +153,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (wpPddBuyer.Visibility == Visibility.Visible) { - if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible) - MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible; - if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1) - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1); + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); else - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); + MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Visible; + MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Collapsed; + } + else if (wpTaobaoBuyer.Visibility == Visibility.Visible) + { + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); + else + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); + MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Collapsed; + MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Visible; } else { - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); } } diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml index cc849b9..c13a90e 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml @@ -139,12 +139,12 @@ - +