分销退货优化 提交退货包裹逻辑优化
This commit is contained in:
1 parent
a7076e7f3f
commit
4161c94243
11 files changed
+1851
-1323
No files matched your search
@@ -1,99 +1,321 @@
|
||||
<basewindows:BaseWindow x:Class="_29WxOrderWpf.Windows.OrderWindows.TransitAfterSaleWindow" xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
|
||||
xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls" xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||
mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
|
||||
Title="TransitAfterSaleWindow" Height="650" Width="600" ResizeMode="NoResize" Loaded="TransitAfterSaleWindow_Loaded">
|
||||
<Grid Background="Transparent" x:Name="mainGrid" Margin="2">
|
||||
<basewindows:BaseWindow
|
||||
x:Class="_29WxOrderWpf.Windows.OrderWindows.TransitAfterSaleWindow"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
|
||||
xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
|
||||
Title="TransitAfterSaleWindow"
|
||||
Width="600"
|
||||
Height="650"
|
||||
Loaded="TransitAfterSaleWindow_Loaded"
|
||||
ResizeMode="NoResize"
|
||||
Style="{StaticResource BaseNoneBorderWindowStyle}"
|
||||
mc:Ignorable="d">
|
||||
<Grid
|
||||
x:Name="mainGrid"
|
||||
Margin="2"
|
||||
Background="Transparent">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid x:Name="gridTitle">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Source="{StaticResource main29WeixinIcon}" Height="50" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="4"></Image>
|
||||
<Label x:Name="lblAppName" FontSize="20" Margin="0,0,0,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" VerticalContentAlignment="Center" Content="中转单售后" Grid.Column="1"></Label>
|
||||
<Image
|
||||
Width="50"
|
||||
Height="50"
|
||||
Margin="4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Source="{StaticResource main29WeixinIcon}" />
|
||||
<Label
|
||||
x:Name="lblAppName"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Content="中转单售后"
|
||||
FontSize="20"
|
||||
Foreground="{StaticResource mainColorLightBrush}" />
|
||||
</Grid>
|
||||
<Border Background="White" Grid.Row="1" Padding="40, 20">
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Padding="40,20"
|
||||
Background="White">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="Auto" MinHeight="20"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="Auto" MinHeight="20" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="100"></ColumnDefinition>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition Width="100" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="1">仓库:</Label>
|
||||
<ComboBox x:Name="cmbWareHouse" Grid.Row="1" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Top" IsReadOnly="True" IsEnabled="False"
|
||||
Style="{StaticResource RoundedComboBox}" Height="28" SelectedIndex="0" Margin="0,0,0,25">
|
||||
</ComboBox>
|
||||
<Label
|
||||
Grid.Row="1"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
仓库:
|
||||
</Label>
|
||||
<ComboBox
|
||||
x:Name="cmbWareHouse"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
IsEnabled="False"
|
||||
IsReadOnly="True"
|
||||
SelectedIndex="0"
|
||||
Style="{StaticResource RoundedComboBox}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="2">物流公司:</Label>
|
||||
<TextBox x:Name="txtExpressName" Grid.Row="2" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<Label
|
||||
Grid.Row="2"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
物流公司:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtExpressName"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="3">物流单号:</Label>
|
||||
<TextBox x:Name="txtWarehouseWaybill" Grid.Row="3" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<Label
|
||||
Grid.Row="3"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
物流单号:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtWarehouseWaybill"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="4">地址解析:</Label>
|
||||
<TextBox x:Name="txtAddressAnalysis" Grid.Row="4" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" Height="80" BorderThickness="1" Padding="0,4"
|
||||
VerticalContentAlignment="Top" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" TextWrapping="Wrap" Margin="0,0,0,25"/>
|
||||
<Button Grid.Row="4" Grid.Column="1" x:Name="btnAddressAnalysis" Style="{StaticResource BasePageButtonStyle}" Click="btnAddressAnalysis_Click"
|
||||
Margin="4, 29" Content="解 析" MinWidth="48" Height="28" HorizontalAlignment="Right" VerticalAlignment="Bottom" Padding="4"/>
|
||||
<Label
|
||||
Grid.Row="4"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
地址解析:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtAddressAnalysis"
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Height="80"
|
||||
Margin="0,0,0,25"
|
||||
Padding="0,4"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Top"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}"
|
||||
TextWrapping="Wrap" />
|
||||
<Button
|
||||
x:Name="btnAddressAnalysis"
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
MinWidth="48"
|
||||
Margin="4,29"
|
||||
Padding="4"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Bottom"
|
||||
Click="btnAddressAnalysis_Click"
|
||||
Content="解 析"
|
||||
Style="{StaticResource BasePageButtonStyle}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="5">收件人:</Label>
|
||||
<TextBox x:Name="txtUser" Grid.Row="5" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<Label
|
||||
Grid.Row="5"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
收件人:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtUser"
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="6">联系电话:</Label>
|
||||
<TextBox x:Name="txtMobile" Grid.Row="6" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<Label
|
||||
Grid.Row="6"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
联系电话:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtMobile"
|
||||
Grid.Row="6"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="7">省/市/区:</Label>
|
||||
<Label
|
||||
Grid.Row="7"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
省/市/区:
|
||||
</Label>
|
||||
<Grid Grid.Row="7" Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox x:Name="txtProvince" Grid.Row="0" Grid.Column="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<TextBox x:Name="txtCity" Grid.Row="0" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="2,0,2,25"/>
|
||||
<TextBox x:Name="txtCounty" Grid.Row="0" Grid.Column="2" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<TextBox
|
||||
x:Name="txtProvince"
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
<TextBox
|
||||
x:Name="txtCity"
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="2,0,2,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
<TextBox
|
||||
x:Name="txtCounty"
|
||||
Grid.Row="0"
|
||||
Grid.Column="2"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
</Grid>
|
||||
|
||||
<Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="8">详细地址:</Label>
|
||||
<TextBox x:Name="txtDetailAddress" Grid.Row="8" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
|
||||
Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,25"/>
|
||||
<Label
|
||||
Grid.Row="8"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="14">
|
||||
详细地址:
|
||||
</Label>
|
||||
<TextBox
|
||||
x:Name="txtDetailAddress"
|
||||
Grid.Row="8"
|
||||
Grid.Column="1"
|
||||
Height="28"
|
||||
Margin="0,0,0,25"
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
|
||||
<Button Grid.Row="9" Grid.Column="1" x:Name="btnAdd" Style="{StaticResource BasePageButtonStyle}" Click="btnAdd_Click"
|
||||
Margin="0,0,0,0" Content="添 加" MinWidth="48" Height="28" HorizontalAlignment="left" VerticalAlignment="Top" Padding="4"/>
|
||||
<Label x:Name="lblMsg" Grid.Row="9" Grid.Column="1" Margin="70,0,0,0" Foreground="{StaticResource PageWarningBrushCC}"></Label>
|
||||
<Button
|
||||
x:Name="btnWorkOrder"
|
||||
Grid.Row="9"
|
||||
Grid.Column="0"
|
||||
Height="28"
|
||||
MinWidth="48"
|
||||
Margin="0,0,0,0"
|
||||
Padding="4"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
d:Visibility="Visible"
|
||||
Click="btnWorkOrder_Click"
|
||||
Content="提交工单"
|
||||
Style="{StaticResource BasePageButtonStyle}"
|
||||
Visibility="Collapsed" />
|
||||
<Button
|
||||
x:Name="btnAdd"
|
||||
Grid.Row="9"
|
||||
Grid.Column="1"
|
||||
MinWidth="48"
|
||||
Padding="4"
|
||||
HorizontalAlignment="Left"
|
||||
Click="btnAdd_Click"
|
||||
Content="添 加"
|
||||
Style="{StaticResource BasePageButtonStyle}" />
|
||||
<Label
|
||||
x:Name="lblMsg"
|
||||
Grid.Row="9"
|
||||
Grid.Column="1"
|
||||
Margin="70,0,0,0"
|
||||
Foreground="{StaticResource PageWarningBrushCC}" />
|
||||
<Label
|
||||
x:Name="lblWorkOrderMsg"
|
||||
Grid.Row="11"
|
||||
Grid.Column="1"
|
||||
Margin="-6,0,0,0"
|
||||
d:Content="已提交工单"
|
||||
Foreground="{StaticResource pageColorBrush}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<userctrls:UcWindowBoxes x:Name="ucWindowBox" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
|
||||
<userctrls:UcWindowBoxes
|
||||
x:Name="ucWindowBox"
|
||||
Margin="4"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
MaxBoxVisibility="Visible" />
|
||||
</Grid>
|
||||
</basewindows:BaseWindow>
|
||||
@@ -44,7 +44,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
}
|
||||
|
||||
private void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
|
||||
{
|
||||
@@ -53,7 +53,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
if (OrderItem != null)
|
||||
{
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrder?.platform)?.TransName;
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrder?.platform)?.TransName;
|
||||
this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company;
|
||||
this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill;
|
||||
|
||||
@@ -77,18 +77,26 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
}
|
||||
}
|
||||
|
||||
var workOrderInfo = await GetWorkOrder();
|
||||
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
|
||||
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
|
||||
if (!string.IsNullOrEmpty(issueType))
|
||||
{
|
||||
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
|
||||
}
|
||||
}
|
||||
|
||||
//if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
|
||||
////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1)
|
||||
//{
|
||||
// btnAdd.IsEnabled = false;
|
||||
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||
// lblMsg.Content = "当前订单仓库状态不支持售后,请联系买家直接退回总店!";
|
||||
// return;
|
||||
//}
|
||||
//if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
|
||||
////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1)
|
||||
//{
|
||||
// btnAdd.IsEnabled = false;
|
||||
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||
// lblMsg.Content = "当前订单仓库状态不支持售后,请联系买家直接退回总店!";
|
||||
// return;
|
||||
//}
|
||||
|
||||
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||
{
|
||||
lblMsg.Content = "当前订单仓库状态不支持售后!";
|
||||
}
|
||||
@@ -102,19 +110,28 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
return;
|
||||
}
|
||||
|
||||
//http://localhost:8088/oms-api/external_procurement/createReturnPackage
|
||||
//{
|
||||
// "orderNo": "3737011320735026432",
|
||||
// "orderCode": "4600000167202606117621000767",
|
||||
// "refundProvince": "安徽省",
|
||||
// "refundCity": "合肥市",
|
||||
// "refundCounty": "瑶海区",
|
||||
// "refundDetailAddress": "某街道 1”,
|
||||
// "recipientName": "张三",
|
||||
// "recipientPhone": "13800138000"
|
||||
//} post(json)请求方式,如果使用客户端账户扣款增加一个参数account_user
|
||||
var workOrder = AddWorkOrder();
|
||||
if (!workOrder.Contains("\"success\":true"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转拦截包裹添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
|
||||
return;
|
||||
}
|
||||
//{"success":true,"replayed":true,"operation":"replayed","ticket":{"id":"1d268a38-7f60-4295-9345-a8f21298181c","ticketNo":"WO-20260820102516-AE62D8F2","issueType":"拦截退回云仓-出库后","status":"pending_approval","queue":"pending"},"creatorBinding":{"bound":true,"clientUserId":"user_1784451034258_a6da3c","username":"18305598906"},"targetOrder":{"appId":"wx5cfcfda1fae03689","wechatOrderNo":"3737793636785868032","purchaseOrderNo":"260716-496899202560980","verified":true},"requestId":"2bbd8e98-0a95-4162-9fc1-b377644209ed"}
|
||||
|
||||
JObject data = new JObject();
|
||||
|
||||
//http://localhost:8088/oms-api/external_procurement/createReturnPackage
|
||||
//{
|
||||
// "orderNo": "3737011320735026432",
|
||||
// "orderCode": "4600000167202606117621000767",
|
||||
// "refundProvince": "安徽省",
|
||||
// "refundCity": "合肥市",
|
||||
// "refundCounty": "瑶海区",
|
||||
// "refundDetailAddress": "某街道 1”,
|
||||
// "recipientName": "张三",
|
||||
// "recipientPhone": "13800138000"
|
||||
//} post(json)请求方式,如果使用客户端账户扣款增加一个参数account_user
|
||||
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = OrderItem.ItemTransitOrder?.order_code;
|
||||
data["refundProvince"] = txtProvince.Text.Trim();
|
||||
@@ -207,5 +224,30 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
this.txtUser.Text = tArr.FirstOrDefault();
|
||||
this.txtDetailAddress.Text = string.Join("", tArr).Replace(this.txtUser.Text, "");
|
||||
}
|
||||
}
|
||||
|
||||
private void btnWorkOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
public string AddWorkOrder()
|
||||
{
|
||||
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
|
||||
JObject obj = new JObject();
|
||||
obj["appId"] = this.OrderItem.Shop.ShopId;
|
||||
obj["wechatOrderNo"] = this.OrderItem.order_id;
|
||||
obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
|
||||
obj["creator"] = BaseClass.UserName;
|
||||
obj["remark"] = "客户要求拦截并退回云仓";
|
||||
|
||||
var rst = HttpResponseTransitWorkOrderBLL.PostResponse(this.OrderItem.Shop, url, JsonHelper.SerializeObject(obj), "");
|
||||
return rst;
|
||||
}
|
||||
|
||||
public async Task<string> GetWorkOrder()
|
||||
{
|
||||
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders?wechatOrderNo=" + this.OrderItem.order_id;
|
||||
var rst = await HttpResponseTransitWorkOrderBLL.GetResponseAsync(this.OrderItem.Shop, url, "");
|
||||
return rst;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
this.cmbExpressName.Items.Add("极兔速递");
|
||||
this.cmbExpressName.Items.Add("申通快递");
|
||||
this.cmbExpressName.Items.Add("韵达快递");
|
||||
this.cmbExpressName.Items.Add("圆通快递");
|
||||
this.cmbExpressName.Items.Add("圆通速递");
|
||||
this.cmbExpressName.Items.Add("中通快递");
|
||||
this.cmbExpressName.Items.Add("百世快运");
|
||||
this.cmbExpressName.Items.Add("顺丰速运");
|
||||
@@ -178,7 +178,10 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
jObj["orderDetailsList"] = new JArray();
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
if (btnAdd.Content.ToString() == "添 加")
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
var addReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/addReturnOrder";
|
||||
var addReturnOrderStr = JsonHelper.SerializeObject(jObj);
|
||||
@@ -193,8 +196,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var orderCode = returnOrders.OrderBy(o => o.created_at).LastOrDefault()?.order_code;
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转仓退货订单创建失败,售后单获取失败");
|
||||
@@ -205,9 +209,10 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var createObj = new JObject();
|
||||
createObj["orderCode"] = orderCode;
|
||||
createObj["logisticsCode"] = jObj["logisticsCode"].ParseToString();
|
||||
createObj["logisticsExpressCode"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
createObj["logisticsExpressNo"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
var createReturnOrderStr = JsonHelper.SerializeObject(createObj);
|
||||
var createReturnOrderRst = HttpResponseWXBLL.e57PostResponse(createReturnOrderUrl, createReturnOrderStr, "");
|
||||
//<AjaxResult><msg>创建第三方退货订单成功</msg><code>0</code></AjaxResult>
|
||||
if (!createReturnOrderRst.ParseToString().Contains("<code>200</code>") && !createReturnOrderRst.ParseToString().Contains("<code>0</code>"))
|
||||
{
|
||||
string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg");
|
||||
@@ -295,6 +300,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
var addReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/addReturnOrder";
|
||||
@@ -310,8 +317,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var orderCode = returnOrders.OrderBy(o => o.created_at).LastOrDefault()?.order_code;
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,售后单获取失败", "Error", 5);
|
||||
@@ -322,7 +330,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var createObj = new JObject();
|
||||
createObj["orderCode"] = orderCode;
|
||||
createObj["logisticsCode"] = jObj["logisticsCode"].ParseToString();
|
||||
createObj["logisticsExpressCode"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
createObj["logisticsExpressNo"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
var createReturnOrderStr = JsonHelper.SerializeObject(createObj);
|
||||
var createReturnOrderRst = HttpResponseWXBLL.e57PostResponse(createReturnOrderUrl, createReturnOrderStr, "");
|
||||
if (!createReturnOrderRst.ParseToString().Contains("<code>200</code>") && !createReturnOrderRst.ParseToString().Contains("<code>0</code>"))
|
||||
@@ -335,9 +343,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建成功", "Msg", 2);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user