优化拍档 优化订单读取功能
This commit is contained in:
1 parent
adde7e6fca
commit
6f7aa58ac1
11 files changed
+334
-85
No files matched your search
@@ -185,7 +185,8 @@
|
||||
</DataGrid>
|
||||
</Border>
|
||||
</Grid>
|
||||
<ListBox BorderThickness="0" ItemsSource="{Binding lstFilterOrder}" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="7,0,7,0"
|
||||
<!--ItemsSource="{Binding lstFilterOrder}"-->
|
||||
<ListBox BorderThickness="0" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="7,0,7,0"
|
||||
ScrollViewer.CanContentScroll="True" VirtualizingPanel.ScrollUnit="Pixel">
|
||||
<!--使用自定义属性模板去除ListBox高亮显示框-->
|
||||
<ListBox.ItemContainerStyle>
|
||||
|
||||
@@ -222,17 +222,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
order.order_items = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
item.item_order = order;
|
||||
order.order_items.Add(item);
|
||||
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
// 关联拍单关系
|
||||
if (PddMobileBuyOrderForm.lstDangerItemWord.Any(d => item.title.Contains(d)))
|
||||
{
|
||||
// 危险物品禁止拍单
|
||||
}
|
||||
else
|
||||
{
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
|
||||
}
|
||||
|
||||
// 中转仓订单
|
||||
if (item.item_order.order_items.Count > 1)
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
|
||||
@@ -282,7 +282,7 @@
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="关联拍单" Width="56" Height="24"/>-->
|
||||
<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
|
||||
Visibility="{Binding item_order.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="{Binding buy_map,Converter={StaticResource HasTextVisibility}}"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0"
|
||||
HorizontalAlignment="Center" MinWidth="38" Height="24"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@@ -112,7 +112,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info order_item)
|
||||
{
|
||||
btnBuyOrder.Content = order_item.buy_map == null ? "关联拍单" : "拍单";
|
||||
if (PddMobileBuyOrderForm.lstDangerItemWord.Any(d => order_item.title.Contains(d)))
|
||||
{
|
||||
btnBuyOrder.SetValue(ForegroundProperty, new SolidColorBrush(Color.FromArgb(255, 250, 70, 51)));
|
||||
btnBuyOrder.SetValue(BorderBrushProperty, new SolidColorBrush(Color.FromArgb(255, 250, 70, 51)));
|
||||
btnBuyOrder.SetValue(BackgroundProperty, new SolidColorBrush(Color.FromArgb(50, 250, 70, 51)));
|
||||
btnBuyOrder.IsEnabled = false;
|
||||
btnBuyOrder.Content = "危险品不支持中转拍单";
|
||||
}
|
||||
else
|
||||
{
|
||||
btnBuyOrder.Content = order_item.buy_map == null ? "关联拍单" : "拍单";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user