chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化名称显示

Browse Source
This commit is contained in:
wule committed 2026-11-10 19:41:25 +08:00
1 parent 79b0027b7e
commit ee10fb5ea8
3 files changed
+22 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+19 -16
View File
@@ -1701,7 +1701,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
lock (MainWindow._orderLock)
{
orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
}
while (orderExist != null)
{
@@ -1710,31 +1710,34 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
lock (MainWindow._orderLock)
{
GlobalConfig.lstFilterOrder.Remove(orderExist);
orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
}
});
lock (MainWindow._orderLock)
{
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
}
}
if (!GetOrderIsFilter(order))
{
var index = -1;
oms_wei_order_info nextOrder = null;
lock (MainWindow._orderLock)
{
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.update_time < order.update_time);
else
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
}
await Dispatcher.InvokeAsync(() =>
{
lock (MainWindow._orderLock)
{
var index = -1;
oms_wei_order_info nextOrder = null;
//lock (MainWindow._orderLock)
{
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time);
else
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.create_time < order.create_time);
}
if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
{
GlobalConfig.lstFilterOrder.Insert(index, order);
29WxOrderWpf/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -7,11 +7,11 @@ using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("29供应连-微信小店订单管理")]
[assembly: AssemblyTitle("29供应链-微信小店订单管理")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("29供应连-微信小店订单管理")]
[assembly: AssemblyProduct("29供应链-微信小店订单管理")]
[assembly: AssemblyCopyright("Copyright © 2026")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
if (!string.IsNullOrEmpty(BaseClass.ProgramName))
{
lblAppName.Content = BaseClass.ProgramName;
MainWindow.Instance.lblAppName.Content = lblAppName.Content;
MainWindow.Instance.lblAppName.Content = BaseClass.ProgramName.Contains("-微信小店订单管理") ? BaseClass.ProgramName : BaseClass.ProgramName + "-微信小店订单管理";
}
this.Title = "用户登录";