淘宝拍单45% 优化中转仓拒收拦截退货等相关操作 拍单地址未修改的拦住付款按钮
This commit is contained in:
1 parent
f27ddca730
commit
d109a90302
11 files changed
+452
-42
No files matched your search
@@ -1779,7 +1779,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
//"System.Windows.Controls.ComboBoxItem: 未申请";
|
||||
var cmbRejectStatusText = cmbRejectStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "申请"))
|
||||
if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "未申请"))
|
||||
return true;
|
||||
if (cmbRejectStatusText == "申请中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收"))
|
||||
return true;
|
||||
@@ -1795,7 +1795,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
}
|
||||
var cmbReturnPackageStatusText = cmbReturnPackageStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
if (cmbReturnPackageStatusText == "未拦截" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "添加"))
|
||||
if (cmbReturnPackageStatusText == "未拦截" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "未添加"))
|
||||
return true;
|
||||
if (cmbReturnPackageStatusText == "拦截中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "已添加"))
|
||||
return true;
|
||||
|
||||
@@ -1267,7 +1267,7 @@
|
||||
WaterMark="云仓退货" />
|
||||
<Button
|
||||
x:Name="btnRetrunOrder"
|
||||
d:Content="未创建"
|
||||
d:Content="创建"
|
||||
Click="btnReturnOrder_Click"
|
||||
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
||||
Style="{StaticResource LinkButton}" />
|
||||
|
||||
@@ -529,6 +529,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
Title = "淘宝买手登录",
|
||||
Content = taobaoBuyView,
|
||||
//Height = System.Windows.Forms.SystemInformation.WorkingArea.Height - 80,
|
||||
//Height = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Height - 80,
|
||||
Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
||||
WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
||||
}.ShowDialog();
|
||||
}
|
||||
|
||||
@@ -1193,7 +1197,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
// 不是中转仓,直接返回
|
||||
// 显示状态的按钮,直接返回
|
||||
if (sender == btnAddEditTransitWarehouseAfterSale)
|
||||
return;
|
||||
|
||||
@@ -1555,6 +1559,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败"))
|
||||
return;
|
||||
|
||||
//if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||
//{
|
||||
// BaseMsgWindow.ShowError("商品未出库,请选择中转仓拒收!");
|
||||
|
||||
Reference in new issue
Block a user