修复包裹拒收功能报错

This commit is contained in:
wule committed 2026-10-29 20:00:14 +08:00
1 parent 679bd39144
commit 430bf8d574
5 files changed
+77 -11

No files matched your search

@@ -1,4 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using AllBase.Helper;
using AllBase.Model.DBModel;
using System;
using System.Collections.Generic;
@@ -27,6 +28,13 @@ public partial class OrderTransitListDetailCtrl : UserControl
InitializeComponent();
}
/// <summary> 作废包裹 </summary>
private void btnVoidPackage_Click(object sender, RoutedEventArgs e)
{
}
/// <summary> 拒收包裹 </summary>
private async void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
@@ -36,6 +44,7 @@ public partial class OrderTransitListDetailCtrl : UserControl
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
// 拒收发货包裹
if (transitOrder != null)
{
try
@@ -46,6 +55,22 @@ public partial class OrderTransitListDetailCtrl : UserControl
{
BaseMsgWindow.ShowError(ex.Message);
}
}
// 拒收额外包裹(额外包裹暂不支持多件商品发货,故暂不存在拒收功能)
else if (extOrder != null)
{
}
// 更新列表
if (FindParent<OrderTransitListCtrl>(this) is OrderTransitListCtrl transitListCtrl)
{
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
{
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem.order_id)?.orderItems.FirstOrDefault(oi => oi.sku_id == orderItem.sku_id),
};
transitListCtrl.UpdateViewModel(transitInfo);
}
}
}
@@ -59,4 +84,27 @@ public partial class OrderTransitListDetailCtrl : UserControl
{
}
/// <summary>
/// 查找指定类型的父级控件
/// </summary>
/// <typeparam name="T">目标父控件类型</typeparam>
/// <param name="child">起始子控件</param>
/// <returns>找到的父控件,未找到则返回 null</returns>
public static T FindParent<T>(DependencyObject child) where T : DependencyObject
{
DependencyObject parentObject = VisualTreeHelper.GetParent(child);
if (parentObject == null) return null;
if (parentObject is T parent)
{
return parent;
}
else
{
// 递归继续向上查找
return FindParent<T>(parentObject);
}
}
}