diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 8221a74..2de9c26 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -688,11 +688,11 @@
+ VirtualizingStackPanel.VirtualizationMode="Recycling">
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 2c30e27..1ca9424 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -787,8 +787,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 异步加载图片防止卡顿
// 缩略图在有的电脑上无法显示
//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
- //BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100);
- BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
+ BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100);
+ //BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
Thread.Sleep(Randomx.GetId(1000));
Dispatcher.Invoke(new Action(() =>
{
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index e9da18a..4316078 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -30,6 +30,11 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); }
}
+ public string OrderDiffItemCountStr
+ {
+ get { return this.GetValue(x => x.OrderDiffItemCountStr); }
+ set { this.SetValue(x => x.OrderDiffItemCountStr, value); }
+ }
public string OrderBuyType
{
@@ -48,6 +53,31 @@ namespace AllBase.Model.DBModel
}
public ObservableCollection orderItems { get; set; } = new ObservableCollection();
+ public oms_wei_order_item_info orderItem
+ {
+ get { return this.GetValue(x => x.orderItem); }
+ set { this.SetValue(x => x.orderItem, value); }
+ }
+ public oms_wei_order_item_info orderItem2
+ {
+ get { return this.GetValue(x => x.orderItem2); }
+ set { this.SetValue(x => x.orderItem2, value); }
+ }
+ public oms_wei_order_item_info orderItem3
+ {
+ get { return this.GetValue(x => x.orderItem3); }
+ set { this.SetValue(x => x.orderItem3, value); }
+ }
+ public oms_wei_order_item_info orderItem4
+ {
+ get { return this.GetValue(x => x.orderItem4); }
+ set { this.SetValue(x => x.orderItem4, value); }
+ }
+ public oms_wei_order_item_info orderItem5
+ {
+ get { return this.GetValue(x => x.orderItem5); }
+ set { this.SetValue(x => x.orderItem5, value); }
+ }
public ObservableCollection refundItems { get; set; } = new ObservableCollection();
@@ -714,22 +744,22 @@ namespace AllBase.Model.DBModel
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
- {
- OrderBuyType = "云改直";
- OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
- }
- else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
- {
- OrderBuyType = "直发";
- OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
- }
- else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
- {
- OrderBuyType = "云仓";
- OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
- }
- else
- OrderBuyType = "";
+ {
+ OrderBuyType = "云改直";
+ OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
+ }
+ else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
+ {
+ OrderBuyType = "直发";
+ OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
+ }
+ else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
+ {
+ OrderBuyType = "云仓";
+ OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
+ }
+ else
+ OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款";
@@ -744,7 +774,7 @@ namespace AllBase.Model.DBModel
IsRefund = GetIsRefund();
IsEmergency = GetIsEmergency();
IsDistribReturnOrder = GetIsDistribReturnOrder();
- IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
+ IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
IsAbnormal = GetIsAbnormal();
@@ -762,8 +792,15 @@ namespace AllBase.Model.DBModel
SetDeliveryDeadlineStr();
SetStatusBoxColor();
SetOutExpressNo();
- SetShipDoneTimeStr();
+ SetShipDoneTimeStr();
SetColorBrush();
+
+ orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+ orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+ orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+ orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+ orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+ OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
}
public void SetColorBrush()
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 98b7712..3f152c2 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -27,13 +27,23 @@ namespace AllBase.Model.DBModel
{
get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); }
- }
+ }
- #region 订单采购参数
- ///
- /// 采购关联
- ///
- public WXBuyMapInfo PddBuyMap
+ ///
+ /// 订单扩展信息
+ ///
+ public Visibility OrderItemVisibility
+ {
+ get { return this.GetValue(x => x.OrderItemVisibility); }
+ set { this.SetValue(x => x.OrderItemVisibility, value); }
+ }
+
+
+ #region 订单采购参数
+ ///
+ /// 采购关联
+ ///
+ public WXBuyMapInfo PddBuyMap
{
get { return this.GetValue(x => x.PddBuyMap); }
set { this.SetValue(x => x.PddBuyMap, value); }
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单
- this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ??
- PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && !p.statusText.Contains("申请已撤销"));
+ this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
+ PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && !p.statusText.Contains("申请已撤销"));
if (PddBuyerAfterSale == null)
- PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no);
+ PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no);
// 直接取号和更正取号显示的买手到仓库物流
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
public string DirectRefundStatusStr
{
get { return this.GetValue(x => x.DirectRefundStatusStr); }
- set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ set {
+ if (order_id == "3739897762013171200")
+ {
+
+ }
+ this.SetValue(x => x.DirectRefundStatusStr, value);
+ DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(DirectRefundStatusStr) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility DirectRefundStatusStrVisibility
{