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

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -249,7 +249,7 @@ namespace Myshipping.Application
                     mDATA = order.Adapt<MDATA>();
                     var FORWARDER = mDATA.FORWARDER;
                     mDATA.FORWARDER = _cache.GetAllMappingForwarder().Result.Where(x => x.Code == FORWARDER && x.Module == "cangdan").Select(x => x.MapCode).FirstOrDefault() == null ?
-                        _cache.GetAllCodeForwarder().Result.Where(x => x.Code == FORWARDER).Select(x => x.Name).FirstOrDefault() : 
+                        _cache.GetAllCodeForwarder().Result.Where(x => x.Name == FORWARDER).Select(x => x.Name).FirstOrDefault() : 
                         _cache.GetAllMappingForwarder().Result.Where(x => x.Code == FORWARDER && x.Module == "cangdan").Select(x => x.MapCode).FirstOrDefault();
                     CTNDATA = ctns.Adapt<List<CTNDATAItem>>();
                     custEDIDtos.Add(