修复显示作废(显示错误)订单无法作废重拍的问题
This commit is contained in:
1 parent
04584600c8
commit
e492457516
5 files changed
+181
-125
No files matched your search
@@ -554,7 +554,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
else
|
else
|
||||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||||
// 中转仓退货包裹订单
|
// 中转仓退货包裹订单
|
||||||
if (item.order_id == "3739241588056569856")
|
if (item.order_id == "3740040052771291904")
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1011,7 +1011,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
|
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
|
||||||
return pddBuyerAfterSales;
|
return pddBuyerAfterSales;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2135,6 +2135,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||||
{
|
{
|
||||||
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
||||||
|
|||||||
@@ -1,123 +1,167 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
|
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:wpf="WPFCommon"
|
xmlns:wpf="WPFCommon"
|
||||||
d:DesignHeight="280"
|
d:DesignHeight="280"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
Background="White"
|
Background="White"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
|
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
|
||||||
<Setter Property="Placement" Value="Left" />
|
<Setter Property="Placement" Value="Left" />
|
||||||
<Setter Property="TitleVerticalAlignment" Value="Center" />
|
<Setter Property="TitleVerticalAlignment" Value="Center" />
|
||||||
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
|
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="wpf:SpacingStackPanel">
|
<Style TargetType="wpf:SpacingStackPanel">
|
||||||
<Setter Property="Margin" Value="3,0" />
|
<Setter Property="Margin" Value="3,0" />
|
||||||
</Style>
|
</Style>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<Border
|
<Border
|
||||||
MinHeight="50"
|
MinHeight="50"
|
||||||
Margin="5"
|
Margin="5"
|
||||||
BorderBrush="SkyBlue"
|
BorderBrush="SkyBlue"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="10">
|
CornerRadius="10">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
||||||
<StackPanel MinHeight="30" Orientation="Horizontal">
|
<StackPanel MinHeight="30" Orientation="Horizontal">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="仓库订单号" />
|
Text="仓库订单号" />
|
||||||
<TextBox
|
<TextBox
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
d:Text="261008-123456789012345"
|
d:Text="261008-123456789012345"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding OrderCode}" />
|
Text="{Binding OrderCode}" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="仓库类型"
|
d:Text="仓库类型"
|
||||||
Text="{Binding TransitTypeStr}" />
|
Text="{Binding TransitTypeStr}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
d:Text="261008-123456789012345"
|
d:Text="261008-123456789012345"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding SourceCode}" />
|
Text="{Binding SourceCode}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border
|
<Border
|
||||||
Margin="0,10"
|
Margin="0,10"
|
||||||
BorderBrush="LightSkyBlue"
|
BorderBrush="LightSkyBlue"
|
||||||
BorderThickness="0,0,1,0"
|
BorderThickness="0,0,1,0"
|
||||||
Opacity="0.5">
|
Opacity="0.5">
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
Margin="10,10"
|
Margin="10,10"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
VerticalSpacing="4">
|
VerticalSpacing="4">
|
||||||
<wpf:TitleContent Title="交易单号:">
|
<wpf:TitleContent Title="交易单号:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="371234567890123456"
|
d:Text="371234567890123456"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding WxOrderId}"
|
Text="{Binding WxOrderId}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="买手单号:">
|
<wpf:TitleContent Title="买手单号:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="261008-1234567890123456"
|
d:Text="261008-1234567890123456"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding OutOrderId}"
|
Text="{Binding OutOrderId}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="下单时间:">
|
<wpf:TitleContent Title="下单时间:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="26-10-07 10:33:33"
|
d:Text="26-10-07 10:33:33"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding WxOrderCreateTimeStr}"
|
Text="{Binding WxOrderCreateTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="取号时间:">
|
<wpf:TitleContent Title="取号时间:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="26-10-08 00:33:33"
|
d:Text="26-10-08 00:33:33"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding PickUpTimeStr}"
|
Text="{Binding PickUpTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
</wpf:SpacingStackPanel>
|
</wpf:SpacingStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
<Border
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,10"
|
||||||
|
BorderBrush="LightSkyBlue"
|
||||||
|
BorderThickness="0,0,1,0"
|
||||||
|
Opacity="0.5">
|
||||||
|
<wpf:SpacingStackPanel
|
||||||
|
Margin="10,10"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Orientation="Vertical"
|
||||||
|
VerticalSpacing="4">
|
||||||
|
<wpf:TitleContent
|
||||||
|
Title="{Binding WarehouseName}"
|
||||||
|
d:Title="上海仓"
|
||||||
|
FontWeight="Bold">
|
||||||
|
<TextBox
|
||||||
|
d:Text="已出仓"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Normal"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding WxOrderId}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="入库单号:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="JTSD-JT12345678901122"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding PickUpTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="出库单号:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="YD-3111111555555123"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding PickUpTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
</wpf:SpacingStackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -13,6 +13,7 @@ using System.Text;
|
|||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
|
||||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
||||||
@@ -896,6 +897,11 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public bool GetIsAbnormal()
|
public bool GetIsAbnormal()
|
||||||
{
|
{
|
||||||
|
if (order_id == "3740040052771291904")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// 三退或者两退,为退款完成单
|
// 三退或者两退,为退款完成单
|
||||||
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
|
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
|
||||||
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
|
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
|
||||||
@@ -917,7 +923,7 @@ namespace AllBase.Model.DBModel
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
|
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
|
||||||
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
|
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// 取号异常或无法调用发货也放在异常单(异常需重拍)
|
// 取号异常或无法调用发货也放在异常单(异常需重拍)
|
||||||
|
|||||||
@@ -1837,17 +1837,22 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool GetIsAbnormalOrderRebuy()
|
public bool GetIsAbnormalOrderRebuy()
|
||||||
{
|
{
|
||||||
|
if (order_id == "3740040052771291904")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
var order_item = this;
|
var order_item = this;
|
||||||
|
|
||||||
// 不是异常单的不可异常重拍
|
// 不是异常单的不可异常重拍
|
||||||
if (order_item?.ItemOrder?.IsAbnormal != true)
|
if (order_item?.ItemOrder?.IsAbnormal != true)
|
||||||
return false;
|
return false;
|
||||||
// 买手未退款的,中转正式取号以后的,不可异常重拍
|
// 买手未退款的,中转正式取号以后的,不可异常重拍
|
||||||
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
|
if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
|
||||||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
|
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
|
||||||
return false;
|
return false;
|
||||||
// 已正式取号的,不可异常重拍
|
// 已正式取号的,不可异常重拍
|
||||||
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
|
if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
|
||||||
return false;
|
return false;
|
||||||
// 仓库异常的异常单不可异常重拍
|
// 仓库异常的异常单不可异常重拍
|
||||||
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
|
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
|
||||||
|
|||||||
Reference in new issue
Block a user