chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化订单处理

Browse Source
This commit is contained in:
wule committed 2026-11-04 10:05:52 +08:00
1 parent 85259d8335
commit 8f7e190974
10 files changed
+271 -125
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
+15 -14
View File
@@ -32,13 +32,16 @@ namespace _29WxOrderWpf.Windows.OrderWindows
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, oms_wei_external_procurement_log_info _transitOrder)
{
InitializeComponent();
if (orderItem != null)
OrderItem = orderItem;
}
if (_transitOrder != null)
TransitOrder = _transitOrder;
}
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
{
@@ -57,10 +60,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
{
if (TransitOrder == null)
{
if (OrderItem.ItemTransitOrder != null)
TransitOrder = OrderItem.ItemTransitOrder;
else
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
TransitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
}
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
@@ -84,17 +84,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
if (OrderItem.ItemTransitOrderAfterSale != null && OrderItem.ItemTransitOrderAfterSale.order_void_status != 1)
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == TransitOrder.order_code && t.order_void_status != 1);
if (transitAfterSale != null)
{
btnAdd.IsEnabled = false;
this.txtUser.Text = OrderItem.ItemTransitOrderAfterSale.recipient_name;
this.txtMobile.Text = OrderItem.ItemTransitOrderAfterSale.recipient_phone;
this.txtDetailAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_detail_address;
//this.txtAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_province + "/" + OrderItem.ItemTransitOrderAfterSale.refund_city + "/" + OrderItem.ItemTransitOrderAfterSale.refund_county;
this.txtProvince.Text = OrderItem.ItemTransitOrderAfterSale.refund_province;
this.txtCity.Text = OrderItem.ItemTransitOrderAfterSale.refund_city;
this.txtCounty.Text = OrderItem.ItemTransitOrderAfterSale.refund_county;
this.txtUser.Text = transitAfterSale.recipient_name;
this.txtMobile.Text = transitAfterSale.recipient_phone;
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
this.txtProvince.Text = transitAfterSale.refund_province;
this.txtCity.Text = transitAfterSale.refund_city;
this.txtCounty.Text = transitAfterSale.refund_county;
}
else
{