仓库单详情列表 中转仓退货包裹如果没有物流使用买手物流

This commit is contained in:
wule committed 2026-10-27 10:16:34 +08:00
1 parent c1352264a9
commit cb61749cda
6 files changed
+255 -26

No files matched your search

@@ -2135,7 +2135,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
{
//return;
return;
if (this.DataContext is oms_wei_order_item_info orderItem)
{
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
@@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:wpf="WPFCommon"
d:DesignHeight="280"
d:DesignWidth="800"
d:DesignWidth="1000"
Background="White"
mc:Ignorable="d">
<UserControl.Resources>
@@ -66,6 +66,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="0.7*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border
@@ -88,6 +89,7 @@
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="买手单号:">
<TextBox
d:Text="261008-1234567890123456"
Background="Transparent"
@@ -158,14 +160,6 @@
IsReadOnly="True"
Text="{Binding WarehouseStatus}"
TextWrapping="Wrap" />
<TextBox
d:Text="(已作废)"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitVoidStatus}"
TextWrapping="Wrap" />
</WrapPanel>
</wpf:TitleContent>
@@ -213,6 +207,49 @@
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0"
Opacity="0.5">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<wpf:TitleContent Title="作废状态:" FontWeight="Bold">
<TextBox
d:Text="已作废"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitVoidStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="拒收状态:" FontWeight="Bold">
<TextBox
d:Text="拒收失败"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitRejectStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="拦截状态:" FontWeight="Bold">
<TextBox
d:Text="已拦截"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitReturnStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
</Border>
<Border
Grid.Column="3"
Margin="0,10"
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0"
Opacity="0.5">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
@@ -175,6 +175,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
data["recipientPhone"] = txtMobile.Text.Trim();
data["account_user"] = BaseClass.UserName;
data["accountUser"] = BaseClass.UserName;
if (string.IsNullOrEmpty(TransitOrder.express_1_waybill) && string.IsNullOrEmpty(TransitOrder.express_2_waybill) &&
!string.IsNullOrWhiteSpace(txtWarehouseWaybill.Text) && !string.IsNullOrWhiteSpace(txtExpressName.Text.Trim()))
{
data["refundWaybill"] = txtWarehouseWaybill.Text.Trim();
data["returnExpressCompany"] = txtExpressName.Text.Trim();
}
//data["platform"] = "WEISHOP";
if (GlobalConfig.BuyConfig.IsUseAppBalance)