From ee10fb5ea87e3be3eba32f3ad5e9547a9b959bf6 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Tue, 10 Nov 2026 19:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8D=E7=A7=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    | 35 ++++++++++---------
 29WxOrderWpf/Properties/AssemblyInfo.cs       |  4 +--
 .../Windows/LoginWindows/LoginWindow.xaml.cs  |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 887bb72..586e462 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -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);
diff --git a/29WxOrderWpf/Properties/AssemblyInfo.cs b/29WxOrderWpf/Properties/AssemblyInfo.cs
index 6502504..862f4f3 100644
--- a/29WxOrderWpf/Properties/AssemblyInfo.cs
+++ b/29WxOrderWpf/Properties/AssemblyInfo.cs
@@ -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("")]
diff --git a/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs b/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
index f8e19f6..f6ca54b 100644
--- a/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
+++ b/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
@@ -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 = "用户登录";