diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml index a0e52e8..afbedf6 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml @@ -890,8 +890,8 @@ VerticalAlignment="Center" Points="5,0 5,8 5,0" Stroke="{StaticResource mainColorBrush}" - StrokeThickness="2" /> - + StrokeThickness="2" + Visibility="Hidden" /> + FontSize="12" + Visibility="Hidden" /> + FontSize="12" + IsChecked="True" + Visibility="Hidden" /> + + + + + + + + + + + + + + + + + + + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 58540c1..7bef38e 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -1124,7 +1124,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls if (tabItem != null) { var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).ToList(); - Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Count() + ")"; })); + Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; })); + } + Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); })); + if (tabItem != null) + { + var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).ToList(); + Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; })); } Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常单")); })); if (tabItem != null) @@ -1150,7 +1156,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls Dispatcher.Invoke(new Action(() => { - if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) + if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime)); else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单")) GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.update_time)); @@ -1184,7 +1190,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls if (!GetOrderIsFilter(order)) { oms_wei_order_info nextOrder = null; - if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) + if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime); else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单")) nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time); @@ -1415,7 +1421,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } if (filterHeadStr.StartsWith("需处理售后单")) { - if (!order.IsEmergency) + if (!order.IsEmergencyManualReturnOrder) return true; if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) @@ -1432,12 +1438,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty())) return true; - // 退货仓 - if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress)) - return true; - // 非退货仓 - else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)) - return true; + //// 退货仓 + //if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress)) + // return true; + //// 非退货仓 + //else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)) + // return true; // 退款完成 if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成") @@ -1453,6 +1459,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else if (chkEmergencyRefund.IsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) return true; } + if (filterHeadStr.StartsWith("退货仓自动售后单")) + { + if (!order.IsEmergencyDistribReturnOrder) + return true; + } if (filterHeadStr.StartsWith("售后完成单")) { if (!order.IsRefund) diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs index 75e0109..b1f9109 100644 --- a/AllBase/Model/DBModel/oms_wei_order_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_info.cs @@ -174,11 +174,37 @@ namespace AllBase.Model.DBModel return false; } set { } - } - /// - /// 异常单(买手异常退货) - /// - public bool isAbnormal + } + + public bool IsEmergencyDistribReturnOrder + { + get + { + return IsEmergency && IsDistribReturnOrder; + } + set { } + } + public bool IsEmergencyManualReturnOrder + { + get + { + return IsEmergency && !IsDistribReturnOrder; + } + set { } + } + + public bool IsDistribReturnOrder + { + get + { + return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); + } + set { } + } + /// + /// 异常单(买手异常退货) + /// + public bool isAbnormal { get { @@ -281,7 +307,7 @@ namespace AllBase.Model.DBModel else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成")) return "退款完成"; // 用户取消申请 - else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) && + else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) && this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty())) return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr; if (this.status == 20 || this.status == 21)