This commit is contained in:
chfei committed 2026-10-17 18:17:46 +08:00
commit dc136e449e
14 files changed
+350 -144

No files matched your search

@@ -158,6 +158,73 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
}
string refundTabTxt = "售后完成但";
public string RefundTabTxt
{
get { return refundTabTxt; }
set
{
if (refundTabTxt != value)
{
refundTabTxt = value;
OnPropertyChanged(new PropertyChangedEventArgs("RefundTabTxt"));
}
}
}
string emergencyManualReturnOrderTxt = "需处理售后单";
public string EmergencyManualReturnOrderTabTxt
{
get { return emergencyManualReturnOrderTxt; }
set
{
if (emergencyManualReturnOrderTxt != value)
{
emergencyManualReturnOrderTxt = value;
OnPropertyChanged(new PropertyChangedEventArgs("EmergencyManualReturnOrderTabTxt"));
}
}
}
string emergencyDistribReturnOrderTxt = "退货仓自动售后单";
public string EmergencyDistribReturnOrderTabTxt
{
get { return emergencyDistribReturnOrderTxt; }
set
{
if (emergencyDistribReturnOrderTxt != value)
{
emergencyDistribReturnOrderTxt = value;
OnPropertyChanged(new PropertyChangedEventArgs("EmergencyDistribReturnOrderTabTxt"));
}
}
}
string abnormalTabTxt = "异常需重拍";
public string AbnormalTabTxt
{
get { return abnormalTabTxt; }
set
{
if (abnormalTabTxt != value)
{
abnormalTabTxt = value;
OnPropertyChanged(new PropertyChangedEventArgs("AbnormalTabTxt"));
}
}
}
string allOrderTabTxt = "全部订单";
public string AllOrderTabTxt
{
get { return allOrderTabTxt; }
set
{
if (allOrderTabTxt != value)
{
allOrderTabTxt = value;
OnPropertyChanged(new PropertyChangedEventArgs("AllOrderTabTxt"));
}
}
}
public bool IsAutoReadOrder = true;
public DateTime nextGetOrderTime = DateTime.MinValue;
@@ -1501,40 +1568,45 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成单")); }));
if (tabItem != null)
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成单")); }));
//if (tabItem != null)
{
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后单")); }));
if (tabItem != null)
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后单")); }));
//if (tabItem != null)
{
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
if (tabItem != null)
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
//if (tabItem != null)
{
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常需重拍")); }));
if (tabItem != null)
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常需重拍")); }));
//if (tabItem != null)
{
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")"; }));
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")"; }));
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); }));
if (tabItem != null)
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); }));
//if (tabItem != null)
{
var lstCount = userOrderLst.Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")"; }));\
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
}
//txtMsg.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
}
@@ -2191,6 +2263,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (this.IsLoaded)
{
GlobalConfig.lstFilterOrder.Clear();
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
}
GlobalConfig.OrderTabHeaderStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString();
FilterOrders();
}