额外拍单等相关逻辑处理
This commit is contained in:
1 parent
0f70b5e37c
commit
477ed75771
6 files changed
+55
-68
No files matched your search
@@ -195,13 +195,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//this.DataContext = this;
|
||||
this.lbPddBuyer.ItemsSource = GlobalConfig.PDDBuyerLoginList;
|
||||
|
||||
buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_read_order_config");
|
||||
if (buyerReadOrderConfig == null)
|
||||
buyerReadOrderConfig = new BuyerReadOrderConfig();
|
||||
|
||||
// 命令行参数设置开发票的账户不要自动读单
|
||||
if (Environment.GetCommandLineArgs().Contains("aro=f"))
|
||||
{
|
||||
buyerReadOrderConfig.IsAutoReadOrder = false;
|
||||
@@ -2385,12 +2385,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 修改提前取号
|
||||
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
|
||||
{
|
||||
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
{
|
||||
order.sendStatus = "提前取号流程进行中";
|
||||
return;
|
||||
}
|
||||
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
//{
|
||||
// order.sendStatus = "提前取号流程进行中";
|
||||
// return;
|
||||
//}
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
var data = new JObject();
|
||||
|
||||
@@ -1948,12 +1948,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 修改提前取号
|
||||
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
|
||||
{
|
||||
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
{
|
||||
order.sendStatus = "提前取号流程进行中";
|
||||
return;
|
||||
}
|
||||
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
//{
|
||||
// order.sendStatus = "提前取号流程进行中";
|
||||
// return;
|
||||
//}
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
var data = new JObject();
|
||||
|
||||
@@ -1810,12 +1810,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 修改提前取号
|
||||
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
|
||||
{
|
||||
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
{
|
||||
order.sendStatus = "提前取号流程进行中";
|
||||
return;
|
||||
}
|
||||
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
//{
|
||||
// order.sendStatus = "提前取号流程进行中";
|
||||
// return;
|
||||
//}
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
var data = new JObject();
|
||||
|
||||
@@ -47,7 +47,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
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;
|
||||
//PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
|
||||
PackType = (_transitInfo?.TransitPackType).ParseToInt();
|
||||
}
|
||||
|
||||
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
|
||||
@@ -195,6 +196,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
private async void btnAddReturnPackage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (PackType > 0 == false)
|
||||
{
|
||||
BaseMsgWindow.ShowError("添加退货包裹失败,包裹类型不存在!", "", this);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
|
||||
{
|
||||
// 后续为独立创建工单
|
||||
|
||||
Reference in new issue
Block a user