|
|
|
@ -55,6 +55,7 @@ using System.Net;
|
|
|
|
|
using Furion.DistributedIDGenerator;
|
|
|
|
|
using System.Linq.Expressions;
|
|
|
|
|
using Myshipping.Core.Extension;
|
|
|
|
|
using System.Text.RegularExpressions;
|
|
|
|
|
|
|
|
|
|
namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
@ -2754,7 +2755,14 @@ namespace Myshipping.Application
|
|
|
|
|
_logger.LogInformation($"调用SO(SI),校验:{strCheck},数据对象:{JsonConvert.SerializeObject(ediModel)}");
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(strCheck))
|
|
|
|
|
{
|
|
|
|
|
//if (Regex.IsMatch(strCheck, "\\<br\\s{1,}/\\>"))
|
|
|
|
|
//{
|
|
|
|
|
// strCheck = Regex.Replace(strCheck, "\\<br\\s{1,}/\\>", "\\r\\n");
|
|
|
|
|
//}
|
|
|
|
|
throw Oops.Bah($"发送{EDIRouteEnum.PIL.ToString()}校验失败,{strCheck}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var currRlt = PILEdiHelper.CreateEdiPIL(ediModel);
|
|
|
|
|
#endregion
|
|
|
|
@ -2769,7 +2777,14 @@ namespace Myshipping.Application
|
|
|
|
|
_logger.LogInformation($"调用SO(SI),校验:{strCheck},数据对象:{JsonConvert.SerializeObject(ediModel)}");
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(strCheck))
|
|
|
|
|
{
|
|
|
|
|
//if (Regex.IsMatch(strCheck, "\\<br\\s{1,}/\\>"))
|
|
|
|
|
//{
|
|
|
|
|
// strCheck = Regex.Replace(strCheck, "\\<br\\s{1,}/\\>", "\\r\\n");
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
throw Oops.Bah($"发送{EDIRouteEnum.PIL.ToString()}校验失败,{strCheck}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CommonWebApiResult currRlt = new CommonWebApiResult();
|
|
|
|
|
|
|
|
|
@ -2794,7 +2809,13 @@ namespace Myshipping.Application
|
|
|
|
|
_logger.LogInformation($"调用SO(SI),校验:{strCheck},数据对象:{JsonConvert.SerializeObject(ediModel)}");
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(strCheck))
|
|
|
|
|
{
|
|
|
|
|
//if (Regex.IsMatch(strCheck, "\\<br\\s{1,}/\\>"))
|
|
|
|
|
//{
|
|
|
|
|
// strCheck = Regex.Replace(strCheck, "\\<br\\s{1,}/\\>", "\\r\\n");
|
|
|
|
|
//}
|
|
|
|
|
throw Oops.Bah($"发送{EDIRouteEnum.PIL.ToString()}校验失败,{strCheck}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var currRlt = WYEdiHelper.CreateEdiWY(ediModel);
|
|
|
|
|
#endregion
|
|
|
|
@ -2810,7 +2831,9 @@ namespace Myshipping.Application
|
|
|
|
|
_logger.LogInformation($"调用SO(SI),校验:{strCheck},数据对象:{JsonConvert.SerializeObject(ediModel)}");
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(strCheck))
|
|
|
|
|
{
|
|
|
|
|
throw Oops.Bah($"发送{EDIRouteEnum.PIL.ToString()}校验失败,{strCheck}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CommonWebApiResult currRlt = new CommonWebApiResult();
|
|
|
|
|
|
|
|
|
@ -2835,7 +2858,15 @@ namespace Myshipping.Application
|
|
|
|
|
_logger.LogInformation($"调用SO(SI),校验:{strCheck},数据对象:{JsonConvert.SerializeObject(ediModel)}");
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(strCheck))
|
|
|
|
|
{
|
|
|
|
|
//if (Regex.IsMatch(strCheck, "\\<br\\s{1,}/\\>"))
|
|
|
|
|
//{
|
|
|
|
|
// strCheck = Regex.Replace(strCheck, "\\<br\\s{1,}/\\>", "</br>");
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
throw Oops.Bah($"发送{EDIRouteEnum.PIL.ToString()}校验失败,{strCheck}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CommonWebApiResult currRlt = YTEdiHelper.CreateEdiYT(ediModel);
|
|
|
|
|
#endregion
|
|
|
|
|