|
|
|
@ -9,6 +9,7 @@ using Myshipping.Core.Entity;
|
|
|
|
|
using Myshipping.Core.Service;
|
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
using System.Text.RegularExpressions;
|
|
|
|
@ -221,7 +222,7 @@ namespace Myshipping.Application.EDI
|
|
|
|
|
postModel.remarkInfo = new ONESoApiRemarkInfo()
|
|
|
|
|
{
|
|
|
|
|
officeName = custOrder.BookingAddr,
|
|
|
|
|
specialInstruction = custOrder.SOREMARK
|
|
|
|
|
specialInstruction = custOrder.SOREMARK + Environment.NewLine + custOrder.CONTRACTNO
|
|
|
|
|
};
|
|
|
|
|
postModel.copyNum = custOrder.CopyNum;
|
|
|
|
|
|
|
|
|
@ -241,16 +242,16 @@ namespace Myshipping.Application.EDI
|
|
|
|
|
}
|
|
|
|
|
postModel.emailList = postModel.emailList.Distinct().ToList();
|
|
|
|
|
|
|
|
|
|
//else if (!string.IsNullOrEmpty(custContact.Email))
|
|
|
|
|
//{
|
|
|
|
|
// postModel.emailList = new List<string>() { custContact.Email };
|
|
|
|
|
//}
|
|
|
|
|
//else if (!string.IsNullOrEmpty(template.BcReceiveEmail))
|
|
|
|
|
//{
|
|
|
|
|
// postModel.emailList = new List<string>() { template.BcReceiveEmail };
|
|
|
|
|
//}
|
|
|
|
|
//else if (!string.IsNullOrEmpty(custContact.Email))
|
|
|
|
|
//{
|
|
|
|
|
// postModel.emailList = new List<string>() { custContact.Email };
|
|
|
|
|
//}
|
|
|
|
|
//else if (!string.IsNullOrEmpty(template.BcReceiveEmail))
|
|
|
|
|
//{
|
|
|
|
|
// postModel.emailList = new List<string>() { template.BcReceiveEmail };
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
var apiUrl = sCfgSpiderUrl.Value;
|
|
|
|
|
var apiUrl = sCfgSpiderUrl.Value;
|
|
|
|
|
if (!apiUrl.EndsWith("/"))
|
|
|
|
|
{
|
|
|
|
|
apiUrl += "/";
|
|
|
|
|