|
|
@ -475,7 +475,8 @@ namespace Myshipping.Application
|
|
|
|
var entity = input.Adapt<BookingOrder>();
|
|
|
|
var entity = input.Adapt<BookingOrder>();
|
|
|
|
if (input.Id == 0)
|
|
|
|
if (input.Id == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (string.IsNullOrEmpty( entity.VOYNO)) {
|
|
|
|
if (string.IsNullOrEmpty(entity.VOYNO))
|
|
|
|
|
|
|
|
{
|
|
|
|
entity.VOYNO = entity.VOYNOINNER;
|
|
|
|
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);
|
|
|
|
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;
|
|
|
|
var webacc = _webAccountConfig.GetAccountConfig(carrWebAccMap.Value, UserManager.UserId).Result;
|
|
|
|
if (webacc == null)
|
|
|
|
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();
|
|
|
|
var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id).ToListAsync();
|
|
|
|
it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
|
|
|
|
it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
if (BookingEDIExt != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|