继续优化读单

This commit is contained in:
wule committed 2026-10-19 13:23:50 +08:00
1 parent 3d86e986b0
commit bbac29ac78
10 files changed
+1844 -1746

No files matched your search

@@ -688,11 +688,11 @@
</TabItem> </TabItem>
<TabItem <TabItem
MinWidth="60" MinWidth="60"
d:Header="异常需重拍"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Foreground="#FFEE0099" Foreground="#FFEE0099"
d:Header="异常需重拍" Header="{Binding AbnormalTabTxt}"
Header="{Binding AbnormalTabTxt}"
SizeChanged="TabItem_SizeChanged" /> SizeChanged="TabItem_SizeChanged" />
<TabItem <TabItem
MinWidth="60" MinWidth="60"
@@ -875,11 +875,11 @@
</TabItem> </TabItem>
<TabItem <TabItem
MinWidth="60" MinWidth="60"
d:Header="需处理售后单"
Background="#FF6666" Background="#FF6666"
BorderBrush="Transparent" BorderBrush="Transparent"
Foreground="#FF2222" Foreground="#FF2222"
d:Header="需处理售后单" Header="{Binding EmergencyManualReturnOrderTabTxt}"
Header="{Binding EmergencyManualReturnOrderTabTxt}"
SizeChanged="TabItem_SizeChanged"> SizeChanged="TabItem_SizeChanged">
<Border <Border
Margin="4,0,4,4" Margin="4,0,4,4"
@@ -1154,11 +1154,11 @@
</TabItem> </TabItem>
<TabItem <TabItem
MinWidth="60" MinWidth="60"
d:Header="退货仓自动售后单"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Foreground="#FF7744" Foreground="#FF7744"
d:Header="退货仓自动售后单" Header="{Binding EmergencyDistribReturnOrderTabTxt}"
Header="{Binding EmergencyDistribReturnOrderTabTxt}"
SizeChanged="TabItem_SizeChanged"> SizeChanged="TabItem_SizeChanged">
<Border <Border
Margin="4,0,4,4" Margin="4,0,4,4"
@@ -1290,11 +1290,11 @@
</TabItem> </TabItem>
<TabItem <TabItem
MinWidth="60" MinWidth="60"
d:Header="售后完成单"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Foreground="#FFaa77" Foreground="#FFaa77"
d:Header="售后完成单" Header="{Binding RefundTabTxt}"
Header="{Binding RefundTabTxt}"
SizeChanged="TabItem_SizeChanged"> SizeChanged="TabItem_SizeChanged">
<Border <Border
Margin="4,0,4,4" Margin="4,0,4,4"
@@ -1382,10 +1382,10 @@
</TabItem> </TabItem>
<TabItem <TabItem
MinWidth="60" MinWidth="60"
d:Header="全部订单"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
d:Header="全部订单" Header="{Binding AllOrderTabTxt}"
Header="{Binding AllOrderTabTxt}"
SizeChanged="TabItem_SizeChanged" /> SizeChanged="TabItem_SizeChanged" />
<!--<TabItem Header="发货异常"> <!--<TabItem Header="发货异常">
<Grid Background="#FFE5E5E5"/> <Grid Background="#FFE5E5E5"/>
@@ -1499,9 +1499,11 @@
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
BorderThickness="0" BorderThickness="0"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingPanel.IsVirtualizingWhenGrouping="True"
VirtualizingPanel.ScrollUnit="Pixel" VirtualizingPanel.ScrollUnit="Pixel"
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.IsVirtualizing="True"
><!--VirtualizingStackPanel.VirtualizationMode="Recycling"--> VirtualizingStackPanel.VirtualizationMode="Recycling">
<!-- VirtualizingStackPanel.VirtualizationMode="Recycling" -->
<!-- 使用自定义属性模板去除ListBox高亮显示框 --> <!-- 使用自定义属性模板去除ListBox高亮显示框 -->
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
@@ -344,7 +344,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
})); }));
int page = 0; int page = 0;
int totalPage = 1; int totalPage = 1;
int pageSize = 50; int pageSize = 200;
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))) while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
{ {
@@ -753,6 +753,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order"); var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
var data3 = UserLogin.GetSignaturex(); var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids; data3 += "&order_no=" + order_ids;
data3 += "&page_size=5000";
var html3 = GetHtml.PostUtf8(url3, data3); var 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);
@@ -1544,8 +1545,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id)); //var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
var userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList(); var userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList();
TabItem tabItem = null; //TabItem tabItem = null;
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList(); //List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
{ {
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count(); var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count(); var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
@@ -1630,15 +1631,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
int n = 0; int n = 0;
foreach (var order in orderLstTmp) foreach (var order in orderLstTmp)
{ {
if (n++ % 100 == 0) //if (n++ % 10 == 0)
Thread.Sleep(1); Thread.Sleep(1);
if (token.IsCancellationRequested) if (token.IsCancellationRequested)
break; break;
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id)) if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
{ {
Dispatcher.Invoke(() => { GlobalConfig.lstFilterOrder.Add(order); }); Dispatcher.InvokeAsync(() =>
{
GlobalConfig.lstFilterOrder.Add(order);
});
} }
} }
} }
@@ -1682,7 +1686,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var index = -1; var index = -1;
if (nextOrder != null) if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder); index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
Dispatcher.Invoke(() => Dispatcher.InvokeAsync(() =>
{ {
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index) if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
{ {
@@ -1693,6 +1697,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
GlobalConfig.lstFilterOrder.Add(order); GlobalConfig.lstFilterOrder.Add(order);
} }
}); });
Thread.Sleep(1);
} }
if (updateTabCount) if (updateTabCount)
@@ -43,8 +43,32 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="6" /> <RowDefinition Height="6" />
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="6" /> <RowDefinition Height="6" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<local:OrderListRowItemCtrl
Grid.Row="1"
DataContext="{Binding orderItem}"
Visibility="{Binding OrderItemVisibility}" />
<!--<local:OrderListRowItemCtrl
Grid.Row="2"
DataContext="{Binding orderItem2}"
Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl
Grid.Row="3"
DataContext="{Binding orderItem2}"
Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl
Grid.Row="4"
DataContext="{Binding orderItem3}"
Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl
Grid.Row="5"
DataContext="{Binding orderItem4}"
Visibility="{Binding OrderItemVisibility}" />-->
<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}"> <!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
@@ -52,6 +76,19 @@
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl>--> </ItemsControl>-->
<!--<ListBox
Grid.Row="1"
ItemsSource="{Binding orderItems}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled"
VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.VirtualizationMode="Recycling">
<ListBox.ItemTemplate>
<DataTemplate>
<local:OrderListRowItemCtrl DataContext="{Binding}" />
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>-->
<!--<TextBlock Text="{Binding ProductName}" Margin="20,0,0,0"/>--> <!--<TextBlock Text="{Binding ProductName}" Margin="20,0,0,0"/>-->
</Grid> </Grid>
</Border> </Border>
@@ -41,22 +41,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private async void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e) private async void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
{ {
await Task.Run(() => { Thread.Sleep(1); }); //await Task.Run(() => { Thread.Sleep(1); });
if (this.DataContext is oms_wei_order_info order) //if (this.DataContext is oms_wei_order_info order)
{ //{
int index = 0; // int index = 0;
foreach (var orderItem in order.orderItems) // foreach (var orderItem in order.orderItems)
{ // {
gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto }); // gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
index++; // index++;
var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index }; // var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
Grid.SetRow(rowItem, index); // Grid.SetRow(rowItem, index);
this.gridChildOrder.Children.Add(rowItem); // this.gridChildOrder.Children.Add(rowItem);
if (index >= 5) // if (index >= 5)
break; // break;
} // }
} //}
} }
private void CheckBox_Click(object sender, RoutedEventArgs e) private void CheckBox_Click(object sender, RoutedEventArgs e)
@@ -1,86 +1,86 @@
<UserControl <UserControl
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl" x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
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:uc="clr-namespace:_29WxOrderWpf.UserControls" xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
d:DesignHeight="50" d:DesignHeight="50"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0"> <Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" /> <ColumnDefinition Width="20" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox <TextBox
Grid.Column="0" Grid.Column="0"
Margin="8,8,-4,8" Margin="8,8,-4,8"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
FontSize="20" FontSize="20"
FontWeight="ExtraBold" FontWeight="ExtraBold"
Foreground="{Binding OrderBuyTypeColor}" Foreground="{Binding OrderBuyTypeColor}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding OrderBuyType}" Text="{Binding OrderBuyType}"
Visibility="{Binding OrderBuyTypeVisibility}" /> Visibility="{Binding OrderBuyTypeVisibility}" />
<TextBox <TextBox
Grid.Column="1" Grid.Column="1"
Margin="8,8,-4,8" Margin="8,8,-4,8"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
FontSize="14" FontSize="14"
IsReadOnly="True" IsReadOnly="True"
Text="店铺单号:" /> Text="店铺单号:" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtOrderId" x:Name="txtOrderId"
Grid.Column="2" Grid.Column="2"
Margin="0,8,4,8" Margin="0,8,4,8"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Cursor="Hand" Cursor="Hand"
FontSize="14" FontSize="14"
Foreground="{StaticResource PageLinkBrush}" Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding order_id}" Text="{Binding order_id}"
WaterMark="订单号" /> WaterMark="订单号" />
<Border <Border
Grid.Column="3" Grid.Column="3"
Width="12" Width="12"
Height="12" Height="12"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="Path_MouseLeftButtonDown" MouseLeftButtonDown="Path_MouseLeftButtonDown"
Tag="{Binding order_id}"> Tag="{Binding order_id}">
<Path <Path
Margin="0,0,0,0" Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="Path_MouseLeftButtonDown" MouseLeftButtonDown="Path_MouseLeftButtonDown"
Stretch="Uniform" Stretch="Uniform"
Tag="{Binding order_id}" /> Tag="{Binding order_id}" />
</Border> </Border>
<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2"> <!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
@@ -94,169 +94,170 @@
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" /> Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
</Grid> </Grid>
</Border>--> </Border>-->
<Border <Border
x:Name="borderDeadline" x:Name="borderDeadline"
Grid.Column="4" Grid.Column="4"
Height="24" Height="24"
MinWidth="30" MinWidth="30"
Margin="8,0,0,0" Margin="8,0,0,0"
Background="{Binding StatusBoxBackColor}" Background="{Binding StatusBoxBackColor}"
BorderBrush="{Binding StatusBoxBorderColor}" BorderBrush="{Binding StatusBoxBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="2"> CornerRadius="2">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border <Border
x:Name="borderDeadlineHead" x:Name="borderDeadlineHead"
Background="{Binding StatusBoxForeColor}" Background="{Binding StatusBoxForeColor}"
CornerRadius="2,0,10,2"> CornerRadius="2,0,10,2">
<TextBox <TextBox
Grid.Column="0" Grid.Column="0"
MinWidth="20" MinWidth="20"
Margin="2,0,2,1" Margin="2,0,2,1"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Foreground="White" Foreground="White"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding DeliveryDeadlineStatusStr}" /> Text="{Binding DeliveryDeadlineStatusStr}" />
</Border> </Border>
<TextBox <TextBox
x:Name="txtDeadline" x:Name="txtDeadline"
Grid.Column="1" Grid.Column="1"
MinWidth="20" MinWidth="20"
Margin="2,0,2,1" Margin="2,0,2,1"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Foreground="{Binding StatusBoxForeColor}" Foreground="{Binding StatusBoxForeColor}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding DeliveryDeadlineStr}" /> Text="{Binding DeliveryDeadlineStr}" />
</Grid> </Grid>
</Border> </Border>
<Image <Image
Grid.Column="5" Grid.Column="5"
Width="24" Width="24"
Height="24" Height="24"
Margin="8,8,0,8" Margin="8,8,0,8"
Source="{StaticResource imgOrderWeishopIcon}" /> Source="{StaticResource imgOrderWeishopIcon}" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtShopLoginStatus" x:Name="txtShopLoginStatus"
Grid.Column="5" Grid.Column="5"
Margin="0,12,-6,0" Margin="0,12,-6,0"
Padding="0" Padding="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="{StaticResource ListHeadBackColorBrush}" Background="{StaticResource ListHeadBackColorBrush}"
BorderThickness="0" BorderThickness="0"
FontSize="7" FontSize="7"
FontWeight="Bold" FontWeight="Bold"
Foreground="{Binding Shop.LoginStatusStrColor}" Foreground="{Binding Shop.LoginStatusStrColor}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding Shop.LoginStatusStr}" Text="{Binding Shop.LoginStatusStr}"
WaterMark="店铺状态" /> WaterMark="店铺状态" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtShopName" x:Name="txtShopName"
Grid.Column="6" Grid.Column="6"
Margin="4,8,4,8" Margin="4,8,4,8"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Cursor="Hand" Cursor="Hand"
FontSize="14" FontSize="14"
Foreground="{StaticResource PageLinkBrush}" Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding shop_name}" Text="{Binding shop_name}"
WaterMark="店铺名称" /> WaterMark="店铺名称" />
<Border <Border
Grid.Column="7" Grid.Column="7"
Width="12" Width="12"
Height="12" Height="12"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown" MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Tag="{Binding order_id}"> Tag="{Binding order_id}">
<Path <Path
Margin="0,0,0,0" Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown" MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Stretch="Uniform" Stretch="Uniform"
Tag="{Binding order_id}" /> Tag="{Binding order_id}" />
</Border> </Border>
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtCount" x:Name="txtCount"
Grid.Column="9" Grid.Column="9"
Margin="8,8,0,8" Margin="8,8,0,8"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="该订单共有 x 条不同商品记录" d:Text="该订单共有 x 条不同商品记录"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
FontSize="14" FontSize="14"
Foreground="Gray" Foreground="#FF8888"
IsReadOnly="True" IsReadOnly="True"
WaterMark="该订单共有 1 条不同商品记录" /> Text="{Binding OrderDiffItemCountStr}"
WaterMark="该订单共有 1 条不同商品记录" />
<TextBlock <TextBlock
Grid.Column="11" Grid.Column="11"
Margin="10" Margin="10"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="仅退款/退货退款" d:Text="仅退款/退货退款"
Foreground="Gray" Foreground="Gray"
Text="{Binding RefundTypeStr}" /> Text="{Binding RefundTypeStr}" />
<Border <Border
x:Name="borderFlag" x:Name="borderFlag"
Grid.Column="12" Grid.Column="12"
Width="auto" Width="auto"
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="borderFlag_MouseLeftButtonDown"> MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />--> <!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />-->
<WrapPanel VerticalAlignment="Center"> <WrapPanel VerticalAlignment="Center">
<Button <Button
Width="60" Width="60"
Height="22" Height="22"
Margin="0,0,10,0" Margin="0,0,10,0"
Click="btn_createOrderSupportTicket" Click="btn_createOrderSupportTicket"
Content="创建工单" Content="创建工单"
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
Foreground="Gray" Foreground="Gray"
Text="隐藏标记" /> Text="隐藏标记" />
<Path <Path
Width="15" Width="15"
Height="15" Height="15"
Margin="2,0,0,0" Margin="2,0,0,0"
d:Fill="SkyBlue" d:Fill="SkyBlue"
Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z"
Fill="{Binding ColourFlagBrush}" Fill="{Binding ColourFlagBrush}"
Stretch="Uniform" /> Stretch="Uniform" />
<!-- ColourFlagBrush --> <!-- ColourFlagBrush -->
<!-- Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}" --> <!-- Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}" -->
</WrapPanel> </WrapPanel>
</Border> </Border>
<!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand"> <!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand">
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" /> <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
</Border>--> </Border>-->
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
if (order.orderItems.Count > 5) if (order.orderItems.Count > 5)
{ {
txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品"; //txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
} }
} }
} }
File diff suppressed because it is too large. Load diff
@@ -787,8 +787,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 异步加载图片防止卡顿 // 异步加载图片防止卡顿
// 缩略图在有的电脑上无法显示 // 缩略图在有的电脑上无法显示
//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient="); //BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
//BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100); BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100);
BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img); //BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
Thread.Sleep(Randomx.GetId(1000)); Thread.Sleep(Randomx.GetId(1000));
Dispatcher.Invoke(new Action(() => Dispatcher.Invoke(new Action(() =>
{ {
+54 -17
View File
@@ -30,6 +30,11 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.Shop); } get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); } set { this.SetValue(x => x.Shop, value); }
} }
public string OrderDiffItemCountStr
{
get { return this.GetValue(x => x.OrderDiffItemCountStr); }
set { this.SetValue(x => x.OrderDiffItemCountStr, value); }
}
public string OrderBuyType public string OrderBuyType
{ {
@@ -48,6 +53,31 @@ namespace AllBase.Model.DBModel
} }
public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>(); public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info orderItem
{
get { return this.GetValue(x => x.orderItem); }
set { this.SetValue(x => x.orderItem, value); }
}
public oms_wei_order_item_info orderItem2
{
get { return this.GetValue(x => x.orderItem2); }
set { this.SetValue(x => x.orderItem2, value); }
}
public oms_wei_order_item_info orderItem3
{
get { return this.GetValue(x => x.orderItem3); }
set { this.SetValue(x => x.orderItem3, value); }
}
public oms_wei_order_item_info orderItem4
{
get { return this.GetValue(x => x.orderItem4); }
set { this.SetValue(x => x.orderItem4, value); }
}
public oms_wei_order_item_info orderItem5
{
get { return this.GetValue(x => x.orderItem5); }
set { this.SetValue(x => x.orderItem5, value); }
}
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>(); public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
@@ -714,22 +744,22 @@ namespace AllBase.Model.DBModel
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString()); Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null)) if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{ {
OrderBuyType = "云改直"; OrderBuyType = "云改直";
OrderBuyTypeColor = GlobalConfig.PurpleBrush190; OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
} }
else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发")) else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
{ {
OrderBuyType = "直发"; OrderBuyType = "直发";
OrderBuyTypeColor = GlobalConfig.RedTextBrush205; OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
} }
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null)) else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{ {
OrderBuyType = "云仓"; OrderBuyType = "云仓";
OrderBuyTypeColor = GlobalConfig.GreenTextBrush; OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
} }
else else
OrderBuyType = ""; OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND")) if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款"; this.RefundTypeStr = "仅退款";
@@ -762,8 +792,15 @@ namespace AllBase.Model.DBModel
SetDeliveryDeadlineStr(); SetDeliveryDeadlineStr();
SetStatusBoxColor(); SetStatusBoxColor();
SetOutExpressNo(); SetOutExpressNo();
SetShipDoneTimeStr(); SetShipDoneTimeStr();
SetColorBrush(); SetColorBrush();
orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
} }
public void SetColorBrush() public void SetColorBrush()
@@ -27,13 +27,23 @@ namespace AllBase.Model.DBModel
{ {
get { return this.GetValue(x => x.Shop); } get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); } set { this.SetValue(x => x.Shop, value); }
} }
#region 订单采购参数 /// <summary>
/// <summary> /// 订单扩展信息
/// 采购关联 /// </summary>
/// </summary> public Visibility OrderItemVisibility
public WXBuyMapInfo PddBuyMap {
get { return this.GetValue(x => x.OrderItemVisibility); }
set { this.SetValue(x => x.OrderItemVisibility, value); }
}
#region 订单采购参数
/// <summary>
/// 采购关联
/// </summary>
public WXBuyMapInfo PddBuyMap
{ {
get { return this.GetValue(x => x.PddBuyMap); } get { return this.GetValue(x => x.PddBuyMap); }
set { this.SetValue(x => x.PddBuyMap, value); } set { this.SetValue(x => x.PddBuyMap, value); }
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault(); this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault(); this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单 // 优先找非撤销买手退款单
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ?? this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && !p.statusText.Contains("申请已撤销")); PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && !p.statusText.Contains("申请已撤销"));
if (PddBuyerAfterSale == null) if (PddBuyerAfterSale == null)
PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no); PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no);
// 直接取号和更正取号显示的买手到仓库物流 // 直接取号和更正取号显示的买手到仓库物流
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3) if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
public string DirectRefundStatusStr public string DirectRefundStatusStr
{ {
get { return this.GetValue(x => x.DirectRefundStatusStr); } get { return this.GetValue(x => x.DirectRefundStatusStr); }
set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } set {
if (order_id == "3739897762013171200")
{
}
this.SetValue(x => x.DirectRefundStatusStr, value);
DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(DirectRefundStatusStr) ? Visibility.Collapsed : Visibility.Visible; }
} }
public Visibility DirectRefundStatusStrVisibility public Visibility DirectRefundStatusStrVisibility
{ {