优化中转仓处理逻辑

This commit is contained in:
wule committed 2026-11-12 19:08:35 +08:00
1 parent 82165f25a8
commit 15b8288a98
9 files changed
+90 -115

No files matched your search

@@ -71,7 +71,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
// 获取额外包裹对应的发货包裹或者发货包裹本身
var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code);
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == ExtraPackage?.platform)?.TransName;
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == _transitOrder?.platform)?.TransName;
this.txtExpressName.Text = string.IsNullOrWhiteSpace(ExtraPackage.real_logistics_code) ? ExtraPackage.logistics_code : ExtraPackage?.real_logistics_code;
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(ExtraPackage?.real_logistics_express_code) ? ExtraPackage?.logistics_express_code : ExtraPackage?.real_logistics_express_code;
@@ -223,7 +223,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
JObject data = new JObject();
data["orderNo"] = OrderItem.order_id;
data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage?.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
data["refundProvince"] = txtProvince.Text.Trim();
data["refundCity"] = txtCity.Text.Trim();
data["refundCounty"] = txtCounty.Text.Trim();
@@ -247,18 +247,16 @@ namespace _29WxOrderWpf.Windows.OrderWindows
var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
var getTransitAfterSaleStr = JsonHelper.SerializeObject(data);
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(getTransitAfterSaleUrl, getTransitAfterSaleStr, "");
if (!getTransitAfterSaleRst.ParseToString().Contains("<code>200</code>") && !getTransitAfterSaleRst.ParseToString().Contains("<code>0</code>"))
var getTransitAfterSaleRst = await HttpResponseWXBLL.e57PostResponseAsync(getTransitAfterSaleUrl, getTransitAfterSaleStr);
if (!getTransitAfterSaleRst.ParseToString().Contains("\"code\":0") && !getTransitAfterSaleRst.ParseToString().Contains("\"code\":200"))
{
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst;
string msg = BaseRegex.GetStringJsonByRegs(ref getTransitAfterSaleRst, getTransitAfterSaleRst, "msg");
BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this);
}
else
{
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); });
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
//MainWindow.Instance.orderListCtrl.FilterOrders();
StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this);