xaml用制表符缩进 优化订单分配逻辑
This commit is contained in:
1 parent
237fad81eb
commit
aeb30c1171
22 files changed
+2885
-2435
No files matched your search
@@ -1459,6 +1459,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!order.IsWaitReceive)
|
||||
return true;
|
||||
|
||||
if (chkNeedCheckExpress.IsChecked == true)
|
||||
{
|
||||
var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
|
||||
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
|
||||
if (!rst1 && !rst2)
|
||||
return true;
|
||||
}
|
||||
|
||||
if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
|
||||
return true;
|
||||
if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
|
||||
@@ -2524,6 +2532,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void chkNeedCheckExpress_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (sender is CheckBox chk)
|
||||
{
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkNeedCheckExpress.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
public class OrderFilterConfig : PropertyNotifyObject
|
||||
|
||||
Reference in new issue
Block a user