From f2d619eafb646cd8f7b1d60ef7c4a3160930e373 Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 7 Aug 2026 09:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=BD=AC=E4=BB=93=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=B9=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=BD=AC=E4=BB=93=E6=8B=92=E6=94=B6?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/29WxOrderWpf.csproj.user | 2 +- .../BaseWindows/BaseMsgWindow.xaml.cs | 2 +- .../Ctrls/OrderCtrls/OrderListCtrl.xaml | 12 +- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 206 +++++++++++------- .../OrderCtrls/OrderListRowItemCtrl.xaml | 24 +- .../OrderCtrls/OrderListRowItemCtrl.xaml.cs | 60 ++++- .../TransitAfterSaleWindow.xaml.cs | 17 +- AllBase/BaseClass.cs | 2 +- .../oms_wei_external_procurement_log_info.cs | 1 + .../Model/DBModel/oms_wei_order_item_info.cs | 42 +++- 10 files changed, 249 insertions(+), 119 deletions(-) diff --git a/29WxOrderWpf/29WxOrderWpf.csproj.user b/29WxOrderWpf/29WxOrderWpf.csproj.user index 304107f..607b9ea 100644 --- a/29WxOrderWpf/29WxOrderWpf.csproj.user +++ b/29WxOrderWpf/29WxOrderWpf.csproj.user @@ -10,7 +10,7 @@ zh-CN false ProjectFiles - Development + Production ProjectDebugger diff --git a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs index 311b1b9..7061a44 100644 --- a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs +++ b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs @@ -110,7 +110,7 @@ namespace _29WxOrderWpf.BaseWindows DialogResult = false; } - public static void ShowAnimateMessage(string message, string type = "Msg", int DurationSeconds = 1) + public static void ShowAnimateMessage(string message, string type = "Msg", int DurationSeconds = 2) { MainWindow.Instance.Dispatcher.Invoke(new Action(() => { diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml index 20e4fae..a89046b 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml @@ -98,7 +98,7 @@ - @@ -326,7 +326,7 @@ LayoutUpdated="dgOrderHeader_LayoutUpdated"> - + @@ -345,12 +345,12 @@ - - - + + + - + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 529201d..b5ae969 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -213,47 +213,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - // 读取中转仓拍单订单 - var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order"); - var data3 = UserLogin.GetSignaturex(); - data3 += "&order_no=" + order_ids; - var html3 = GetHtml.PostUtf8(url3, data3); - if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) - html3 = GetHtml.PostUtf8(url3, data3); - if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) - { - BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg")); - break; - } - List transitOrderList = new List(); - try - { - transitOrderList = JsonHelper.DeserializeJsonToList(JObject.Parse(html3)["data"].ParseToString()); - } - catch { } + // 读取中转仓拍单订单 + var transitOrderList = GetTransitWarehouseList(order_ids); + + // 读取中转仓拍单订单售后状态 + var transitAfterSaleList = GetTransitWarehouseAfterSaleList(order_ids); // 读取暂时记录的买手订单，后面想办法放到中转订单库里去 - var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list"); - var data4 = UserLogin.GetSignaturex(); - data4 += "&wx_order_id_in=" + order_ids; - var html4 = GetHtml.PostUtf8(url4, data4); - if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200")) - html4 = GetHtml.PostUtf8(url4, data4); - if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200")) - { - Dispatcher.Invoke(new Action(() => - { - BaseMsgWindow.ShowError("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg")); - })); - break; - } - List pddBuyerOrders = new List(); - try - { - pddBuyerOrders = JsonHelper.DeserializeJsonToList(JObject.Parse(html4)["data"].ParseToString()) - .OrderByDescending(p => p.TransitCreateTime).ToList(); - } - catch { } + var pddBuyerOrders = GetPddBuyerOrders(order_ids); + // 读取暂时记录的买手售后单，后面想办法放到中转订单库里去 var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list"); @@ -280,32 +248,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - // 读取中转仓处理售后单 - var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list"); - var data5 = UserLogin.GetSignaturex(); - data5 += "&wx_order_id_in=" + order_ids; - var html5 = GetHtml.PostUtf8(url5, data5); - if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200")) - html5 = GetHtml.PostUtf8(url5, data5); - if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200")) - { - Dispatcher.Invoke(new Action(() => - { - BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg")); - })); - break; - } - List transitAfterSaleList = new List(); - try - { - transitAfterSaleList = JsonHelper.DeserializeJsonToList(JObject.Parse(html5)["data"].ParseToString()) - .OrderByDescending(p => p.created_time).ToList(); - } - catch { } - - - // 读取关联拍单商品 - var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map"); + // 读取关联拍单商品 + var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map"); var dataMap = UserLogin.GetSignaturex() + "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id))) + "," + string.Join(",", orderItems.Select(oi => oi.product_id)); dataMap += "&main_user_name=" + BaseClass.MainUserName; @@ -372,7 +316,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 中转仓买手退货订单(wx_send_type等于0) item.PddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList(); // 直发买手订单(wx_send_type等于1) - item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList(); + item.DirectPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList(); // 直发买手退款订单(wx_send_type等于1) item.DirectPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList(); } @@ -381,11 +325,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls order.refundItems = new ObservableCollection(refunds.Where(of => of.order_id == order.order_id)); // 读取订单后立即赋值，防止滚动时实时赋值造成卡顿 - foreach (var orderItem in order.orderItems) - { - orderItem.SetOrderItemTextProperty(); - } - order.SetOrderTextProperty(); + InitOrderObservableProp(order); // 删除再添加，触发更新。 todo: 如果已存在相同订单，则直接修改更新 var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id); @@ -438,6 +378,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls })); } + public static void InitOrderObservableProp(oms_wei_order_info order) + { + if (order != null && order.orderItems != null) + { + foreach (var orderItem in order.orderItems) + { + if (orderItem != null) + orderItem.SetOrderItemTextProperty(); + } + order.SetOrderTextProperty(); + } + } + public static void InitOrderItemObservableProp(oms_wei_order_item_info orderItem) + { + if (orderItem != null) + { + orderItem.SetOrderItemTextProperty(); + if (orderItem.ItemOrder != null) + orderItem.ItemOrder.SetOrderTextProperty(); + } + } + /// /// 读取订单详情信息 /// @@ -519,6 +481,91 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls return refunds; } + public static List GetTransitWarehouseList(string order_ids) + { + if (string.IsNullOrEmpty(order_ids)) + return new List(); + + var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order"); + var data3 = UserLogin.GetSignaturex(); + data3 += "&order_no=" + order_ids; + var html3 = GetHtml.PostUtf8(url3, data3); + if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) + html3 = GetHtml.PostUtf8(url3, data3); + if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) + { + BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5); + } + List transitOrderList = new List(); + try + { + transitOrderList = JsonHelper.DeserializeJsonToList(JObject.Parse(html3)["data"].ParseToString()); + return transitOrderList; + } + catch + { + } + return new List(); + } + + public static List GetTransitWarehouseAfterSaleList(string order_ids) + { + if (string.IsNullOrEmpty(order_ids)) + return new List(); + + // 读取中转仓处理售后单 + var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list"); + var data5 = UserLogin.GetSignaturex(); + data5 += "&wx_order_id_in=" + order_ids; + var html5 = GetHtml.PostUtf8(url5, data5); + if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200")) + html5 = GetHtml.PostUtf8(url5, data5); + if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200")) + { + BaseMsgWindow.ShowAnimateMessage("云仓售后订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5); + } + List transitAfterSaleList = new List(); + try + { + transitAfterSaleList = JsonHelper.DeserializeJsonToList(JObject.Parse(html5)["data"].ParseToString()) + .OrderByDescending(p => p.created_time).ToList(); + if (transitAfterSaleList != null) + return transitAfterSaleList; + } + catch + { + } + return new List(); + } + + public static List GetPddBuyerOrders(string order_ids) + { + if (string.IsNullOrEmpty(order_ids)) + return new List(); + + var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list"); + var data4 = UserLogin.GetSignaturex(); + data4 += "&wx_order_id_in=" + order_ids; + var html4 = GetHtml.PostUtf8(url4, data4); + if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200")) + html4 = GetHtml.PostUtf8(url4, data4); + if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200")) + { + BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5); + } + List pddBuyerOrders = new List(); + try + { + pddBuyerOrders = JsonHelper.DeserializeJsonToList(JObject.Parse(html4)["data"].ParseToString()) + .OrderByDescending(p => p.TransitCreateTime).ToList(); + return pddBuyerOrders; + } + catch + { + } + return new List(); + } + public void GetShopWaybillExceptionOrder() { foreach (var shop in GlobalConfig.ShopLoginList) @@ -575,10 +622,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 更新显示 Dispatcher.Invoke(new Action(() => { - foreach (var oi in waybillExceptionOrder.orderItems) - oi.SetOrderItemTextProperty(); - waybillExceptionOrder.SetOrderTextProperty(); - + InitOrderObservableProp(waybillExceptionOrder); MainWindow.Instance.orderListCtrl.FilterOneOrder(waybillExceptionOrder, true); })); @@ -648,10 +692,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls orderItem.OrderItemExt = orderExt; Dispatcher.Invoke(new Action(() => { - foreach (var oi in order.orderItems) - oi.SetOrderItemTextProperty(); - order.SetOrderTextProperty(); - + InitOrderObservableProp(order); MainWindow.Instance.orderListCtrl.FilterOneOrder(order, true); })); } @@ -729,16 +770,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } // 赋值显示订单元素 Dispatcher.Invoke(new Action(() => - { - orderItem.SetOrderItemTextProperty(); - order.SetOrderTextProperty(); + { + InitOrderItemObservableProp(orderItem); MainWindow.Instance.orderListCtrl.FilterOneOrder(order); })); } } } }); - } + } public void disPlayOrderTabOrderCount() diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 4763b22..7ab8b47 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -413,26 +413,34 @@ - - - - + + + + + + + - + + x:Name="txtBuyerRefundAddress" Margin="0,1,0,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap" + Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"/> + MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtBuyerRefundAddress,Path=Visibility}"> + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index aff5c04..c6c980d 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1019,14 +1019,68 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } + private void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e) + { + if (this.DataContext is oms_wei_order_item_info orderItem) + { + orderItem.ItemTransitOrders = OrderListCtrl.GetTransitWarehouseList(orderItem.order_id); + orderItem.PddBuyerOrders = OrderListCtrl.GetPddBuyerOrders(orderItem.order_id); + OrderListCtrl.InitOrderItemObservableProp(orderItem); + + + if (orderItem.ItemTransitOrder?.warehouse_status == 2) + { + BaseMsgWindow.ShowError("商品已出库，请选择退回中转仓！"); + return; + } + if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn)) + { + BaseMsgWindow.ShowError("商品未出单，请直接去拼多多买手申请退款"); + return; + } + if (orderItem.ItemTransitOrder?.has_reject == 1) + { + return; + } + + // 中转仓拒收（已产生物流） + string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply"; + var dataObj = new JObject(); + dataObj["orderCode"] = orderItem.ItemTransitOrder?.order_code; + dataObj["orderId"] = orderItem.order_id; + dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn; + var data = JsonHelper.SerializeObject(dataObj); + var html = HttpResponseWXBLL.e57PostResponse(url, data, ""); + int rejectStatus = 0; + if (html.Contains("0") || html.Contains("200")) + { + rejectStatus = 1; + BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3); + } + else + { + rejectStatus = 2; + var err = BaseRegex.GetStringXmlByRegs(ref html, "msg"); + BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3); + } + url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status"); + data = UserLogin.GetSignaturex(); + data += "&order_no=" + orderItem.order_id; + data += "&order_sku_id=" + orderItem.sku_id; + data += "&has_reject=" + rejectStatus; + html = GetHtml.PostUtf8(url, data); + + orderItem.ItemTransitOrderWithVoid.has_reject = rejectStatus; + OrderListCtrl.InitOrderItemObservableProp(orderItem); + } + } private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e) { if (this.DataContext is oms_wei_order_item_info orderItem) { - var transitAfterSale = orderItem.ItemTransitOrderAfterSale; - if (orderItem.ItemTransitOrder?.warehouse_status == 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加") + if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加") { - BaseMsgWindow.ShowError("商品已出库，请联系买家直接退回总店！"); + BaseMsgWindow.ShowError("商品未出库，请选择中转仓拒收！"); return; } TransitAfterSaleWindow transitAfterSaleWindow = new TransitAfterSaleWindow(orderItem); diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs index 174a12d..5a98337 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs @@ -70,13 +70,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows } } - if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1) - //if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1) + //if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1) + ////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1) + //{ + // btnAdd.IsEnabled = false; + // //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后，请联系买家直接退回总店！"); + // lblMsg.Content = "当前订单仓库状态不支持售后，请联系买家直接退回总店！"; + // return; + //} + + if (OrderItem?.ItemTransitOrder?.warehouse_status != 2) { - btnAdd.IsEnabled = false; - //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后，请联系买家直接退回总店！"); - lblMsg.Content = "当前订单仓库状态不支持售后，请联系买家直接退回总店！"; - return; + lblMsg.Content = "当前订单仓库状态不支持售后！"; } } diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 20e29ac..31846e8 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -32,7 +32,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 209; + public static int VersionCount = 210; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000"; diff --git a/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs b/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs index ca19c8b..b8dc0a7 100644 --- a/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs +++ b/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs @@ -78,5 +78,6 @@ namespace AllBase.Model.DBModel /// 中转出库时间 /// public DateTime? outbound_time { get; set; } + public int has_reject { get; set; } } } diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 98e9815..5ad8dbd 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -223,7 +223,12 @@ namespace AllBase.Model.DBModel } public void SetTransitOrder() { - this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1); + + if (order_id == "3738110521481264129") + { + + } + this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1); this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault(); this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault(); this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault(); @@ -250,16 +255,25 @@ namespace AllBase.Model.DBModel else TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill; - if (order_id == "3737914129536416512") - { + + AddEditTransitWarehouseRejectStr = "申请"; + if (this.ItemTransitOrderWithVoid?.has_reject == 1) + AddEditTransitWarehouseRejectStr = "已申请拒收"; + if (this.ItemTransitOrderWithVoid?.has_reject == 2) + AddEditTransitWarehouseRejectStr = "申请拒收失败"; + if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status == 2 || + string.IsNullOrEmpty(PddBuyerOrder?.order_sn)) + { + if (AddEditTransitWarehouseRejectStr != "已申请拒收") + AddEditTransitWarehouseRejectStr = ""; } // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败） AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加"; - if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal)) + if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 2) { - if (AddEditTransitWarehouseAfterSaleStr == "添加") + if (AddEditTransitWarehouseAfterSaleStr != "已添加") AddEditTransitWarehouseAfterSaleStr = ""; } if (this.ItemTransitOrderAfterSale != null) @@ -268,6 +282,14 @@ namespace AllBase.Model.DBModel this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress; } /// + /// 仓库拒收按钮文本参数 + /// + public string AddEditTransitWarehouseRejectStr + { + get { return this.GetValue(x => x.AddEditTransitWarehouseRejectStr); } + set { this.SetValue(x => x.AddEditTransitWarehouseRejectStr, value); } + } + /// /// 仓库退货编辑按钮文本参数 /// public string AddEditTransitWarehouseAfterSaleStr @@ -695,11 +717,11 @@ namespace AllBase.Model.DBModel } - public List DirectPddOrders { get; set; } = new List(); - public order_pdd_buyer_after_sale DirectPddOrder + public List DirectPddBuyerOrders { get; set; } = new List(); + public order_pdd_buyer_order DirectPddBuyerOrder { - get { return this.GetValue(x => x.DirectPddOrder); } - set { this.SetValue(x => x.DirectPddOrder, value); } + get { return this.GetValue(x => x.DirectPddBuyerOrder); } + set { this.SetValue(x => x.DirectPddBuyerOrder, value); } } public List DirectPddBuyerAfterSales { get; set; } = new List(); @@ -723,7 +745,7 @@ namespace AllBase.Model.DBModel } public void SetDirectOrder() { - this.DirectPddOrder = DirectPddOrders.FirstOrDefault(p => OrderItemExt?.out_order_id == p.orderSn); + this.DirectPddBuyerOrder = DirectPddBuyerOrders.FirstOrDefault(p => OrderItemExt?.out_order_id == p.order_sn); //this.DirectPddBuyerAfterSale = DirectPddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? DirectPddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销"); //if (DirectPddBuyerAfterSale == null)