diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
index 9da786b..288340a 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
@@ -31,7 +31,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
///
public partial class OrderListRowHeaderCtrl : UserControl
{
- public DateTime LastRefreshTime = DateTime.Now;
+ public static DateTime LastRefreshTime = DateTime.Now.AddSeconds(-5);
public OrderListRowHeaderCtrl()
{
diff --git a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml
index 7d89bbf..6bc62ae 100644
--- a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml
+++ b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml
@@ -1,55 +1,78 @@
-
-
+ x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:vm="clr-namespace:_29WxOrderWpf.ViewModels"
+ xmlns:wpf="WPFCommon"
+ Title="设置"
+ Width="800"
+ Height="450"
+ d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
+ ResizeMode="NoResize"
+ ShowInTaskbar="False"
+ WindowStartupLocation="CenterScreen"
+ WindowState="Normal"
+ mc:Ignorable="d">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
+
diff --git a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs
index 36b30c5..534d2b6 100644
--- a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs
+++ b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs
@@ -1,5 +1,6 @@
using _29WxOrderWpf.ViewModels;
using AllBase;
+using AllBase.Helper;
using AllBase.Model.Config;
using Newtonsoft.Json;
using System;
@@ -44,6 +45,15 @@ public partial class SettingsView : Window
var setting = vm.ToConfig();
BaseClass.Setting = setting;
NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting));
+
+ foreach (var order in GlobalConfig.lstOrder)
+ {
+ foreach (var orderItem in order.orderItems)
+ {
+ orderItem.UpdateOrderItemBuyButton();
+ orderItem.SetAbnormalAndDirectBtnVisibility();
+ }
+ }
}
catch (Exception ex)
{
diff --git a/29WxOrderWpf/ViewModels/SettingViewModel.cs b/29WxOrderWpf/ViewModels/SettingViewModel.cs
index 52fb485..4611fe4 100644
--- a/29WxOrderWpf/ViewModels/SettingViewModel.cs
+++ b/29WxOrderWpf/ViewModels/SettingViewModel.cs
@@ -26,15 +26,22 @@ public class SettingViewModel : BindableBaseEx
get => GetValue();
set => SetValue(value);
}
+ public bool SwitchEnableDirectBuy
+ {
+ get => GetValue();
+ set => SetValue(value);
+ }
public void Assign(SettingConfig config)
{
AutoSwitchGiftType = config.AutoSwitchGiftType;
+ SwitchEnableDirectBuy = config.SwitchEnableDirectBuy;
}
public SettingConfig ToConfig()
{
return new SettingConfig
{
- AutoSwitchGiftType = AutoSwitchGiftType
+ AutoSwitchGiftType = AutoSwitchGiftType,
+ SwitchEnableDirectBuy = SwitchEnableDirectBuy,
};
}
}
diff --git a/AllBase/Model/Config/SettingConfig.cs b/AllBase/Model/Config/SettingConfig.cs
index 20bd746..c726123 100644
--- a/AllBase/Model/Config/SettingConfig.cs
+++ b/AllBase/Model/Config/SettingConfig.cs
@@ -15,4 +15,11 @@ public class SettingConfig
///
public bool AutoSwitchGiftType { get; set; } = true;
#endregion
+
+ #region 拍单
+ ///
+ /// 允许直发拍单
+ ///
+ public bool SwitchEnableDirectBuy { get; set; } = false;
+ #endregion
}
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index ea1afcb..b7ca31b 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -1557,20 +1557,27 @@ namespace AllBase.Model.DBModel
// 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
- if (GlobalConfig.CurrentBuyPlatform == "pdd")
- {
- }
- else if (GlobalConfig.CurrentBuyPlatform == "tb")
+ if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
{
+ //if (GlobalConfig.CurrentBuyPlatform == "pdd")
+ //{
+ //}
+ //else if (GlobalConfig.CurrentBuyPlatform == "tb")
+ //{
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
- if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
+ else if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
{
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
BtnDirectBuyOrderVisibility = Visibility.Visible;
}
+ else
+ BtnDirectBuyOrderVisibility = Visibility.Collapsed;
+ //}
}
+ else
+ BtnDirectBuyOrderVisibility = Visibility.Collapsed;
}
public string RefundStatusStr
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
index 98d8f85..2daceca 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
@@ -121,9 +121,15 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.TransitStatus = "创建失败";
else if (transitOrder.transfer_warehouse_status == 3)
transitDetail.TransitStatus = "创建中";
+ else if (transitOrder.transfer_warehouse_status == 4)
+ transitDetail.TransitStatus = "取号失败";
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
- if (transitOrder.pickup_time > DateTime.MinValue == false)
+ if (transitOrder.transfer_warehouse_status == 4)
+ transitDetail.WarehouseStatus = "取号失败";
+ else if ((transitOrder.raw_message.ParseToString().Contains("取号异常") || transitOrder.raw_message.ParseToString().Contains("无法调用")) && transitOrder.transfer_warehouse_status != 1)
+ transitDetail.WarehouseStatus = transitOrder.raw_message.Contains("超出派送范围") ? "取号异常(超区)" : "取号异常";
+ else if (transitOrder.pickup_time > DateTime.MinValue == false)
transitDetail.WarehouseStatus = "未取号";
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
transitDetail.WarehouseStatus = "未入库";