售后单逻辑调整。
This commit is contained in:
1 parent
5571d227c8
commit
ed3545e376
14 files changed
+265
-116
No files matched your search
@@ -36,7 +36,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
public CheckBox chkSelectAll = null;
|
||||
|
||||
public string headerStr { get; set; } = "";
|
||||
public bool IsAutoReadOrder = true;
|
||||
public DateTime nextGetOrderTime = DateTime.MinValue;
|
||||
|
||||
@@ -376,36 +375,41 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
public void disPlayOrderTabOrderCount()
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, false)));
|
||||
var tabItems = this.tabOrderType.Items.Cast<TabItem>();
|
||||
var tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待采购")));
|
||||
tabItem.Header = "待采购(" + GlobalConfig.lstOrder.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")";
|
||||
}
|
||||
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待发货")));
|
||||
tabItem.Header = "待发货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")";
|
||||
}
|
||||
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待收货")));
|
||||
tabItem.Header = "待收货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")";
|
||||
}
|
||||
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "退款单")));
|
||||
tabItem.Header = "退款单(" + GlobalConfig.lstOrder.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")";
|
||||
}
|
||||
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "紧急单")));
|
||||
tabItem.Header = "紧急单(" + GlobalConfig.lstOrder.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")";
|
||||
}
|
||||
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "全部订单")));
|
||||
tabItem.Header = "全部订单(" + GlobalConfig.lstOrder.Count() + "|" + filteLstTmp.Count() + ")";
|
||||
}
|
||||
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
|
||||
@@ -470,10 +474,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool GetOrderIsFilter(oms_wei_order_info order, bool isFilterTab = true)
|
||||
bool GetOrderIsFilter(oms_wei_order_info order, string filterHeadStr = null)
|
||||
{
|
||||
if (order == null)
|
||||
if (order == null)
|
||||
return true;
|
||||
|
||||
// 过滤店铺名称
|
||||
@@ -506,33 +509,42 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
|
||||
// 过滤标签页
|
||||
if (isFilterTab)
|
||||
if (filterHeadStr.IsNullOrEmpty())
|
||||
filterHeadStr = GlobalConfig.OrderTabHeaderStr;
|
||||
|
||||
if (filterHeadStr.StartsWith("全部订单"))
|
||||
{
|
||||
if (headerStr.StartsWith("待采购"))
|
||||
{
|
||||
if (!order.IsWaitBuy)
|
||||
return true;
|
||||
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
|
||||
return true;
|
||||
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("待采购"))
|
||||
{
|
||||
if (!order.IsWaitBuy)
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("待收货") && !order.IsWaitReceive)
|
||||
{
|
||||
if (order.IsRefund)
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("退款单") && !order.IsRefund)
|
||||
{
|
||||
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("紧急单") && !order.IsEmergency)
|
||||
{
|
||||
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("待发货") && !order.IsWaitSend)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("待收货") && !order.IsWaitReceive)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("退款单") && !order.IsRefund)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("紧急单"))
|
||||
{
|
||||
if (!order.IsEmergency)
|
||||
return true;
|
||||
if (chkWaitOperate.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -653,7 +665,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
headerStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString();
|
||||
GlobalConfig.OrderTabHeaderStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString();
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
@@ -697,5 +709,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void chkWaitOperate_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user