1 退货物流信息如果中转表没有从买手单表读取 2仓库详细信息

This commit is contained in:
wule committed 2026-10-25 22:10:39 +08:00
1 parent e492457516
commit fda30c824a
5 files changed
+109 -23

No files matched your search

@@ -30,8 +30,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public partial class TransitAfterSaleWindow : BaseWindow
{
public oms_wei_order_item_info OrderItem { get; set; }
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
{
InitializeComponent();
@@ -54,9 +55,24 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (OrderItem != null)
{
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName;
this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company ?? OrderItem.ItemTransitOrderWithVoid?.express_2_company;
this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill ?? OrderItem.ItemTransitOrderWithVoid?.express_2_waybill;
if (TransitOrder == null)
{
if (OrderItem.ItemTransitOrder != null)
TransitOrder = OrderItem.ItemTransitOrder;
else
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
}
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
this.txtExpressName.Text = TransitOrder?.express_2_company;
this.txtWarehouseWaybill.Text = TransitOrder?.express_2_waybill;
if (this.txtExpressName.Text.IsNullOrEmpty())
{
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
}
if (this.txtWarehouseWaybill.Text.IsNullOrEmpty())
{
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
}
if (OrderItem.ItemTransitOrderAfterSale != null)
{
@@ -73,8 +89,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
else
{
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
(OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
@@ -89,7 +105,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
@@ -107,8 +123,7 @@ 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 (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
//{
// btnAdd.IsEnabled = false;
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
@@ -116,7 +131,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
// return;
//}
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
{
//btnAdd.IsEnabled = false;
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
@@ -151,7 +166,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
JObject data = new JObject();
data["orderNo"] = OrderItem.order_id;
data["orderCode"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
data["orderCode"] = TransitOrder?.order_code;
data["refundProvince"] = txtProvince.Text.Trim();
data["refundCity"] = txtCity.Text.Trim();
data["refundCounty"] = txtCounty.Text.Trim();
@@ -249,9 +264,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder()
{
if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
if (OrderItem.ItemTransitOrderWithVoid?.warehouse_status == 3)
if (TransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
@@ -259,7 +272,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
obj["appId"] = this.OrderItem.Shop?.ShopId;
obj["wechatOrderNo"] = this.OrderItem.order_id;
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
obj["purchaseOrderNo"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
obj["purchaseOrderNo"] = TransitOrder?.order_code;
obj["creator"] = BaseClass.UserName;
obj["remark"] = "客户要求拦截并退回云仓";