|
|
@ -922,7 +922,7 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
await SaveLog(entity, mlist);
|
|
|
|
await SaveLog(entity, mlist);
|
|
|
|
if (!string.IsNullOrEmpty(entity.MBLNO) && (entity.MBLNO != mlist.MBLNO||entity.YARDID!=mlist.YARDID||entity.CARRIERID!=mlist.CARRIERID))
|
|
|
|
if (!string.IsNullOrEmpty(entity.MBLNO) && (entity.MBLNO != mlist.MBLNO || entity.YARDID != mlist.YARDID || entity.CARRIERID != mlist.CARRIERID))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//更改提单号
|
|
|
|
//更改提单号
|
|
|
|
await UpdateMblno(entity);
|
|
|
|
await UpdateMblno(entity);
|
|
|
@ -2155,16 +2155,24 @@ namespace Myshipping.Application
|
|
|
|
//生成提箱小票
|
|
|
|
//生成提箱小票
|
|
|
|
var allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "txxp_carrier_list").Select(x => x.Code).ToList();
|
|
|
|
var allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "txxp_carrier_list").Select(x => x.Code).ToList();
|
|
|
|
if (allowCarrier.Contains(order.CARRIERID))
|
|
|
|
if (allowCarrier.Contains(order.CARRIERID))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var txxpLink = await TxxpLink(input.BookingId);
|
|
|
|
var txxpLink = await TxxpLink(input.BookingId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
catch { }
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//vgm链接
|
|
|
|
//vgm链接
|
|
|
|
allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "vgm_carrier_list").Select(x => x.Code).ToList();
|
|
|
|
allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "vgm_carrier_list").Select(x => x.Code).ToList();
|
|
|
|
if (allowCarrier.Contains(order.CARRIERID))
|
|
|
|
if (allowCarrier.Contains(order.CARRIERID))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
await VgmLink(input.BookingId);
|
|
|
|
await VgmLink(input.BookingId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
catch { }
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
await SendLetterYard(input.BookingId);
|
|
|
|
await SendLetterYard(input.BookingId);
|
|
|
|
return rtnId;
|
|
|
|
return rtnId;
|
|
|
|