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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -475,7 +475,8 @@ namespace Myshipping.Application
             var entity = input.Adapt<BookingOrder>();
             if (input.Id == 0)
             {
-                if (string.IsNullOrEmpty( entity.VOYNO)) {
+                if (string.IsNullOrEmpty(entity.VOYNO))
+                {
                     entity.VOYNO = entity.VOYNOINNER;
                 }
 
@@ -3468,6 +3469,11 @@ namespace Myshipping.Application
 
                 //船公司网站账号
                 var carrWebAccMap = _cache.GetAllDictData().Result.FirstOrDefault(x => x.TypeCode == "carrier_web_account_mapping" && x.Code == order.CARRIERID);
+                if (carrWebAccMap == null)
+                {
+                    throw Oops.Bah("不支持的船公司或账号映射未配置");
+                }
+
                 var webacc = _webAccountConfig.GetAccountConfig(carrWebAccMap.Value, UserManager.UserId).Result;
                 if (webacc == null)
                 {
@@ -3559,7 +3565,7 @@ namespace Myshipping.Application
                     BoxInfo = ctns.Select(c => new
                     {
                         index = idx++,
-                        boxType = c.CTNALL,
+                        boxType = c.CTNALL.Replace("'", ""),
                         boxcount = c.CTNNUM.HasValue ? c.CTNNUM.Value : 0,
                         code = c.CNTRNO,
                         sealCode = c.SEALNO,

Myshipping.Core/Service/Dict/SysDictDataService.cs

@@ -72,7 +72,7 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
     [HttpPost("/sysDictData/add")]
     public async Task AddDictData(AddDictDataInput input)
     {
-        var isExist = await _sysDictDataRep.AnyAsync(u => (u.Code == input.Code || u.Value == input.Value) && u.TypeId == input.TypeId);
+        var isExist = await _sysDictDataRep.AnyAsync(u => u.Code == input.Code && u.TypeId == input.TypeId);
         if (isExist) throw Oops.Oh(ErrorCode.D3003);
 
         var dictData = input.Adapt<SysDictData>();
@@ -218,7 +218,9 @@ public class SysDictDataService : ISysDictDataService, IDynamicApiController, IT
                 }).ToListAsync();
                 await _cache.SetAllDictData(list);
             }
-        } else {
+        }
+        else
+        {
             var list = await _sysDictDataRep.AsQueryable().InnerJoin<SysDictType>((d, t) => d.TypeId == t.Id).Filter(null, true).Where((d, t) => t.Status == CommonStatus.ENABLE && d.Status == CommonStatus.ENABLE).Select((d, t) => new DictDataDto
             {
                 Id = d.Id,