diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs index 300655c..5e6edaf 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs @@ -142,6 +142,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows { if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString())) { + // 创建拦截退货包裹工单 var workOrder = AddWorkOrder(); if (!workOrder.Contains("\"success\":true")) { @@ -175,7 +176,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows data["recipientPhone"] = txtMobile.Text.Trim(); data["account_user"] = BaseClass.UserName; data["accountUser"] = BaseClass.UserName; - if (string.IsNullOrEmpty(TransitOrder.express_1_waybill) && string.IsNullOrEmpty(TransitOrder.express_2_waybill) && + if (string.IsNullOrWhiteSpace(TransitOrder?.express_1_waybill) && string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) && !string.IsNullOrWhiteSpace(txtWarehouseWaybill.Text) && !string.IsNullOrWhiteSpace(txtExpressName.Text.Trim())) { data["refundWaybill"] = txtWarehouseWaybill.Text.Trim();