同上一条
This commit is contained in:
1 parent
70996d5409
commit
da01c9f83f
11 files changed
+310
-61
No files matched your search
@@ -51,9 +51,9 @@ using Work._29Tools.BLL;
|
||||
using Work._29Tools.CefTools;
|
||||
using Work.BaseForms;
|
||||
using Work.BuyUsers;
|
||||
using Work.Extension;
|
||||
using WxOrder.Framework.Commons;
|
||||
using WxOrder.Framework.Helpers;
|
||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
|
||||
@@ -1253,7 +1253,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
try
|
||||
{
|
||||
var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
|
||||
BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, transitOrder));
|
||||
var rejectRst = await RejectTransitOrder(orderItem, transitOrder);
|
||||
if (!string.IsNullOrEmpty(rejectRst))
|
||||
BaseMsgWindow.ShowInfo(rejectRst);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -1512,7 +1514,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 拍单前查询订单是否退款
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<Border
|
||||
MinHeight="50"
|
||||
Margin="5"
|
||||
BorderBrush="SkyBlue"
|
||||
BorderBrush="#8087CEEB"
|
||||
BorderThickness="1"
|
||||
CornerRadius="10">
|
||||
<Grid>
|
||||
@@ -31,7 +31,7 @@
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
||||
<Border Background="#5087CEEB" CornerRadius="8,8,0,0">
|
||||
<StackPanel MinHeight="30" Orientation="Horizontal">
|
||||
<TextBlock
|
||||
Margin="10,0,0,0"
|
||||
@@ -51,6 +51,8 @@
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="发货包裹"
|
||||
FontWeight="Bold"
|
||||
Foreground="{Binding TransitTypeStrColor}"
|
||||
Text="{Binding TransitTypeStr}" />
|
||||
<TextBox
|
||||
VerticalContentAlignment="Center"
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -15,6 +17,8 @@ using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
|
||||
@@ -29,9 +33,118 @@ public partial class OrderTransitListDetailCtrl : UserControl
|
||||
}
|
||||
|
||||
/// <summary> 作废包裹 </summary>
|
||||
private void btnVoidPackage_Click(object sender, RoutedEventArgs e)
|
||||
private async void btnVoidPackage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
|
||||
{
|
||||
var orderItem = transitDetailInfo.oms_wei_order_item_info;
|
||||
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
|
||||
|
||||
// 作废发货包裹
|
||||
if (transitOrder != null)
|
||||
{
|
||||
|
||||
}
|
||||
// 作废退货包裹
|
||||
else if (returnOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
var voidResult = await VoidAfterSalePackage(orderItem, returnOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
// 作废额外包裹
|
||||
else if (extOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
var voidResult = await VoidExtraPackage(orderItem, extOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
RefreshListCtrl(orderItem);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作废售后包裹
|
||||
/// </summary>
|
||||
/// <param name="returnOrder"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<string> VoidAfterSalePackage(oms_wei_order_item_info orderItem, oms_wei_external_procurement_after_sale_info returnOrder)
|
||||
{
|
||||
string typeStr = returnOrder?.pack_type == 1 ? "作废分销发货退货包裹" : "作废额外包裹退货包裹";
|
||||
string msg = $@"确定{typeStr}吗?";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
|
||||
return "";
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/interceptReturn";
|
||||
var data = new JObject();
|
||||
data["externalOrderNo"] = returnOrder.external_order_no;
|
||||
data["orderNo"] = returnOrder.order_no; // 订单编号
|
||||
data["orderCode"] = returnOrder.order_code;
|
||||
data["packType"] = returnOrder.pack_type; /* 1作废分销发货退货包裹 2作废额外包裹退货包裹 */
|
||||
var dataStr2 = JsonHelper.SerializeObject(data);
|
||||
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
|
||||
|
||||
if (voidRst.Contains("\"code\":0") || voidRst.Contains("\"code\":200"))
|
||||
{
|
||||
StartUp.UpdateBalance();
|
||||
returnOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
return typeStr + "成功!";
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception(typeStr + "失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作废额外包裹
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
/// <param name="extraOrder"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
public static async Task<string> VoidExtraPackage(oms_wei_order_item_info orderItem, oms_wei_transfer_extra_package extraOrder)
|
||||
{
|
||||
string typeStr = "作废额外包裹";
|
||||
string msg = $@"确定{typeStr}吗?";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
|
||||
return "";
|
||||
|
||||
var data = new JObject();
|
||||
data["batchId"] = extraOrder.batchId;
|
||||
data["orderCode"] = extraOrder.order_code;
|
||||
var dataStr = JsonHelper.SerializeObject(data);
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extraOrders/void";
|
||||
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
|
||||
if (BaseRegex.GetStringJson(ref voidRst, "code") != "0" && BaseRegex.GetStringJson(ref voidRst, "code") != "200")
|
||||
{
|
||||
throw new Exception("作废额外包裹失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
|
||||
}
|
||||
StartUp.UpdateBalance();
|
||||
extraOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
//MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
||||
return "作废额外包裹成功!";
|
||||
}
|
||||
|
||||
/// <summary> 拒收包裹 </summary>
|
||||
@@ -65,15 +178,7 @@ public partial class OrderTransitListDetailCtrl : UserControl
|
||||
|
||||
}
|
||||
|
||||
// 更新列表
|
||||
if (FindParent<OrderTransitListCtrl>(this) is OrderTransitListCtrl transitListCtrl)
|
||||
{
|
||||
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
||||
{
|
||||
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem.order_id)?.orderItems.FirstOrDefault(oi => oi.sku_id == orderItem.sku_id),
|
||||
};
|
||||
transitListCtrl.UpdateViewModel(transitInfo);
|
||||
}
|
||||
RefreshListCtrl(orderItem);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,6 +192,19 @@ public partial class OrderTransitListDetailCtrl : UserControl
|
||||
|
||||
}
|
||||
|
||||
public void RefreshListCtrl(oms_wei_order_item_info orderItem)
|
||||
{
|
||||
// 更新列表
|
||||
if (FindParent<OrderTransitListCtrl>(this) is OrderTransitListCtrl transitListCtrl)
|
||||
{
|
||||
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
||||
{
|
||||
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem?.order_id)?.orderItems.FirstOrDefault(oi => oi.sku_id == orderItem?.sku_id),
|
||||
};
|
||||
transitListCtrl.UpdateViewModel(transitInfo);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找指定类型的父级控件
|
||||
/// </summary>
|
||||
|
||||
Reference in new issue
Block a user