优化同步单发货逻辑支持手动发货

This commit is contained in:
wule committed 2026-09-25 18:17:06 +08:00
1 parent 064d360de7
commit e1e118cc61
2 files changed
+411 -98

No files matched your search

@@ -1,54 +1,139 @@
<UserControl x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.PDDBuyerOrderReadCtrl" <UserControl
x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.PDDBuyerOrderReadCtrl"
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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls" xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
mc:Ignorable="d" Loaded="UserControl_Loaded" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" d:DesignWidth="1000" x:Name="pddBuyerOrderReadCtrl"> x:Name="pddBuyerOrderReadCtrl"
<Border BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,0,1" CornerRadius="5,0,0,5" Background="White"> d:DesignHeight="450"
d:DesignWidth="1000"
Loaded="UserControl_Loaded"
mc:Ignorable="d">
<Border
Background="White"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1,1,0,1"
CornerRadius="5,0,0,5">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition> <RowDefinition Height="40" />
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Style="{StaticResource BasePageButtonStyle}" Margin="-20,0,0,20" Grid.Row="1" HorizontalAlignment="left" Width="25" Height="60" <Button
x:Name="btnHideAll" Click="btnHideAll_Click"> x:Name="btnHideAll"
<TextBlock Margin="0,0,5,0">关<LineBreak/>闭</TextBlock> Grid.Row="1"
Width="25"
Height="60"
Margin="-20,0,0,20"
HorizontalAlignment="left"
Click="btnHideAll_Click"
Style="{StaticResource BasePageButtonStyle}">
<TextBlock Margin="0,0,5,0">
关<LineBreak />
闭</TextBlock>
</Button> </Button>
<Grid Margin="0,0,0,0"> <Grid Margin="0,0,0,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Margin="12,0,4,0" Width="16" Height="16" Source="{StaticResource imgCloseGray}" MouseLeftButtonUp="btnHideAll_Click" Cursor="Hand" Visibility="Collapsed"></Image> <Image
<WrapPanel VerticalAlignment="Center" Grid.Column="1"> Width="16"
Height="16"
Margin="12,0,4,0"
Cursor="Hand"
MouseLeftButtonUp="btnHideAll_Click"
Source="{StaticResource imgCloseGray}"
Visibility="Collapsed" />
<WrapPanel Grid.Column="1" VerticalAlignment="Center">
<CheckBox Content="自动读买手单" x:Name="chkAutoReadBuyerOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" <CheckBox
Margin="6,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/> x:Name="chkAutoReadBuyerOrder"
Margin="6,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkAutoReadBuyerOrder_CheckedChanged"
Content="自动读买手单"
FontSize="12"
IsChecked="true"
Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
<CheckBox Content="隐藏无微信订单的买手单" x:Name="chkHideNoWxIdOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" <CheckBox
Margin="6,0" VerticalAlignment="Center" Checked="chkHideNoWxIdOrder_CheckedChanged" Unchecked="chkHideNoWxIdOrder_CheckedChanged" IsChecked="True"/> x:Name="chkHideNoWxIdOrder"
<CheckBox Content="未发货订单自动售后" x:Name="chkAutoAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" Visibility="Visible" Margin="6,0"
Margin="6,0" VerticalAlignment="Center" IsChecked="True" Checked="chkAutoAfterSale_Checked" Unchecked="chkAutoAfterSale_Checked"/> HorizontalAlignment="Left"
<Button Grid.Column="8" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="刷新订单" Width="118" Height="24" Click="btnSearch_Click"/> VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkHideNoWxIdOrder_CheckedChanged"
Content="隐藏无微信订单的买手单"
FontSize="12"
IsChecked="True"
Unchecked="chkHideNoWxIdOrder_CheckedChanged" />
<CheckBox
x:Name="chkAutoAfterSale"
Margin="6,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkAutoAfterSale_Checked"
Content="未发货订单自动售后"
FontSize="12"
IsChecked="True"
Unchecked="chkAutoAfterSale_Checked"
Visibility="Visible" />
<Button
x:Name="btnSearch"
Grid.Column="8"
Width="118"
Height="24"
Margin="4,0,0,0"
Click="btnSearch_Click"
Content="刷新订单"
Style="{StaticResource BasePageButtonStyle}" />
</WrapPanel> </WrapPanel>
<TextBox x:Name="txtFilter" Grid.Column="2" Margin="28,0,8,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" <TextBox
VerticalContentAlignment="Center" Style="{StaticResource BaseRoundCornerTextBoxStyle}" TextChanged="txtFilter_TextChanged" /> x:Name="txtFilter"
<Button Grid.Column="3" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,8,0" Content="过滤" Width="50" Height="24" Click="btnFilter_Click"/> Grid.Column="2"
Height="28"
Margin="28,0,8,0"
VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1"
Style="{StaticResource BaseRoundCornerTextBoxStyle}"
TextChanged="txtFilter_TextChanged" />
<Button
x:Name="btnFilter"
Grid.Column="3"
Width="50"
Height="24"
Margin="4,0,8,0"
Click="btnFilter_Click"
Content="过滤"
Style="{StaticResource BasePageButtonStyle}" />
</Grid> </Grid>
<Grid Grid.Row="1" Background="LightGray" x:Name="GridCef"> <Grid
</Grid> x:Name="GridCef"
<Grid Grid.Row="1" HorizontalAlignment="Left" Margin="2,2,0,334"> Grid.Row="1"
Background="LightGray" />
<Grid
Grid.Row="1"
Margin="2,2,0,334"
HorizontalAlignment="Left">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Background="White" x:Name="borderPddBuyer" CornerRadius="0,4,4,0" Width="138"> <Border
x:Name="borderPddBuyer"
Width="138"
Background="White"
CornerRadius="0,4,4,0">
<Grid> <Grid>
<ListBox x:Name="lbPddBuyer"> <ListBox x:Name="lbPddBuyer">
<!-- 使用自定义属性模板去除ListBox高亮显示框 --> <!-- 使用自定义属性模板去除ListBox高亮显示框 -->
@@ -57,7 +142,8 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="ListBoxItem"> <ControlTemplate TargetType="ListBoxItem">
<ContentPresenter Content="{TemplateBinding Content}" <ContentPresenter
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" /> ContentTemplate="{TemplateBinding ContentTemplate}" />
</ControlTemplate> </ControlTemplate>
@@ -68,8 +154,14 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<!--<local:ShopListRowCtrl></local:ShopListRowCtrl>--> <!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
<Border Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="0, 0, 0, 1" MinHeight="50" <Border
BorderBrush="{StaticResource ListRowBorderColorBrush}" CornerRadius="0"> MinHeight="50"
Margin="0,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
BorderBrush="{StaticResource ListRowBorderColorBrush}"
BorderThickness="0,0,0,1"
CornerRadius="0">
<Border.Style> <Border.Style>
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) --> <!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
<Style TargetType="Border"> <Style TargetType="Border">
@@ -83,11 +175,28 @@
<Grid x:Name="gridListItem"> <Grid x:Name="gridListItem">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition x:Name="colCheck" Width="25*"></ColumnDefinition> <ColumnDefinition x:Name="colCheck" Width="25*" />
<ColumnDefinition x:Name="colBuyerName" Width="100*"></ColumnDefinition> <ColumnDefinition x:Name="colBuyerName" Width="100*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox Grid.Column="0" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center" IsChecked="{Binding IsSelect, Mode=TwoWay}" Click="CheckBox_Click"/> <CheckBox
<TextBox Grid.Column="1" Background="Transparent" TextWrapping="Wrap" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" IsReadOnly="True" BorderThickness="0" Text="{Binding buyer_nick}" x:Name="txtBuyerNick" Loaded="txtBuyerNick_Loaded" Cursor="Hand" /> Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
Click="CheckBox_Click"
IsChecked="{Binding IsSelect, Mode=TwoWay}" />
<TextBox
x:Name="txtBuyerNick"
Grid.Column="1"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
IsReadOnly="True"
Loaded="txtBuyerNick_Loaded"
Text="{Binding buyer_nick}"
TextWrapping="Wrap" />
</Grid> </Grid>
</Border> </Border>
</DataTemplate> </DataTemplate>
@@ -95,28 +204,73 @@
</ListBox> </ListBox>
</Grid> </Grid>
</Border> </Border>
<Border Grid.Column="1" Panel.ZIndex="-1" CornerRadius="0,5,5,0" Background="{StaticResource pageColorBrush}" <Border
VerticalAlignment="Center" Margin="-2,0,0,0" Height="60" Cursor="Hand"> Grid.Column="1"
<Button Style="{StaticResource BasePageButtonStyle}" Grid.Column="1" Margin="0,0,0,0" Padding="0,0,0,0" Height="60" Height="60"
VerticalContentAlignment="Center" Width="20" Click="btnHideBuyer_Click" Content="◀" x:Name="btnHideBuyer"> Margin="-2,0,0,0"
</Button> VerticalAlignment="Center"
Panel.ZIndex="-1"
Background="{StaticResource pageColorBrush}"
CornerRadius="0,5,5,0"
Cursor="Hand">
<Button
x:Name="btnHideBuyer"
Grid.Column="1"
Width="20"
Height="60"
Margin="0,0,0,0"
Padding="0,0,0,0"
VerticalContentAlignment="Center"
Click="btnHideBuyer_Click"
Content="◀"
Style="{StaticResource BasePageButtonStyle}" />
</Border> </Border>
</Grid> </Grid>
<Grid Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Margin="0" Background="Transparent"> <Grid
Grid.Row="1"
Margin="0"
VerticalAlignment="Bottom"
Background="Transparent"
Visibility="Visible">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"></RowDefinition> <RowDefinition Height="auto" />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Style="{StaticResource BasePageButtonStyle}" Margin="0,0,0,-10" Content="▼" Padding="0,2,0,0" VerticalContentAlignment="top" Width="60" Height="25" x:Name="btnHide" Click="btnHide_Click"/> <Button
<Grid x:Name="gridTable" Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Height="330" Margin="2" Background="White"> x:Name="btnHide"
Width="60"
Height="25"
Margin="0,0,0,-10"
Padding="0,2,0,0"
VerticalContentAlignment="top"
Click="btnHide_Click"
Content="▼"
Style="{StaticResource BasePageButtonStyle}" />
<Grid
x:Name="gridTable"
Grid.Row="1"
Height="330"
Margin="2"
VerticalAlignment="Bottom"
Background="White"
Visibility="Visible">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition> <RowDefinition Height="40" />
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="正在操作:" Panel.ZIndex="1" Margin="180,0,0,0" VerticalAlignment="Center" x:Name="lblMsg"></Label> <Label
x:Name="lblMsg"
Margin="180,0,0,0"
VerticalAlignment="Center"
Panel.ZIndex="1"
Content="正在操作:" />
<TabControl x:Name="tabOrderType" Grid.Row="1" Margin="0,-32,0,1" VerticalAlignment="Stretch" > <TabControl
x:Name="tabOrderType"
Grid.Row="1"
Margin="0,-32,0,1"
VerticalAlignment="Stretch">
<TabControl.Resources> <TabControl.Resources>
<Style TargetType="{x:Type TabControl}"> <Style TargetType="{x:Type TabControl}">
<Setter Property="Template"> <Setter Property="Template">
@@ -127,11 +281,26 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="1" Background="#f8f8f9" BorderThickness="1,1,1,0" BorderBrush="#e0e0e0" MinHeight="4" CornerRadius="0,4,0,0"> <Border
Grid.Row="1"
MinHeight="4"
Background="#f8f8f9"
BorderBrush="#e0e0e0"
BorderThickness="1,1,1,0"
CornerRadius="0,4,0,0">
<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" /> <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
</Border> </Border>
<Border HorizontalAlignment="Left" Background="#e8e8e9" BorderBrush="#e1e1e1" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="0,0,0,0"> <Border
<TabPanel x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True"/> Margin="0,0,0,0"
HorizontalAlignment="Left"
Background="#e8e8e9"
BorderBrush="#e1e1e1"
BorderThickness="1,1,1,0"
CornerRadius="4,4,0,0">
<TabPanel
x:Name="HeaderPanel"
Background="Transparent"
IsItemsHost="True" />
</Border> </Border>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -142,8 +311,17 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="TabItem"> <ControlTemplate TargetType="TabItem">
<Border Name="Border" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="-1,-2,-1,0"> <Border
<ContentPresenter x:Name="ContentSite" VerticalAlignment="Center" HorizontalAlignment="Center" ContentSource="Header" Margin="10,5"/> Name="Border"
Margin="-1,-2,-1,0"
BorderThickness="1,1,1,0"
CornerRadius="4,4,0,0">
<ContentPresenter
x:Name="ContentSite"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
ContentSource="Header" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True"> <Trigger Property="IsSelected" Value="True">
@@ -164,12 +342,26 @@
</Style> </Style>
</TabControl.Resources> </TabControl.Resources>
<TabItem Header="买手订单"> <TabItem Header="买手订单">
<DataGrid Grid.Row="1" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}" x:Name="dgBuyerOrder" <DataGrid
RowHeaderWidth="0" VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False" x:Name="dgBuyerOrder"
ColumnHeaderHeight="30" LoadingRow="dgBuyerOrder_LoadingRow" SelectionChanged="dgBuyerOrder_SelectionChanged"> Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
ColumnHeaderHeight="30"
HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}"
LoadingRow="dgBuyerOrder_LoadingRow"
RowHeaderWidth="0"
RowHeight="50"
SelectionChanged="dgBuyerOrder_SelectionChanged"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" <DataGridTextColumn
CanUserSort="False" Header="序列" IsReadOnly="True" Width="40"> Width="40"
Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
CanUserSort="False"
Header="序列"
IsReadOnly="True">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -178,7 +370,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.6*" Header="是否直发" Binding="{Binding WxSendTypeStr}"> <DataGridTextColumn
Width="0.6*"
Binding="{Binding WxSendTypeStr}"
Header="是否直发">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -187,7 +382,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="拍单订单号" Binding="{Binding order_sn}"> <DataGridTextColumn
Width="1.5*"
Binding="{Binding order_sn}"
Header="拍单订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -196,7 +394,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="店铺订单号" Binding="{Binding ShopOrderIdStr}"> <DataGridTextColumn
Width="1.5*"
Binding="{Binding ShopOrderIdStr}"
Header="店铺订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -205,7 +406,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding buyerName}"> <DataGridTextColumn
Width="1*"
Binding="{Binding buyerName}"
Header="买手名称">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -214,7 +418,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="拍单时间" Binding="{Binding OrderTimeStr}"> <DataGridTextColumn
Width="0.8*"
Binding="{Binding OrderTimeStr}"
Header="拍单时间">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -223,7 +430,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.8*" Header="商品信息" Binding="{Binding ProdInfoStr}"> <DataGridTextColumn
Width="1.8*"
Binding="{Binding ProdInfoStr}"
Header="商品信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -232,7 +442,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="金额" Binding="{Binding AmoutValue}"> <DataGridTextColumn
Width="0.8*"
Binding="{Binding AmoutValue}"
Header="金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -241,7 +454,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单状态" Binding="{Binding order_status_prompt}"> <DataGridTextColumn
Width="1*"
Binding="{Binding order_status_prompt}"
Header="订单状态">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -250,7 +466,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流名称" Binding="{Binding outExpressCompanyCode}"> <DataGridTextColumn
Width="1*"
Binding="{Binding outExpressCompanyCode}"
Header="物流名称">
<!-- outExpressCompanyName --> <!-- outExpressCompanyName -->
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -260,7 +479,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流单号" Binding="{Binding tracking_number}"> <DataGridTextColumn
Width="1*"
Binding="{Binding tracking_number}"
Header="物流单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -269,7 +491,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单信息" Binding="{Binding sendStatus}"> <DataGridTextColumn
Width="1*"
Binding="{Binding sendStatus}"
Header="订单信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -278,12 +503,42 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrder" > <DataGridTemplateColumn
x:Name="colSendBuyerOrder"
Width="0.6*"
Header="手动发送">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center" <Grid>
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button> <Button
x:Name="btnSendBuyerOrder"
Grid.Row="2"
Grid.Column="1"
Margin="4,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnSendBuyerOrder_Click"
Content="发送"
Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}" />
<Button
x:Name="btnSendDirectBuyerOrder"
Grid.Row="2"
Grid.Column="1"
Margin="4,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnSendBuyerOrder_Click"
Content="发送"
Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}}" />
<!-- 直发单直发标注不为空 -->
</Grid>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
@@ -292,12 +547,25 @@
</TabItem> </TabItem>
<TabItem Header="买手售后"> <TabItem Header="买手售后">
<DataGrid Grid.Row="1" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}" x:Name="dgBuyerAfterSale" <DataGrid
RowHeaderWidth="0" VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False" x:Name="dgBuyerAfterSale"
ColumnHeaderHeight="30" LoadingRow="dgBuyerOrder_LoadingRow"> Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
ColumnHeaderHeight="30"
HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}"
LoadingRow="dgBuyerOrder_LoadingRow"
RowHeaderWidth="0"
RowHeight="50"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" <DataGridTextColumn
CanUserSort="False" Header="序列" IsReadOnly="True" Width="40"> Width="40"
Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
CanUserSort="False"
Header="序列"
IsReadOnly="True">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -306,7 +574,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.6*" Header="是否直发" Binding="{Binding WxSendTypeStr}"> <DataGridTextColumn
Width="0.6*"
Binding="{Binding WxSendTypeStr}"
Header="是否直发">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -315,7 +586,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="售后单号" Binding="{Binding afterSalesId}"> <DataGridTextColumn
Width="1.5*"
Binding="{Binding afterSalesId}"
Header="售后单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -324,7 +598,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="拍单订单号" Binding="{Binding orderSn}"> <DataGridTextColumn
Width="1.5*"
Binding="{Binding orderSn}"
Header="拍单订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -333,7 +610,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="店铺订单号" Binding="{Binding ShopOrderIdStr}"> <DataGridTextColumn
Width="1.5*"
Binding="{Binding ShopOrderIdStr}"
Header="店铺订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -342,7 +622,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding buyerName}"> <DataGridTextColumn
Width="1*"
Binding="{Binding buyerName}"
Header="买手名称">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -351,7 +634,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="拍单日期" Binding="{Binding orderDate}"> <DataGridTextColumn
Width="0.8*"
Binding="{Binding orderDate}"
Header="拍单日期">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -360,7 +646,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1.8*" Header="商品信息" Binding="{Binding ProdInfoStr}"> <DataGridTextColumn
Width="1.8*"
Binding="{Binding ProdInfoStr}"
Header="商品信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -369,7 +658,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="订单金额" Binding="{Binding OrderAmountValue}"> <DataGridTextColumn
Width="0.8*"
Binding="{Binding OrderAmountValue}"
Header="订单金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -378,7 +670,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="售后金额" Binding="{Binding RefundAmountValue}"> <DataGridTextColumn
Width="0.8*"
Binding="{Binding RefundAmountValue}"
Header="售后金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -387,7 +682,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="售后状态" Binding="{Binding AfterSaleStatusStr}"> <DataGridTextColumn
Width="1*"
Binding="{Binding AfterSaleStatusStr}"
Header="售后状态">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -396,7 +694,10 @@
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单信息" Binding="{Binding sendStatus}"> <DataGridTextColumn
Width="1*"
Binding="{Binding sendStatus}"
Header="订单信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
@@ -935,7 +935,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (order.order_sn == "260923-399088033421688") if (order.order_sn == "260923-399088033421688")
{ {
} }
if (order.ShopOrderIdStr == "3739389160415730432") if (order.ShopOrderIdStr == "3739399763136525568")
{ {
} }
if (order.WxSendTypeStr == "直发") if (order.WxSendTypeStr == "直发")
@@ -1785,7 +1785,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (buyerOrder.WxSendTypeStr == "直发") if (buyerOrder.WxSendTypeStr == "直发")
{ {
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill) if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill)
SendAsyncWaybillOrder(buyerOrder); SendAsyncWaybillOrder(buyerOrder, true);
else else
SendOrderE57(buyerOrder); SendOrderE57(buyerOrder);
} }
@@ -2137,12 +2137,15 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order) public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
{ {
try try
{ {
if (order.WxOrderStatus < 30 == false) if (order.WxOrderStatus < 30 == false)
{
if (showErrBox) BaseMsgWindow.ShowError("订单已发货无需重复创建同步单!");
return; return;
}
// 取最新订单状态 // 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault(); var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
@@ -2151,8 +2154,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
if (shop == null) if (shop == null)
throw new Exception("买手单对应店铺不存在!"); throw new Exception("买手单对应店铺不存在!");
if (wxOrder.status < 30 == false)
if (order.WxOrderStatus < 30 == false)
{
if (showErrBox) BaseMsgWindow.ShowError("订单已发货无需重复创建同步单!");
return; return;
}
if (order.ShopOrderIdStr == "3739357317247975936") if (order.ShopOrderIdStr == "3739357317247975936")
{ {
@@ -2227,6 +2234,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
html3 = GetHtml.PostUtf8(url3, data3); html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = GetHtml.PostUtf8(url3, data3); html3 = GetHtml.PostUtf8(url3, data3);
if (showErrBox)
{
BaseMsgWindow.ShowError("同步单创建失败:" + ex.Message);
}
} }
} }