diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 9cc10cd..fb6a5ff 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -508,7 +508,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList(); item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id); if (item.PddBuyMap == null) - item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id); + item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id); if (item.PddBuyMap == null) item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id); if (item.PddBuyMap == null) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index ff4dfc2..32322b4 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -702,7 +702,7 @@ BorderBrush="{Binding TransitRefundStatusBackColor}" BorderThickness="1" CornerRadius="2" - Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}"> + Visibility="{Binding TransitRefundStatusStrVisibility}"> + Visibility="{Binding ItemTransitOutOrderNoStrVisibility}"> + Tag="{Binding order_id}"> + Visibility="{Binding OutOrderTimeQualifiedStrVisibility}"> + Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}"> - + - + + Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" /> @@ -942,7 +941,7 @@ + Visibility="{Binding DirectOrderBuyTimeStrVisibility}"> - + - + x.ItemTransitOrderWithVoid); } set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); } - } + } public Visibility ItemTransitOutOrderBuyerStrVisibility { get { return this.GetValue(x => x.ItemTransitOutOrderBuyerStrVisibility); } set { this.SetValue(x => x.ItemTransitOutOrderBuyerStrVisibility, value); } } + public Visibility ItemTransitOutOrderNoStrVisibility + { + get { return this.GetValue(x => x.ItemTransitOutOrderNoStrVisibility); } + set { this.SetValue(x => x.ItemTransitOutOrderNoStrVisibility, value); } + } public List ItemTransitOrderAfterSales { get; set; } = new List(); public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale { @@ -309,12 +314,22 @@ namespace AllBase.Model.DBModel public string TransitExtraPackageWaybillStr { get { return this.GetValue(x => x.TransitExtraPackageWaybillStr); } - set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); } + set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); TransitExtraPackageWaybillStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility TransitExtraPackageWaybillStrVisibility + { + get { return this.GetValue(x => x.TransitExtraPackageWaybillStrVisibility); } + set { this.SetValue(x => x.TransitExtraPackageWaybillStrVisibility, value); } } public string TransitExtraPackageWaybillBtnStr { get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStr); } - set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); } + set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); TransitExtraPackageWaybillBtnStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility TransitExtraPackageWaybillBtnStrVisibility + { + get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility); } + set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility, value); } } public List PddBuyerOrders { get; set; } = new List(); public order_pdd_buyer_order PddBuyerOrder @@ -336,7 +351,26 @@ namespace AllBase.Model.DBModel public string PddBuyerAfterSaleAddressStr { get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); } - set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); } + set + { + this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); + PddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; + + if (value.ParseToString().Length > 19) + PddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…"; + else + PddBuyerAfterSaleAddressShortStr = value.ParseToString(); + } + } + public string PddBuyerAfterSaleAddressShortStr + { + get { return this.GetValue(x => x.PddBuyerAfterSaleAddressShortStr); } + set { this.SetValue(x => x.PddBuyerAfterSaleAddressShortStr, value); } + } + public Visibility PddBuyerAfterSaleAddressStrVisibility + { + get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStrVisibility); } + set { this.SetValue(x => x.PddBuyerAfterSaleAddressStrVisibility, value); } } @@ -539,14 +573,19 @@ namespace AllBase.Model.DBModel /// 拍单物流编号 /// public string TransitOrderWaybillToWareHouseStr - { - get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); } - set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); } - } - /// - /// 提前取号物流编号(虚拟) - /// - public string TransitOrderWaybillFakeStr + { + get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); } + set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); TransitOrderWaybillToWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility TransitOrderWaybillToWareHouseStrVisibility + { + get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility); } + set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility, value); } + } + /// + /// 提前取号物流编号(虚拟) + /// + public string TransitOrderWaybillFakeStr { get { return this.GetValue(x => x.TransitOrderWaybillFakeStr); } set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); } @@ -557,7 +596,12 @@ namespace AllBase.Model.DBModel public string TransitOrderWaybillFromWareHouseStr { get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); } - set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); } + set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); TransitOrderWaybillFromWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility TransitOrderWaybillFromWareHouseStrVisibility + { + get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility); } + set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility, value); } } public string TransitWarehouseAfterSaleWayBillStr { @@ -788,20 +832,25 @@ namespace AllBase.Model.DBModel get { return this.GetValue(x => x.WarehouseWaybillStatusBackColor); } set { this.SetValue(x => x.WarehouseWaybillStatusBackColor, value); } } - #endregion + #endregion - /// - /// 中转仓表买手售后字段文字显示 - /// - public string TransitRefundStatusStr + /// + /// 中转仓表买手售后字段文字显示 + /// + public string TransitRefundStatusStr { get { return this.GetValue(x => x.TransitRefundStatusStr); } - set { this.SetValue(x => x.TransitRefundStatusStr, value); } + set { this.SetValue(x => x.TransitRefundStatusStr, value); TransitRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } } - /// - /// 中转仓表买手售后字段文字显示背景颜色 - /// - public SolidColorBrush TransitRefundStatusBackColor + public Visibility TransitRefundStatusStrVisibility + { + get { return this.GetValue(x => x.TransitRefundStatusStrVisibility); } + set { this.SetValue(x => x.TransitRefundStatusStrVisibility, value); } + } + /// + /// 中转仓表买手售后字段文字显示背景颜色 + /// + public SolidColorBrush TransitRefundStatusBackColor { get { return this.GetValue(x => x.TransitRefundStatusBackColor); } set { this.SetValue(x => x.TransitRefundStatusBackColor, value); } @@ -860,13 +909,18 @@ namespace AllBase.Model.DBModel else TransitRefundVoidStatusStr = ""; } - - + + // 仓库采购时间是否达标字段 - public string OutOrderTimeQualifiedStr + public string OutOrderTimeQualifiedStr { get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); } - set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); } + set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); OutOrderTimeQualifiedStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility OutOrderTimeQualifiedStrVisibility + { + get { return this.GetValue(x => x.OutOrderTimeQualifiedStrVisibility); } + set { this.SetValue(x => x.OutOrderTimeQualifiedStrVisibility, value); } } void SetOutOrderTimeQualifiedStr() { @@ -1020,7 +1074,12 @@ namespace AllBase.Model.DBModel public string DirectOrderBuyTimeStr { get { return this.GetValue(x => x.DirectOrderBuyTimeStr); } - set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); } + set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); DirectOrderBuyTimeStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility DirectOrderBuyTimeStrVisibility + { + get { return this.GetValue(x => x.DirectOrderBuyTimeStrVisibility); } + set { this.SetValue(x => x.DirectOrderBuyTimeStrVisibility, value); } } @@ -1043,7 +1102,25 @@ namespace AllBase.Model.DBModel public string DirectPddBuyerAfterSaleAddressStr { get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); } - set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); } + set + { + this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); + if (value.ParseToString().Length > 19) + DirectPddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…"; + else + DirectPddBuyerAfterSaleAddressShortStr = value.ParseToString(); + DirectPddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; + } + } + public string DirectPddBuyerAfterSaleAddressShortStr + { + get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr); } + set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr, value); } + } + public Visibility DirectPddBuyerAfterSaleAddressStrVisibility + { + get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility); } + set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); } } public string DirectRefundStatusStr { @@ -1450,7 +1527,11 @@ namespace AllBase.Model.DBModel /// /// sku属性JSON /// - public string sku_attrs { get; set; } + public string sku_attrs + { + get { return this.GetValue(x => x.sku_attrs); } + set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); } + } /// /// sku实付总价,取estimate_price和change_price中较小值 /// @@ -1572,7 +1653,6 @@ namespace AllBase.Model.DBModel // })); //} - this.SetSkuAttrStr(); this.SetItemRefund(); this.SetTransitOrder(); this.SetDirectOrder(); @@ -1596,6 +1676,7 @@ namespace AllBase.Model.DBModel tOrder.SetOutOrderBuyerStr(); } ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; + ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; } } diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs index fa3cda0..3880602 100644 --- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs +++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs @@ -1181,6 +1181,7 @@ namespace TemuKJD.ToolForms } } } + //time=1792314251&code=22107EDBDC132F485500B33B4C58CFDB&code_version=1&version=329&user_name=13367632144&path=29wx&spu_code=10001462916616&sku_code=%e7%bb%bf%e8%89%b2%e6%8c%8e%e5%8c%85%e5%b0%8f%e9%bb%91%e7%8c%ab%e6%8c%82%e4%bb%b6&main_user_name=13367632144&map_goods_name=超萌小黑猫挂件手工编织毛绒公仔多色礼物送朋友&map_spec_name=【大眼猫】挎包绿&map_goods_id=984310168545&map_sku_id=1941546612897&map_send_address=&transit_warehouse_id=XDYSHANDC url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map"); var result = await GetHtml.PostUtf8Async(url, data); if (!result.Contains("\"code\":200"))