diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 4599fdcf..336be44e 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -726,11 +726,12 @@ namespace Myshipping.Application item.statuslogs1 = CNTRNODtolist; var extendstate = await _repextendstate.FirstOrDefaultAsync(x => x.bookingId == item.Id); - if (extendstate!=null) { + if (extendstate != null) + { item.ExtendState = extendstate; } - + } @@ -927,7 +928,7 @@ namespace Myshipping.Application var rightlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true); - + //除现有配置权限外 操作和本人具有编辑权限 if (rightlist != null && !( mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString() || @@ -1192,7 +1193,7 @@ namespace Myshipping.Application } ordOut.HbList = HbList; } - + var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == Id); @@ -8347,7 +8348,7 @@ HLCUTA12307DPXJ3 以这票为例 6个柜 var Forwarder = _cache.GetAllCodeForwarder().Result.Take(10).ToList(); //货物品名 var GoodsName = _paraGoodsInfoRepository.AsQueryable().OrderBy("GOODS_CODE asc").Take(50).ToList().Select(t => t.Adapt()).ToList(); - + var YFXY = _paraContractNoInfoRepository.AsQueryable().OrderBy("CONTRACT_NO asc").Take(10).ToList().Select(t => t.Adapt()).ToList(); ; var User = await _repUser.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.Status == CommonStatus.ENABLE && x.IsDeleted == false).OrderBy(x => x.Name).ToListAsync(); //服务项目 @@ -9322,7 +9323,7 @@ HLCUTA12307DPXJ3 以这票为例 6个柜 var url = _cache.GetAllDictData().Result.Where(x => x.Code == "bookingTxxpUrl").Select(x => x.Value).FirstOrDefault(); _logger.LogInformation("提箱小票CMAurl:" + url); //亿通账号 - var ytAcc = _webAccountConfig.GetAccountConfig("CmaWeb", UserManager.UserId).Result; + var ytAcc = _webAccountConfig.GetAccountConfig("YitongWeb", UserManager.UserId).Result; if (ytAcc == null) { throw Oops.Bah(BookingErrorCode.BOOK119);