From 3e582baff3cca5c709009bf7ef5c67584b91154d Mon Sep 17 00:00:00 2001 From: wanghaomei Date: Mon, 8 May 2023 15:39:00 +0800 Subject: [PATCH] =?UTF-8?q?vgm=E7=9B=B4=E5=8F=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 2a422ee3..83cb4a39 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -475,7 +475,8 @@ namespace Myshipping.Application var entity = input.Adapt(); 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) { @@ -5601,7 +5607,7 @@ namespace Myshipping.Application var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id).ToListAsync(); it.ctnDetailInputs = ctnDetailInputs.Adapt>(); } - + var BookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).FirstAsync(); if (BookingEDIExt != null) {