From 543eb2f3fc95baf6a3adb90d070d2793bcce0c23 Mon Sep 17 00:00:00 2001 From: wule_5900x Date: Mon, 10 Aug 2026 07:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B0=E4=BB=93=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=B8=AD=E8=BD=AC=E4=BB=93=E9=80=80=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs | 4 ++-- .../Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs | 2 +- AllBase/BaseClass.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs index 5a98337..16262b3 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs @@ -79,7 +79,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows // return; //} - if (OrderItem?.ItemTransitOrder?.warehouse_status != 2) + if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) { lblMsg.Content = "当前订单仓库状态不支持售后！"; } @@ -87,7 +87,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows private void btnAdd_Click(object sender, RoutedEventArgs e) { - if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1) + if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) { BaseMsgWindow.ShowError("当前订单仓库状态不支持售后，请联系买家直接退回总店！"); return; diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs index 2427ba1..01120a2 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs @@ -98,7 +98,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows private void btnAdd_Click(object sender, RoutedEventArgs e) { - if (OrderItem?.ItemTransitOrder?.warehouse_status != 2) + if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) { BaseMsgWindow.ShowError("当前订单仓库状态不支持创建退货订单！"); return; diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index bbaf6de..5d96126 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -32,7 +32,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 217; + public static int VersionCount = 218; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";