From eeee1affd307c36a3dbdc03d703dcb407527b49f Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 9 Oct 2026 16:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E7=8A=B6=E6=80=81=E9=83=BD=E5=8F=AF=E4=BB=A5=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=AF=84=E5=9B=9E=E6=80=BB=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs index 18e6399..b262380 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs @@ -54,7 +54,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows if (OrderItem != null) { - this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrder?.platform)?.TransName; + this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName; this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company; this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill; @@ -119,7 +119,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) { //btnAdd.IsEnabled = false; - lblMsg.Content = "当前订单仓库状态不支持拦截退回总店，建议联系买家直接退回总店！"; + //lblMsg.Content = "当前订单仓库状态不支持拦截退回总店，建议联系买家直接退回总店！"; } }