优化订单读取 显示中转仓状态
This commit is contained in:
1 parent
3f618707da
commit
e01d9a4681
6 files changed
+135
-133
No files matched your search
@@ -63,15 +63,25 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
|
||||
}
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
|
||||
this.txtExpressName.Text = TransitOrder?.express_2_company;
|
||||
this.txtWarehouseWaybill.Text = TransitOrder?.express_2_waybill;
|
||||
if (this.txtExpressName.Text.IsNullOrEmpty())
|
||||
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
|
||||
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
|
||||
if (TransitOrder != null && (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty()))
|
||||
{
|
||||
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
|
||||
}
|
||||
if (this.txtWarehouseWaybill.Text.IsNullOrEmpty())
|
||||
{
|
||||
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.txtExpressName.Text) && !string.IsNullOrWhiteSpace(this.txtWarehouseWaybill.Text))
|
||||
{
|
||||
// 没物流信息的仓库单手动更新买手物流信息
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = TransitOrder?.order_code;
|
||||
data["logisticsExpressCode"] = this.txtWarehouseWaybill.Text;
|
||||
data["logisticsExpressCompany"] = this.txtExpressName.Text;
|
||||
var updateTransitExpressUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/updateLogisticsExpressCode";
|
||||
var updateTransitExpressStr = JsonHelper.SerializeObject(data);
|
||||
var updateTransitExpressRst = HttpResponseWXBLL.e57PostResponse(updateTransitExpressUrl, updateTransitExpressStr, "");
|
||||
}
|
||||
}
|
||||
|
||||
if (OrderItem.ItemTransitOrderAfterSale != null)
|
||||
@@ -176,12 +186,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
data["recipientPhone"] = txtMobile.Text.Trim();
|
||||
data["account_user"] = BaseClass.UserName;
|
||||
data["accountUser"] = BaseClass.UserName;
|
||||
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();
|
||||
data["returnExpressCompany"] = txtExpressName.Text.Trim();
|
||||
}
|
||||
//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();
|
||||
// data["returnExpressCompany"] = txtExpressName.Text.Trim();
|
||||
//}
|
||||
//data["platform"] = "WEISHOP";
|
||||
|
||||
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
||||
|
||||
Reference in new issue
Block a user