xaml用制表符缩进 优化订单分配逻辑

This commit is contained in:
wule committed 2026-08-28 04:28:48 +08:00
1 parent 237fad81eb
commit aeb30c1171
22 files changed
+2885 -2435

No files matched your search

@@ -1,321 +1,351 @@
<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 Height="*" />
</Grid.RowDefinitions>
<Grid x:Name="gridTitle">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<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
Grid.Row="1"
Padding="40,20"
Background="White">
<Grid>
<Grid.RowDefinitions>
<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 />
</Grid.ColumnDefinitions>
<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}" />
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 Height="*" />
</Grid.RowDefinitions>
<Grid x:Name="gridTitle">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<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
Grid.Row="1"
Padding="40,20"
Background="White">
<Grid>
<Grid.RowDefinitions>
<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 />
</Grid.ColumnDefinitions>
<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
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
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
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
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
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
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
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
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
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
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
Grid.Row="7"
HorizontalAlignment="Right"
VerticalAlignment="Top"
FontSize="14">
省/市/区:
</Label>
<Grid Grid.Row="7" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<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
Grid.Row="7"
HorizontalAlignment="Right"
VerticalAlignment="Top"
FontSize="14">
省/市/区:
</Label>
<Grid Grid.Row="7" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<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
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}" />
<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
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"
Margin="4"
HorizontalAlignment="Right"
VerticalAlignment="Top"
MaxBoxVisibility="Visible" />
</Grid>
<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="添 加"
IsEnabled="False"
Style="{StaticResource BasePageButtonStyle}" />
<Image
x:Name="imgLoading"
Grid.Row="9"
Grid.Column="1"
Width="20"
Height="20"
Margin="48,0,0,0"
HorizontalAlignment="Left"
IsEnabled="False"
Source="{StaticResource imgLoadingPic}">
<Image.RenderTransform>
<RotateTransform Angle="45" CenterX="10" CenterY="10" />
</Image.RenderTransform>
<Image.Triggers>
<EventTrigger RoutedEvent="Image.Loaded">
<BeginStoryboard>
<Storyboard>
<DoubleAnimation
RepeatBehavior="Forever"
Storyboard.TargetName="imgLoading"
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
From="0"
To="360"
Duration="0:0:3" />
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Image.Triggers>
</Image>
<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"
Margin="4"
HorizontalAlignment="Right"
VerticalAlignment="Top"
MaxBoxVisibility="Visible" />
</Grid>
</basewindows:BaseWindow>
@@ -45,8 +45,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
{
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{
btnAdd.IsEnabled = true;
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{
this.cmbWareHouse.Items.Add(warehouse.TransName);
}
@@ -71,12 +72,29 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
else
{
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
}
}
imgLoading.Visibility = Visibility.Collapsed;
var workOrderInfo = await GetWorkOrder();
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
@@ -234,6 +252,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder()
{
if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
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;