优化中转仓处理拍单流程 隐藏部分不可用功能
This commit is contained in:
1 parent
27ac748f33
commit
518365a0d3
30 files changed
+1237
-634
No files matched your search
@@ -288,7 +288,7 @@
|
||||
Visibility="Collapsed" />
|
||||
<Button
|
||||
x:Name="btnAdd"
|
||||
Grid.Row="9"
|
||||
Grid.Row="8"
|
||||
Grid.Column="1"
|
||||
MinWidth="48"
|
||||
Padding="4"
|
||||
@@ -296,7 +296,7 @@
|
||||
Click="btnAddReturnPackage_Click"
|
||||
Content="添 加"
|
||||
IsEnabled="False"
|
||||
Style="{StaticResource BasePageButtonStyle}" />
|
||||
Style="{StaticResource BasePageButtonStyle}" Height="28" Margin="0,53,0,0" Grid.RowSpan="2" VerticalAlignment="Top" />
|
||||
<Image
|
||||
x:Name="imgLoading"
|
||||
Grid.Row="9"
|
||||
|
||||
@@ -29,18 +29,25 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
/// </summary>
|
||||
public partial class TransitAfterSaleWindow : BaseWindow
|
||||
{
|
||||
public int PackType { get; set; }
|
||||
public oms_wei_order_item_info OrderItem { get; set; }
|
||||
public oms_wei_order_item_transit_detail_info TransitInfo { get; set; }
|
||||
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
|
||||
public oms_wei_transfer_extra_package ExtraPackage { get; set; } = null;
|
||||
|
||||
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info _transitOrder)
|
||||
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem, oms_wei_order_item_transit_detail_info _transitInfo)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
if (orderItem != null)
|
||||
OrderItem = orderItem;
|
||||
if (_transitOrder != null)
|
||||
TransitOrder = _transitOrder;
|
||||
|
||||
if (_transitInfo != null)
|
||||
TransitInfo = _transitInfo;
|
||||
if (_transitInfo?.oms_wei_external_procurement_log_info != null)
|
||||
TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info;
|
||||
else if (_transitInfo?.oms_wei_transfer_extra_package != null)
|
||||
ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package;
|
||||
PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
|
||||
}
|
||||
|
||||
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
|
||||
@@ -48,106 +55,143 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
}
|
||||
|
||||
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
btnAdd.IsEnabled = true;
|
||||
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
|
||||
{
|
||||
this.cmbWareHouse.Items.Add(warehouse.TransName);
|
||||
}
|
||||
{
|
||||
this.cmbWareHouse.Items.Add(warehouse.TransName);
|
||||
}
|
||||
|
||||
if (OrderItem != null)
|
||||
{
|
||||
if (TransitOrder == null)
|
||||
if (OrderItem != null && TransitInfo != null)
|
||||
{
|
||||
|
||||
if (ExtraPackage != null)
|
||||
{
|
||||
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;
|
||||
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;
|
||||
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
|
||||
// 获取额外包裹对应的发货包裹或者发货包裹本身
|
||||
var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code);
|
||||
|
||||
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, "");
|
||||
}
|
||||
}
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == ExtraPackage?.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;
|
||||
|
||||
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 = 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
|
||||
{
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
(OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
|
||||
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == ExtraPackage.order_code && t.order_void_status != 1 && t.pack_type == PackType);
|
||||
if (transitAfterSale != null)
|
||||
{
|
||||
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 == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
||||
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
|
||||
{
|
||||
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
var pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
|
||||
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(_transitOrder?.out_order_no) && !string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress) &&
|
||||
(_transitOrder.refund_status.ParseToString().Contains("需手动申请售后") || _transitOrder.refund_status.ParseToString().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;
|
||||
}
|
||||
|
||||
pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
|
||||
if (!string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress))
|
||||
{
|
||||
txtAddressAnalysis.Text = pddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
|
||||
// 如果提交过工单,则显示已提交工单及提交时间。
|
||||
var workOrderInfo = await GetWorkOrder();
|
||||
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
|
||||
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
|
||||
if (!string.IsNullOrEmpty(issueType))
|
||||
else if(TransitOrder != null)
|
||||
{
|
||||
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
|
||||
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;
|
||||
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
|
||||
if (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty())
|
||||
{
|
||||
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
|
||||
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, "");
|
||||
}
|
||||
}
|
||||
|
||||
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == TransitOrder.order_code && t.order_void_status != 1 && t.pack_type == PackType);
|
||||
if (transitAfterSale != null)
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
|
||||
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
|
||||
{
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
(TransitOrder.refund_status.ParseToString().Contains("需手动申请售后") || TransitOrder.refund_status.ParseToString().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 == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
||||
{
|
||||
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//if (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
|
||||
//{
|
||||
// btnAdd.IsEnabled = false;
|
||||
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||
// lblMsg.Content = "当前订单仓库状态不支持售后,请联系买家直接退回总店!";
|
||||
// return;
|
||||
//}
|
||||
|
||||
if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||
{
|
||||
//btnAdd.IsEnabled = false;
|
||||
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
|
||||
}
|
||||
}
|
||||
// 如果提交过工单,则显示已提交工单及提交时间。
|
||||
var workOrderInfo = await GetWorkOrder();
|
||||
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
|
||||
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
|
||||
if (!string.IsNullOrEmpty(issueType))
|
||||
{
|
||||
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
|
||||
}
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private async void btnAddReturnPackage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
@@ -155,10 +199,10 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
{
|
||||
// 后续为独立创建工单
|
||||
// 创建拦截退货包裹工单
|
||||
var workOrder = AddWorkOrder();
|
||||
var workOrder = await AddWorkOrderAsync();
|
||||
if (!workOrder.Contains("\"success\":true"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转拦截包裹添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
|
||||
BaseMsgWindow.ShowError("拦截工单添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -179,7 +223,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = TransitOrder?.order_code;
|
||||
data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
|
||||
data["refundProvince"] = txtProvince.Text.Trim();
|
||||
data["refundCity"] = txtCity.Text.Trim();
|
||||
data["refundCounty"] = txtCounty.Text.Trim();
|
||||
@@ -188,12 +232,7 @@ 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();
|
||||
//}
|
||||
data["packType"] = PackType; /* 1正常发货拦截退回,2额外包裹拦截退回, */
|
||||
//data["platform"] = "WEISHOP";
|
||||
|
||||
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
||||
@@ -214,7 +253,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = getTransitAfterSaleRst;
|
||||
BaseMsgWindow.ShowError("中转售后添加失败,服务端返回 " + msg, "", this);
|
||||
BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -222,7 +261,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); });
|
||||
//MainWindow.Instance.orderListCtrl.FilterOrders();
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowInfo("添加退货包裹成功", "", this);
|
||||
BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this);
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
@@ -282,7 +321,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
{
|
||||
}
|
||||
|
||||
public string AddWorkOrder()
|
||||
public async Task<string> AddWorkOrderAsync()
|
||||
{
|
||||
if (TransitOrder?.warehouse_status == 3)
|
||||
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
|
||||
@@ -296,7 +335,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
obj["creator"] = BaseClass.UserName;
|
||||
obj["remark"] = "客户要求拦截并退回云仓";
|
||||
|
||||
var rst = HttpResponseTransitWorkOrderBLL.PostResponse(this.OrderItem.ItemOrder?.Shop, url, JsonHelper.SerializeObject(obj), "");
|
||||
var rst = await HttpResponseTransitWorkOrderBLL.PostResponseAsync(this.OrderItem.ItemOrder?.Shop, url, JsonHelper.SerializeObject(obj), "");
|
||||
return rst;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user