Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/EDI/XiahuozhiHelpler.cs

@@ -755,7 +755,17 @@ namespace Myshipping.Application.EDI
 
                     StringBuilder sbData = new StringBuilder();
                     sbData.AppendLine($"01:{order.VESSEL}:{order.VOYNO}"); //船名 航次
-                    sbData.AppendLine($"12:{order.MBLNO}:{order.TRANSPORTID}:{order.PORTDISCHARGEID}:{paraXHZ.ItemCode}:{order.CARRIERID}::{order.PORTDISCHARGE}"); //主提单 中转港代码 目的港代码 货代代码 船公司 HPL参考号 备注
+
+                    //针对和川这种公共库不同的船司代码，需要匹配转换为当前的船司代码才能逻辑判断
+                    var hlcCode = "HLC";
+                    var mapCodeHLC = mappingCarrierLetterYard.FirstOrDefault(x => x.MapCode == "HLC");
+                    if (mapCodeHLC != null)
+                    {
+                        hlcCode = mapCodeHLC.Code;
+                    }
+
+
+                    sbData.AppendLine($"12:{order.MBLNO}:{order.TRANSPORTID}:{order.PORTDISCHARGEID}:{paraXHZ.ItemCode}:{order.CARRIERID}:{(order.CARRIERID == hlcCode ? order.CUSTNO : "")}:{order.PORTDISCHARGE}"); //主提单 中转港代码 目的港代码 货代代码 船公司 HPL参考号 备注
                     var despStr = ExchangeStr(order.DESCRIPTION.Replace(":", " ").Replace(",", " ")).Replace("\r\n", " ").Replace("\n", " ");
                     if (despStr.Length > 100)
                     {