xaml用制表符缩进 优化订单分配逻辑

This commit is contained in:
wule committed 2026-08-28 04:28:48 +08:00
1 parent 237fad81eb
commit aeb30c1171
22 files changed
+2885 -2435

No files matched your search

@@ -45,8 +45,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
{
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{
btnAdd.IsEnabled = true;
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{
this.cmbWareHouse.Items.Add(warehouse.TransName);
}
@@ -71,12 +72,29 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
else
{
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
}
}
imgLoading.Visibility = Visibility.Collapsed;
var workOrderInfo = await GetWorkOrder();
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
@@ -234,6 +252,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder()
{
if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
JObject obj = new JObject();
obj["appId"] = this.OrderItem.Shop.ShopId;