diff --git a/Myshipping.Application/EDI/XiahuozhiHelpler.cs b/Myshipping.Application/EDI/XiahuozhiHelpler.cs index bf0ce218..46779db2 100644 --- a/Myshipping.Application/EDI/XiahuozhiHelpler.cs +++ b/Myshipping.Application/EDI/XiahuozhiHelpler.cs @@ -43,7 +43,7 @@ namespace Myshipping.Application.EDI return new KeyValuePair(false, "订舱信息未找到"); } - var yardArr = new string[] { "GLJCZ", "GJF", "JFCZ", "GLXCZ", "ZCCZ" }; + var yardArr = new string[] { "GLJ", "GJF", "JIEFENG", "GangLianXin", "ZHONGCHUANG" }; if (!yardArr.Contains(order.YARDID)) { return new KeyValuePair(false, "不支持的场站"); @@ -71,7 +71,7 @@ namespace Myshipping.Application.EDI } #region 港联捷场站 - if (order.YARDID == "GLJCZ") + if (order.YARDID == "GLJ") { //租户参数-港联捷下货纸代号 var paraXHZ = (await cacheService.GetAllTenantParam()).FirstOrDefault(p => p.TenantId == order.TenantId && p.ParaCode == "CODE_GLJ_XHZ"); @@ -178,7 +178,7 @@ namespace Myshipping.Application.EDI #endregion #region 港捷丰场站 捷丰场站 NOTE:港捷丰场站和捷丰场站下货纸功能,根据东胜7同功能模块代码翻译而来 - else if (order.YARDID == "GJF" || order.YARDID == "JFCZ") + else if (order.YARDID == "GJF" || order.YARDID == "JIEFENG") { if (!order.PKGS.HasValue || order.PKGS.Value == 0) { @@ -214,7 +214,7 @@ namespace Myshipping.Application.EDI { ftpset = (await cacheService.GetAllEdiSetting()).FirstOrDefault(f => f.EDINAME == "XHZ_GJF" && f.TenantId == order.TenantId); } - else if (order.YARDID == "JFCZ") + else if (order.YARDID == "JIEFENG") { ftpset = (await cacheService.GetAllEdiSetting()).FirstOrDefault(f => f.EDINAME == "XHZ_JIEFENG" && f.TenantId == order.TenantId); } @@ -225,7 +225,7 @@ namespace Myshipping.Application.EDI } var ediParaName = "XHZ_GJF"; - if (order.YARDID == "JFCZ") + if (order.YARDID == "JIEFENG") { ediParaName = "XHZ_JIEFENG"; } @@ -439,7 +439,7 @@ namespace Myshipping.Application.EDI #endregion #region 港联欣场站 - else if (order.YARDID == "GLXCZ" || order.YARDID == "ZCCZ") + else if (order.YARDID == "GangLianXin" || order.YARDID == "ZHONGCHUANG") { //2022年6月15日增加:港联欣场站若配置了通过港联捷EDI发送,则使用港联捷报文格式 var tenantParam = await cacheService.GetAllTenantParam();