Compare commits

..
2 Commits
Author SHA1 Message Date
wule eb6b1c5651 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-19 13:24:03 +08:00
wule bbac29ac78 继续优化读单 2026-10-19 13:23:50 +08:00
10 changed files with 136 additions and 38 deletions

No files matched your search

@@ -688,10 +688,10 @@
</TabItem>
<TabItem
MinWidth="60"
d:Header="异常需重拍"
Background="Transparent"
BorderBrush="Transparent"
Foreground="#FFEE0099"
d:Header="异常需重拍"
Header="{Binding AbnormalTabTxt}"
SizeChanged="TabItem_SizeChanged" />
<TabItem
@@ -875,10 +875,10 @@
</TabItem>
<TabItem
MinWidth="60"
d:Header="需处理售后单"
Background="#FF6666"
BorderBrush="Transparent"
Foreground="#FF2222"
d:Header="需处理售后单"
Header="{Binding EmergencyManualReturnOrderTabTxt}"
SizeChanged="TabItem_SizeChanged">
<Border
@@ -1154,10 +1154,10 @@
</TabItem>
<TabItem
MinWidth="60"
d:Header="退货仓自动售后单"
Background="Transparent"
BorderBrush="Transparent"
Foreground="#FF7744"
d:Header="退货仓自动售后单"
Header="{Binding EmergencyDistribReturnOrderTabTxt}"
SizeChanged="TabItem_SizeChanged">
<Border
@@ -1290,10 +1290,10 @@
</TabItem>
<TabItem
MinWidth="60"
d:Header="售后完成单"
Background="Transparent"
BorderBrush="Transparent"
Foreground="#FFaa77"
d:Header="售后完成单"
Header="{Binding RefundTabTxt}"
SizeChanged="TabItem_SizeChanged">
<Border
@@ -1382,9 +1382,9 @@
</TabItem>
<TabItem
MinWidth="60"
d:Header="全部订单"
Background="Transparent"
BorderBrush="Transparent"
d:Header="全部订单"
Header="{Binding AllOrderTabTxt}"
SizeChanged="TabItem_SizeChanged" />
<!--<TabItem Header="发货异常">
@@ -1499,9 +1499,11 @@
HorizontalContentAlignment="Stretch"
BorderThickness="0"
ScrollViewer.CanContentScroll="True"
VirtualizingPanel.IsVirtualizingWhenGrouping="True"
VirtualizingPanel.ScrollUnit="Pixel"
VirtualizingStackPanel.IsVirtualizing="True"
><!--VirtualizingStackPanel.VirtualizationMode="Recycling"-->
VirtualizingStackPanel.VirtualizationMode="Recycling">
<!-- VirtualizingStackPanel.VirtualizationMode="Recycling" -->
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
@@ -344,7 +344,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}));
int page = 0;
int totalPage = 1;
int pageSize = 50;
int pageSize = 200;
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
{
@@ -753,6 +753,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
data3 += "&page_size=5000";
var html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
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 userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList();
TabItem tabItem = null;
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
//TabItem tabItem = null;
//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
{
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
@@ -1630,7 +1631,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
int n = 0;
foreach (var order in orderLstTmp)
{
if (n++ % 100 == 0)
//if (n++ % 10 == 0)
Thread.Sleep(1);
if (token.IsCancellationRequested)
@@ -1638,7 +1639,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
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;
if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
Dispatcher.Invoke(() =>
Dispatcher.InvokeAsync(() =>
{
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
{
@@ -1693,6 +1697,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
GlobalConfig.lstFilterOrder.Add(order);
}
});
Thread.Sleep(1);
}
if (updateTabCount)
@@ -43,8 +43,32 @@
<Grid.RowDefinitions>
<RowDefinition Height="6" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="6" />
</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.ItemTemplate>
<DataTemplate>
@@ -52,6 +76,19 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</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"/>-->
</Grid>
</Border>
@@ -41,22 +41,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
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)
{
int index = 0;
foreach (var orderItem in order.orderItems)
{
gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
index++;
var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
Grid.SetRow(rowItem, index);
this.gridChildOrder.Children.Add(rowItem);
if (index >= 5)
break;
}
}
//if (this.DataContext is oms_wei_order_info order)
//{
// int index = 0;
// foreach (var orderItem in order.orderItems)
// {
// gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
// index++;
// var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
// Grid.SetRow(rowItem, index);
// this.gridChildOrder.Children.Add(rowItem);
// if (index >= 5)
// break;
// }
//}
}
private void CheckBox_Click(object sender, RoutedEventArgs e)
@@ -205,8 +205,9 @@
Background="Transparent"
BorderThickness="0"
FontSize="14"
Foreground="Gray"
Foreground="#FF8888"
IsReadOnly="True"
Text="{Binding OrderDiffItemCountStr}"
WaterMark="该订单共有 1 条不同商品记录" />
<TextBlock
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (order.orderItems.Count > 5)
{
txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
}
}
}
@@ -885,7 +885,8 @@
Background="{Binding DirectRefundStatusBackColor}"
BorderBrush="{Binding DirectRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2">
CornerRadius="2"
Visibility="{Binding DirectRefundStatusStrVisibility}">
<TextBlock
x:Name="txtOutBuyerRefundStatus"
MinWidth="20"
@@ -894,8 +895,7 @@
d:Text="直发买手退货状态"
Background="Transparent"
Foreground="White"
Text="{Binding DirectRefundStatusStr}"
Visibility="{Binding DirectRefundStatusStrVisibility}" />
Text="{Binding DirectRefundStatusStr}" />
</Border>
</WrapPanel>
</wpf:TitleContent>
@@ -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 = 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, 100, 100);
//BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
Thread.Sleep(Randomx.GetId(1000));
Dispatcher.Invoke(new Action(() =>
{
@@ -30,6 +30,11 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.Shop); }
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
{
@@ -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 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>();
@@ -764,6 +794,13 @@ namespace AllBase.Model.DBModel
SetOutExpressNo();
SetShipDoneTimeStr();
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()
@@ -29,6 +29,16 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.Shop, value); }
}
/// <summary>
/// 订单扩展信息
/// </summary>
public Visibility OrderItemVisibility
{
get { return this.GetValue(x => x.OrderItemVisibility); }
set { this.SetValue(x => x.OrderItemVisibility, value); }
}
#region 订单采购参数
/// <summary>
/// 采购关联
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单
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("申请已撤销"));
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("申请已撤销"));
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)
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
public string 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
{