优化名称显示
This commit is contained in:
1 parent
79b0027b7e
commit
ee10fb5ea8
3 files changed
+22
-19
No files matched your search
@@ -1701,7 +1701,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
lock (MainWindow._orderLock)
|
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)
|
while (orderExist != null)
|
||||||
{
|
{
|
||||||
@@ -1710,31 +1710,34 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
lock (MainWindow._orderLock)
|
lock (MainWindow._orderLock)
|
||||||
{
|
{
|
||||||
GlobalConfig.lstFilterOrder.Remove(orderExist);
|
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))
|
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(() =>
|
await Dispatcher.InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
lock (MainWindow._orderLock)
|
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)
|
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||||
{
|
{
|
||||||
GlobalConfig.lstFilterOrder.Insert(index, order);
|
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ using System.Windows;
|
|||||||
// 有关程序集的一般信息由以下
|
// 有关程序集的一般信息由以下
|
||||||
// 控制。更改这些特性值可修改
|
// 控制。更改这些特性值可修改
|
||||||
// 与程序集关联的信息。
|
// 与程序集关联的信息。
|
||||||
[assembly: AssemblyTitle("29供应连-微信小店订单管理")]
|
[assembly: AssemblyTitle("29供应链-微信小店订单管理")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("")]
|
||||||
[assembly: AssemblyProduct("29供应连-微信小店订单管理")]
|
[assembly: AssemblyProduct("29供应链-微信小店订单管理")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2026")]
|
[assembly: AssemblyCopyright("Copyright © 2026")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
|
|||||||
if (!string.IsNullOrEmpty(BaseClass.ProgramName))
|
if (!string.IsNullOrEmpty(BaseClass.ProgramName))
|
||||||
{
|
{
|
||||||
lblAppName.Content = 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 = "用户登录";
|
this.Title = "用户登录";
|
||||||
|
|||||||
Reference in new issue
Block a user