1同步物流单可以手动编辑取件码 2优化上海退货仓退货地址匹配逻辑
This commit is contained in:
1 parent
0b47a16eb9
commit
37cb8e86ae
13 files changed
+644
-190
No files matched your search
@@ -497,6 +497,24 @@
|
||||
Content="同步订单"
|
||||
Style="{StaticResource BasePageButtonStyle}"
|
||||
ToolTip="同步选中的订单或选中的店铺" />
|
||||
<Polyline
|
||||
Grid.Column="5"
|
||||
Width="10"
|
||||
Margin="2,0"
|
||||
VerticalAlignment="Center"
|
||||
Points="5,0 5,4 5,0"
|
||||
Stroke="{StaticResource mainColorBrush}"
|
||||
StrokeThickness="2" />
|
||||
<CheckBox
|
||||
x:Name="chkNoPickupNumOrder"
|
||||
Margin="2,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
BorderBrush="{StaticResource mainColorBrush}"
|
||||
Click="chkNoPickupNumOrder_Click"
|
||||
Content="仅显示无取件码同步物流单"
|
||||
FontSize="12"
|
||||
IsChecked="False" />
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
<Grid
|
||||
|
||||
@@ -77,6 +77,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
public DateTime nextGetOrderTime = DateTime.MinValue;
|
||||
|
||||
public string strSearchAll { get; set; } = "";
|
||||
public bool chkNoPickupNumOrderIsChecked { get; set; } = false;
|
||||
public ShipGiftService _shipGiftService { get; }
|
||||
public OrderListCtrl()
|
||||
{
|
||||
@@ -1577,6 +1578,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!orderFilterConfig.chkTransitChangeDirectOrderIsChecked == true && order.OrderBuyType == "云改直")
|
||||
return true;
|
||||
|
||||
if (chkNoPickupNumOrderIsChecked == true)
|
||||
{
|
||||
if (order.SyncWaybillIdInfo.IsNullOrEmpty())
|
||||
return true;
|
||||
if (!order.SyncWaybillPickNo.IsNullOrEmpty())
|
||||
return true;
|
||||
}
|
||||
|
||||
var filterTimeRst = false;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
@@ -2310,7 +2319,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
// 退货地址不是退货仓,跳过
|
||||
if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false)
|
||||
if (orderItem.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) != true)
|
||||
continue;
|
||||
|
||||
if (orderItem.DistribReturnOrderInfo == null || orderItem.DistribReturnOrderInfo.warehouse_status == 0)
|
||||
@@ -2360,7 +2369,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
// 退货地址不是退货仓,跳过
|
||||
if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false)
|
||||
if (orderItem.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) != true)
|
||||
continue;
|
||||
// 退货包裹未发货,跳过(仅退货退款已发货的才自动去申请拼多多退货退款)
|
||||
if ((orderItem.ItemRefund?.return_waybill_id).IsNullOrEmpty())
|
||||
@@ -3013,6 +3022,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill = chkSyncDirectOrderWaybill.IsChecked.ParseToBool();
|
||||
StartUp.SaveBuyConfig();
|
||||
}
|
||||
|
||||
private void chkNoPickupNumOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
chkNoPickupNumOrderIsChecked = chkNoPickupNumOrder.IsChecked.ParseToBool();
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
public class OrderFilterConfig : PropertyNotifyObject
|
||||
|
||||
@@ -1047,6 +1047,8 @@
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="取件码" />
|
||||
|
||||
|
||||
|
||||
<uc:UcWaterMarkTextBox1
|
||||
Margin="-2,2,4,2"
|
||||
Padding="0"
|
||||
@@ -1069,6 +1071,16 @@
|
||||
Style="{StaticResource LinkButton}"
|
||||
Tag="{Binding ItemOrder.OutExpressNoStr}"
|
||||
Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource NotHasTextVisibility}}" />
|
||||
|
||||
<Button
|
||||
x:Name="btnEditPickNo"
|
||||
Padding="0,0,0,0"
|
||||
d:Content="填取件码"
|
||||
Click="btnEditPickNo_Click"
|
||||
Content="填取件码"
|
||||
Style="{StaticResource LinkButton}"
|
||||
Tag="{Binding ItemOrder.OutExpressNoStr}"
|
||||
Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource HasTextVisibility}}" />
|
||||
</WrapPanel>
|
||||
</wpf:TitleContent>
|
||||
|
||||
|
||||
@@ -1925,6 +1925,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
MainWindow.Instance.pddBuyerOrderReadCtrl.SendAsyncWaybillOrder(orderLiteInfo, true);
|
||||
}
|
||||
}
|
||||
|
||||
private void btnEditPickNo_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
ChangePickNoView changeWaybillView = new ChangePickNoView(orderItem);
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "填写取件码",
|
||||
Content = changeWaybillView,
|
||||
}.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user