From 0b47a16eb9c6032795647f0cd8a36807c7a16cbe Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 2 Oct 2026 09:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml | 3 ++- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 3a6c34b..bb04fa4 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -1270,7 +1270,8 @@ d:Content="创建" Click="btnReturnOrder_Click" Content="{Binding AddEditTransitWarehouseReturnOrderStr}" - Style="{StaticResource LinkButton}" /> + Style="{StaticResource BasePageButtonLightStyle}" /> + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index 8423cf1..ce6f4d9 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1559,8 +1559,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { if (this.DataContext is oms_wei_order_item_info orderItem) { - if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败")) - return; + //if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败")) + // return; //if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加") //{ @@ -1910,7 +1910,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls private void btnTrySendSyncOrder_Click(object sender, RoutedEventArgs e) { - if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemOrder != null && sender is Button btnSendSync && !btnSendSync.Tag.ParseToString().IsNullOrEmpty()) + if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemOrder != null && sender is Button btnSendSync /*&& !btnSendSync.Tag.ParseToString().IsNullOrEmpty()*/) { //var orderSn = btnSendSync.Tag.ParseToString(); var directOrder = orderItem.DirectPddBuyerOrder;