修复包裹拒收功能报错

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

@@ -1252,7 +1252,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
try
{
BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, orderItem.ItemTransitOrder));
var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, transitOrder));
}
catch (Exception ex)
{
@@ -1304,7 +1305,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
orderItem.PddBuyerOrders.AddRange(OrderListCtrl.GetTbBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList());
OrderListCtrl.InitOrderItemObservableProp(orderItem);
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder.order_code && o.out_order_no == _itemTransitOrder.out_order_no);
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no);
if (itemTransitOrder == null)
itemTransitOrder = _itemTransitOrder;