优化店铺读取
This commit is contained in:
1 parent
12fe0c26fb
commit
f722993c3d
3 files changed
+16
-6
No files matched your search
@@ -907,7 +907,7 @@
|
|||||||
<wpf:TitleContent
|
<wpf:TitleContent
|
||||||
Title="外采单号:"
|
Title="外采单号:"
|
||||||
Foreground="#0099ff"
|
Foreground="#0099ff"
|
||||||
Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
|
Visibility="{Binding OutOrderNoVisibility}">
|
||||||
<WrapPanel Orientation="Horizontal">
|
<WrapPanel Orientation="Horizontal">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtDirectBuyerOrderNo"
|
x:Name="txtDirectBuyerOrderNo"
|
||||||
@@ -931,7 +931,7 @@
|
|||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
|
MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
|
||||||
Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
Visibility="{Binding OutOrderNoVisibility}">
|
||||||
<Path
|
<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"
|
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}"
|
Fill="{StaticResource PageLinkBrush}"
|
||||||
|
|||||||
@@ -338,7 +338,8 @@ namespace _29WxOrderWpf
|
|||||||
{
|
{
|
||||||
// 更新代发管理情况
|
// 更新代发管理情况
|
||||||
foreach (var orderItem in order.orderItems)
|
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;
|
isReadShop = false;
|
||||||
hasReadShop = true;
|
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)
|
public void GetShopSupplier(List<ShopLoginInfo> shops)
|
||||||
|
|||||||
@@ -1494,6 +1494,11 @@ namespace AllBase.Model.DBModel
|
|||||||
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
|
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>
|
/// <summary>
|
||||||
/// 订单商品表数据库id
|
/// 订单商品表数据库id
|
||||||
@@ -1690,6 +1695,7 @@ namespace AllBase.Model.DBModel
|
|||||||
SetOrderItemStatusAndColor();
|
SetOrderItemStatusAndColor();
|
||||||
SetOrderItemExtInfo();
|
SetOrderItemExtInfo();
|
||||||
|
|
||||||
|
OutOrderNoVisibility = string.IsNullOrWhiteSpace(ItemOrder?.out_order_no) ? Visibility.Collapsed : Visibility.Visible;
|
||||||
if (this.ItemTransitOrders != null)
|
if (this.ItemTransitOrders != null)
|
||||||
{
|
{
|
||||||
foreach (var tOrder in this.ItemTransitOrders)
|
foreach (var tOrder in this.ItemTransitOrders)
|
||||||
|
|||||||
Reference in new issue
Block a user