修改EDI

optimize
jianghaiqing 2 years ago
parent c451aa52aa
commit 9bf0eb98eb

@ -61,6 +61,7 @@ using Microsoft.IdentityModel.Tokens;
using Myshipping.Application.EDI.ESL; using Myshipping.Application.EDI.ESL;
using NPOI.HSSF.UserModel; using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel; using NPOI.SS.UserModel;
using NPOI.SS.Formula.Functions;
namespace Myshipping.Application namespace Myshipping.Application
{ {
@ -2639,12 +2640,12 @@ namespace Myshipping.Application
//集装箱型 //集装箱型
var ediCtnList = _cache.GetAllMappingCtn().GetAwaiter().GetResult() var ediCtnList = _cache.GetAllMappingCtn().GetAwaiter().GetResult()
.Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) .Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
&& t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)).ToList(); && !string.IsNullOrWhiteSpace(t.CarrierCode) && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)).ToList();
//包装 //包装
var ediPkgsList = _cache.GetAllMappingPackage().GetAwaiter().GetResult() var ediPkgsList = _cache.GetAllMappingPackage().GetAwaiter().GetResult()
.Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) .Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
&& t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)).ToList(); && !string.IsNullOrWhiteSpace(t.CarrierCode) && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)).ToList();
//包装基础数据 //包装基础数据
var basePkgsList = _cache.GetAllCodePackage().GetAwaiter().GetResult(); var basePkgsList = _cache.GetAllCodePackage().GetAwaiter().GetResult();
@ -2662,7 +2663,7 @@ namespace Myshipping.Application
var ftpSet = _cache.GetAllEdiSetting().GetAwaiter().GetResult() var ftpSet = _cache.GetAllEdiSetting().GetAwaiter().GetResult()
.FirstOrDefault(a => a.EDICODE.Equals(ediRouteEnum.ToString(), StringComparison.OrdinalIgnoreCase) .FirstOrDefault(a => a.EDICODE.Equals(ediRouteEnum.ToString(), StringComparison.OrdinalIgnoreCase)
&& a.TenantId == order.TenantId && a.CARRIERID.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)); && a.TenantId == order.TenantId && !string.IsNullOrWhiteSpace(a.CARRIERID) && a.CARRIERID.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase));
if (ftpSet == null) if (ftpSet == null)
throw Oops.Bah($"获取EDICODE={ediRouteEnum.ToString()}的EDI参数设置失败"); throw Oops.Bah($"获取EDICODE={ediRouteEnum.ToString()}的EDI参数设置失败");
@ -2986,7 +2987,7 @@ namespace Myshipping.Application
var fileInfo = new FileInfo(filePath); var fileInfo = new FileInfo(filePath);
Log.Information($"准备请求发送ftp{ftpSpiderUrl} ,参数:{ftpPostObj.ToJsonString()},文件:{filePath}"); _logger.LogInformation($"准备请求发送ftp{ftpSpiderUrl} ,参数:{ftpPostObj.ToJsonString()},文件:{filePath}");
string strJoin = System.IO.File.ReadAllText(filePath); string strJoin = System.IO.File.ReadAllText(filePath);

Loading…
Cancel
Save