异常单补拍单功能
This commit is contained in:
1 parent
2e20cbdf68
commit
7264835cc6
13 files changed
+570
-362
No files matched your search
@@ -116,7 +116,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
int totalPage = 1;
|
||||
int pageSize = 50;
|
||||
|
||||
while (true && IsAutoReadOrder)
|
||||
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
||||
{
|
||||
if (page >= totalPage)
|
||||
{
|
||||
@@ -132,6 +132,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
data += "&is_not_count=true";
|
||||
data += "&page_size=" + pageSize;
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
//指定订单id的查询,不再查询店铺id
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
// 按过滤条件读取
|
||||
@@ -147,7 +150,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value.AddDays(1));
|
||||
if (!chkEndDate.IsChecked.ParseToBool())
|
||||
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
data += "&start_time=" + startTime;
|
||||
data += "&end_time=" + endTime;
|
||||
}));
|
||||
@@ -407,40 +409,47 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
var tabItems = this.tabOrderType.Items.Cast<TabItem>();
|
||||
var tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
|
||||
var userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList();
|
||||
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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")));
|
||||
tabItem.Header = "待采购(" + userOrderLst.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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")));
|
||||
tabItem.Header = "待发货(" + userOrderLst.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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")));
|
||||
tabItem.Header = "待收货(" + userOrderLst.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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "退款单")));
|
||||
tabItem.Header = "退款单(" + userOrderLst.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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "紧急单")));
|
||||
tabItem.Header = "紧急单(" + userOrderLst.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>(userOrderLst.Where(o => !GetOrderIsFilter(o, "异常单")));
|
||||
tabItem.Header = "异常单(" + userOrderLst.Where(r => r.isAbnormal).Count() + "|" + filteLstTmp.Where(r => r.isAbnormal).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() + ")";
|
||||
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")));
|
||||
tabItem.Header = "全部订单(" + userOrderLst.Count() + "|" + filteLstTmp.Count() + ")";
|
||||
}
|
||||
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
|
||||
}
|
||||
@@ -463,13 +472,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
//{
|
||||
// FilterOneOrder(order);
|
||||
//}
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)));
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)));
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
|
||||
//Dispatcher.Invoke(new Action(() => {
|
||||
// txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count().ToString() + " 条订单记录";
|
||||
//}));
|
||||
disPlayOrderTabOrderCount();
|
||||
//Dispatcher.Invoke(new Action(() => {
|
||||
// txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count().ToString() + " 条订单记录";
|
||||
//}));
|
||||
disPlayOrderTabOrderCount();
|
||||
}));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -509,6 +521,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (order == null)
|
||||
return true;
|
||||
|
||||
if (!GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == order.shop_id))
|
||||
return true;
|
||||
|
||||
// 过滤店铺名称
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()) && !(";" + txtShopName.Text.Trim() + ";").Contains(";" + order.shop_name + ";"))
|
||||
{
|
||||
@@ -577,6 +592,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (chkWaitOperate.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("异常单") && !order.isAbnormal)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user