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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -3304,7 +3304,7 @@ namespace Myshipping.Application
                     {
                         ChengZhongZhongLiang = ctn.WEIGHKGS.Value.ToString(),
                         ChengZhongShiJian = ctn.WEIGHDATE,
-                        CTNALL = ctn.CTNALL,
+                        CTNALL = ctn.CTNALL.Replace("'", ""),
                         CNTRNO = ctn.CNTRNO,
                         SEALNO = ctn.SEALNO
                     });
@@ -5463,7 +5463,7 @@ namespace Myshipping.Application
 
                 if (!string.IsNullOrEmpty(item.CARRIERID))
                 {
-                    var CARRIER = _cache.GetAllCodeCarrier().Result.Where(x =>x.Code == item.CARRIERID).Select(x => x.CnName).FirstOrDefault();
+                    var CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == item.CARRIERID).Select(x => x.CnName).FirstOrDefault();
                     if (CARRIER != null)
                     {
 
@@ -5481,11 +5481,11 @@ namespace Myshipping.Application
                     item.ISSUETYPE = ISSUETYPE;
                 }
 
-                var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id ).ToListAsync();
+                var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id).ToListAsync();
                 item.ctnInputs = ctn.Adapt<List<BookingCtnDto>>();
                 foreach (var it in item.ctnInputs)
                 {
-                    var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id ).ToListAsync();
+                    var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id).ToListAsync();
                     it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
                 }
                 var BookingLetteryard = await _repLetterYard.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).FirstAsync();
@@ -5493,7 +5493,7 @@ namespace Myshipping.Application
                 {
                     item.BookingLetteryard = BookingLetteryard;
                 }
-                var BookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id ).FirstAsync();
+                var BookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).FirstAsync();
                 if (BookingEDIExt != null)
                 {
                     item.BookingEDIExt = BookingEDIExt.Adapt<BookingEDIExtDto>();
@@ -5506,12 +5506,12 @@ namespace Myshipping.Application
                     ExtData = t.ExtData
                 }).Distinct().ToListAsync();
 
-                var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id  && x.TenantId == UserManager.TENANT_ID).ToListAsync();
+                var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID).ToListAsync();
                 item.childrens = childrens.Adapt<List<Children>>();
 
                 foreach (var childitem in item.childrens)
                 {
-                    var ctnInputs = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == childitem.Id ).ToListAsync();
+                    var ctnInputs = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == childitem.Id).ToListAsync();
                     childitem.ctnInputs = ctnInputs.Adapt<List<BookingCtnDto>>();
 
                     foreach (var it in childitem.ctnInputs)
@@ -5520,7 +5520,7 @@ namespace Myshipping.Application
                         it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
 
                     }
-                    var childBookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == childitem.Id ).FirstAsync();
+                    var childBookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == childitem.Id).FirstAsync();
                     if (childBookingEDIExt != null)
                     {
                         childitem.BookingEDIExt = childBookingEDIExt.Adapt<BookingEDIExtDto>();