From f722993c3d3ac94b97fcdeda29426b12e4ebd9ce Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Mon, 19 Oct 2026 19:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml       |  4 ++--
 29WxOrderWpf/MainWindow.xaml.cs                      | 12 ++++++++----
 AllBase/Model/DBModel/oms_wei_order_item_info.cs     |  6 ++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 30df9e4..86e8810 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -907,7 +907,7 @@
 				<wpf:TitleContent
 					Title="外采单号："
 					Foreground="#0099ff"
-					Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
+					Visibility="{Binding OutOrderNoVisibility}">
 					<WrapPanel Orientation="Horizontal">
 						<uc:UcWaterMarkTextBox1
 							x:Name="txtDirectBuyerOrderNo"
@@ -931,7 +931,7 @@
 							Background="Transparent"
 							Cursor="Hand"
 							MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
-							Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
+							Visibility="{Binding OutOrderNoVisibility}">
 							<Path
 								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}"
diff --git a/29WxOrderWpf/MainWindow.xaml.cs b/29WxOrderWpf/MainWindow.xaml.cs
index 3e488aa..a401d08 100644
--- a/29WxOrderWpf/MainWindow.xaml.cs
+++ b/29WxOrderWpf/MainWindow.xaml.cs
@@ -338,7 +338,8 @@ namespace _29WxOrderWpf
 										{
 											// 更新代发管理情况
 											foreach (var orderItem in order.orderItems)
-												Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
+												orderItem.UpdateOrderItemBuyButton();
+											//Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
 										}
 									}
 								}
@@ -364,10 +365,13 @@ namespace _29WxOrderWpf
 			isReadShop = false;
 			hasReadShop = true;
 
-			while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1)
+			Task.Run(() =>
 			{
-				tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100);
-			}
+				while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1)
+				{
+					tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100);
+				}
+			});
 		}
 
 		public void GetShopSupplier(List<ShopLoginInfo> shops)
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 3f152c2..4f013b8 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -1494,6 +1494,11 @@ namespace AllBase.Model.DBModel
 			set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
 		}
 
+		public Visibility OutOrderNoVisibility
+		{
+			get { return this.GetValue(x => x.OutOrderNoVisibility); }
+			set { this.SetValue(x => x.OutOrderNoVisibility, value); }
+		}
 
 		/// <summary>
 		/// 订单商品表数据库id
@@ -1690,6 +1695,7 @@ namespace AllBase.Model.DBModel
 			SetOrderItemStatusAndColor();
 			SetOrderItemExtInfo();
 
+			OutOrderNoVisibility = string.IsNullOrWhiteSpace(ItemOrder?.out_order_no) ? Visibility.Collapsed : Visibility.Visible;
 			if (this.ItemTransitOrders != null)
 			{
 				foreach (var tOrder in this.ItemTransitOrders)