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 = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!"; } }