|
|
@@ -351,6 +351,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
imgLoading.Visibility = Visibility.Visible;
|
|
|
|
imgLoading.Visibility = Visibility.Visible;
|
|
|
|
btnSearch.IsEnabled = false;
|
|
|
|
btnSearch.IsEnabled = false;
|
|
|
|
}));
|
|
|
|
}));
|
|
|
|
|
|
|
|
bool hasGetPage = false;
|
|
|
|
int page = 0;
|
|
|
|
int page = 0;
|
|
|
|
int totalPage = 1;
|
|
|
|
int totalPage = 1;
|
|
|
|
int pageSize = 50;
|
|
|
|
int pageSize = 50;
|
|
|
@@ -360,7 +361,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
|
|
|
|
|
|
|
|
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
|
|
|
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页";
|
|
|
|
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage ? "" : ("/共" + totalPage + "页"));
|
|
|
|
if (page >= totalPage)
|
|
|
|
if (page >= totalPage)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
break;
|
|
|
@@ -416,7 +417,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
|
|
|
|
|
|
|
|
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
|
|
|
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
|
|
|
if (totalCount > 0)
|
|
|
|
if (totalCount > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
hasGetPage = true;
|
|
|
|
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
|
|
|
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -479,7 +483,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
pddBuyerAfterSales.AddRange(GetTbBuyerAfterSales(order_ids));
|
|
|
|
pddBuyerAfterSales.AddRange(GetTbBuyerAfterSales(order_ids));
|
|
|
|
|
|
|
|
|
|
|
|
// 同步单
|
|
|
|
// 同步单
|
|
|
|
var buyerIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
|
|
|
var buyerIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
|
|
|
var syncLogistics = GetSyncLogistics(buyerIds);
|
|
|
|
var syncLogistics = GetSyncLogistics(buyerIds);
|
|
|
|
|
|
|
|
|
|
|
|
// 读取关联拍单商品
|
|
|
|
// 读取关联拍单商品
|
|
|
@@ -1551,7 +1555,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void disPlayOrderTabOrderCount()
|
|
|
|
public async Task disPlayOrderTabOrderCount()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
|
|
|
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
|
|
|
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
|
|
|
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
|
|
@@ -1559,46 +1563,57 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
|
|
|
|
|
|
|
|
//TabItem tabItem = null;
|
|
|
|
//TabItem tabItem = null;
|
|
|
|
//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
|
|
|
|
//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
|
|
|
|
|
|
|
|
var task1 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
|
|
|
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task2 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
|
|
|
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task3 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
|
|
|
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task4 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
|
|
|
|
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
await Task.WhenAll(task1, task2, task3, task4);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var task5 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
|
|
|
|
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task6 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
|
|
|
|
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task7 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
|
|
|
|
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
|
|
|
|
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
var task8 = Task.Run(() =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var lstCount = userOrderLst.Count();
|
|
|
|
var lstCount = userOrderLst.Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
|
|
|
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
|
|
|
|
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
await Task.WhenAll(task5, task6, task7, task8);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CancellationTokenSource TokenSource = null;
|
|
|
|
CancellationTokenSource TokenSource = null;
|
|
|
@@ -1926,7 +1941,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
|
// 直发没有单号正常发货才判断中转仓总店是否超时发货
|
|
|
|
// 直发没有单号正常发货才判断中转仓总店是否超时发货
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
|
else
|
|
|
|
else
|
|
|
@@ -1940,7 +1955,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
|
// 直发没有单号才判断中转仓总店是否超时发货
|
|
|
|
// 直发没有单号才判断中转仓总店是否超时发货
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
@@ -1985,7 +2000,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -1996,8 +2011,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
|
else if (order.orderItems.Any(oi =>(oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
|
|
|
{ }
|
|
|
|
{ }
|
|
|
@@ -2361,10 +2376,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
chkEmergencyBuyerWaitAfterSale.IsChecked = chkEmergencyBuyerWaitSendBack.IsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked = chkEmergencyBuyerRefundFail.IsChecked = false;
|
|
|
|
chkEmergencyBuyerWaitAfterSale.IsChecked = chkEmergencyBuyerWaitSendBack.IsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked = chkEmergencyBuyerRefundFail.IsChecked = false;
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
|
|
|
|
|
|
|
|
chkEmergencyBuyerWaitAfterSaleIsChecked = chkEmergencyBuyerWaitAfterSale.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerWaitAfterSaleIsChecked = chkEmergencyBuyerWaitAfterSale.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerWaitSendBackIsChecked = chkEmergencyBuyerWaitSendBack.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerWaitSendBackIsChecked = chkEmergencyBuyerWaitSendBack.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerWaitSupplierRefundIsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerWaitSupplierRefundIsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerRefundFailIsChecked = chkEmergencyBuyerRefundFail.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyBuyerRefundFailIsChecked = chkEmergencyBuyerRefundFail.IsChecked.ParseToBool();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FilterOrders();
|
|
|
|
FilterOrders();
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -2397,10 +2412,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
chkEmergencyWaitSupplierReceive.IsChecked = chkEmergencyWaitSupplierAccept.IsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
|
|
|
|
chkEmergencyWaitSupplierReceive.IsChecked = chkEmergencyWaitSupplierAccept.IsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
|
|
|
|
|
|
|
|
chkEmergencyWaitSupplierReceiveIsChecked = chkEmergencyWaitSupplierReceive.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyWaitSupplierReceiveIsChecked = chkEmergencyWaitSupplierReceive.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyWaitSupplierAcceptIsChecked = chkEmergencyWaitSupplierAccept.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyWaitSupplierAcceptIsChecked = chkEmergencyWaitSupplierAccept.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyShopAfterSaleSuccessIsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyShopAfterSaleSuccessIsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyShopInAfterSaleIsChecked = chkEmergencyShopInAfterSale.IsChecked.ParseToBool();
|
|
|
|
chkEmergencyShopInAfterSaleIsChecked = chkEmergencyShopInAfterSale.IsChecked.ParseToBool();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FilterOrders();
|
|
|
|
FilterOrders();
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -2434,8 +2449,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
chk.IsChecked = !isCheck;
|
|
|
|
|
|
|
|
|
|
|
|
chkWaitReceiveWarehouseIsNotPickupIsChecked = chkWaitReceiveWarehouseIsNotPickup.IsChecked.ParseToBool();
|
|
|
|
chkWaitReceiveWarehouseIsNotPickupIsChecked = chkWaitReceiveWarehouseIsNotPickup.IsChecked.ParseToBool();
|
|
|
|
chkWaitReceiveWarehouseIsPickupIsChecked = chkWaitReceiveWarehouseIsPickup.IsChecked.ParseToBool();
|
|
|
|
chkWaitReceiveWarehouseIsPickupIsChecked = chkWaitReceiveWarehouseIsPickup.IsChecked.ParseToBool();
|
|
|
|
chkWaitReceiveWarehouseIsSendOutIsChecked = chkWaitReceiveWarehouseIsSendOut.IsChecked.ParseToBool();
|
|
|
|
chkWaitReceiveWarehouseIsSendOutIsChecked = chkWaitReceiveWarehouseIsSendOut.IsChecked.ParseToBool();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FilterOrders();
|
|
|
|
FilterOrders();
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -3431,80 +3446,80 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public class OrderFilterConfig : PropertyNotifyObject
|
|
|
|
public class OrderFilterConfig : PropertyNotifyObject
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
public string FilterGoodsNameType { get; set; } = "标题包含";
|
|
|
|
|
|
|
|
public string FilterRemarkType { get; set; } = "店铺备注包含";
|
|
|
|
|
|
|
|
public List<string> lstFilterGoodsName { get; set; } = new List<string>();
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 隐藏标记
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
public bool chkHideGreenFlagIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
public string FilterGoodsNameType { get; set; } = "标题包含";
|
|
|
|
get { return this.GetValue(x => x.chkHideGreenFlagIsChecked); }
|
|
|
|
public string FilterRemarkType { get; set; } = "店铺备注包含";
|
|
|
|
set { this.SetValue(x => x.chkHideGreenFlagIsChecked, value); }
|
|
|
|
public List<string> lstFilterGoodsName { get; set; } = new List<string>();
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 隐藏标记
|
|
|
|
/// 过滤非本系统订单
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkHideGreenFlagIsChecked
|
|
|
|
public bool chkOnlyWarehouseOrderIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkHideGreenFlagIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkOnlyWarehouseOrderIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkHideGreenFlagIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkOnlyWarehouseOrderIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 过滤非本系统订单
|
|
|
|
/// 过滤多子单订单
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkOnlyWarehouseOrderIsChecked
|
|
|
|
public bool chkNoMultiOrderIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkOnlyWarehouseOrderIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkNoMultiOrderIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkOnlyWarehouseOrderIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkNoMultiOrderIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 过滤多子单订单
|
|
|
|
/// 云仓
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkNoMultiOrderIsChecked
|
|
|
|
public bool chkTransitOrderIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkNoMultiOrderIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkTransitOrderIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkNoMultiOrderIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkTransitOrderIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 云仓
|
|
|
|
/// 直发
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkTransitOrderIsChecked
|
|
|
|
public bool chkDirectOrderIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkTransitOrderIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkDirectOrderIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkTransitOrderIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkDirectOrderIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 直发
|
|
|
|
/// 云改直
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkDirectOrderIsChecked
|
|
|
|
public bool chkTransitChangeDirectOrderIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkDirectOrderIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkTransitChangeDirectOrderIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkDirectOrderIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkTransitChangeDirectOrderIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 云改直
|
|
|
|
/// 过滤备注
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public bool chkTransitChangeDirectOrderIsChecked
|
|
|
|
public bool chkFilterRemarkIsChecked
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.GetValue(x => x.chkTransitChangeDirectOrderIsChecked); }
|
|
|
|
get { return this.GetValue(x => x.chkFilterRemarkIsChecked); }
|
|
|
|
set { this.SetValue(x => x.chkTransitChangeDirectOrderIsChecked, value); }
|
|
|
|
set { this.SetValue(x => x.chkFilterRemarkIsChecked, value); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
|
|
public ConcurrentList<string> lstFilterOrderIds
|
|
|
|
/// 过滤备注
|
|
|
|
{
|
|
|
|
/// </summary>
|
|
|
|
get { return this.GetValue(x => x.lstFilterOrderIds); }
|
|
|
|
public bool chkFilterRemarkIsChecked
|
|
|
|
set { this.SetValue(x => x.lstFilterOrderIds, value); }
|
|
|
|
{
|
|
|
|
}
|
|
|
|
get { return this.GetValue(x => x.chkFilterRemarkIsChecked); }
|
|
|
|
public ConcurrentList<string> lstFilterRemarkText
|
|
|
|
set { this.SetValue(x => x.chkFilterRemarkIsChecked, value); }
|
|
|
|
{
|
|
|
|
}
|
|
|
|
get { return this.GetValue(x => x.lstFilterRemarkText); }
|
|
|
|
public ConcurrentList<string> lstFilterOrderIds
|
|
|
|
set { this.SetValue(x => x.lstFilterRemarkText, value); }
|
|
|
|
{
|
|
|
|
}
|
|
|
|
get { return this.GetValue(x => x.lstFilterOrderIds); }
|
|
|
|
public string txtFilterShopNameText
|
|
|
|
set { this.SetValue(x => x.lstFilterOrderIds, value); }
|
|
|
|
{
|
|
|
|
}
|
|
|
|
get { return this.GetValue(x => x.txtFilterShopNameText); }
|
|
|
|
public ConcurrentList<string> lstFilterRemarkText
|
|
|
|
set { this.SetValue(x => x.txtFilterShopNameText, value); }
|
|
|
|
{
|
|
|
|
|
|
|
|
get { return this.GetValue(x => x.lstFilterRemarkText); }
|
|
|
|
|
|
|
|
set { this.SetValue(x => x.lstFilterRemarkText, value); }
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
public string txtFilterShopNameText
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
get { return this.GetValue(x => x.txtFilterShopNameText); }
|
|
|
|
|
|
|
|
set { this.SetValue(x => x.txtFilterShopNameText, value); }
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|