|
|
|
@ -457,16 +457,18 @@ namespace Myshipping.Application
|
|
|
|
|
/// <param name="Id"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet("/BookingOrder/getLog")]
|
|
|
|
|
public async Task<BookingLogDto> GetLog(long Id)
|
|
|
|
|
public async Task<List<BookingLogDto>> GetLog(long Id)
|
|
|
|
|
{
|
|
|
|
|
BookingLogDto list = new BookingLogDto();
|
|
|
|
|
var main = await _bookinglog.FirstOrDefaultAsync(u => u.BookingId == Id);
|
|
|
|
|
if (main != null)
|
|
|
|
|
List<BookingLogDto> list = new List<BookingLogDto>();
|
|
|
|
|
var main = await _bookinglog.AsQueryable().Where(u => u.BookingId == Id).ToListAsync();
|
|
|
|
|
list = main.Adapt<List<BookingLogDto>>();
|
|
|
|
|
if (list != null)
|
|
|
|
|
{
|
|
|
|
|
list = main.Adapt<BookingLogDto>();
|
|
|
|
|
var details = await _bookinglogdetail.AsQueryable().Where(x => x.PId == main.Id).ToListAsync();
|
|
|
|
|
|
|
|
|
|
list.details = details;
|
|
|
|
|
foreach (var item in list)
|
|
|
|
|
{
|
|
|
|
|
var details = await _bookinglogdetail.AsQueryable().Where(x => x.PId == item.Id).ToListAsync();
|
|
|
|
|
item.details = details;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
@ -592,6 +594,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 调用运踪接口
|
|
|
|
|
/// </summary>
|
|
|
|
|
[NonAction]
|
|
|
|
|
public async Task SendTrace(string BusinessId, string YARDID, string YARD, string MBLNO)
|
|
|
|
|
{
|
|
|
|
|
_logger.LogInformation("提单号:" + MBLNO + " 调用运踪接口");
|
|
|
|
@ -624,6 +627,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// </summary>
|
|
|
|
|
[AllowAnonymous]
|
|
|
|
|
[SqlSugarUnitOfWork]
|
|
|
|
|
[NonAction]
|
|
|
|
|
public async Task AddBookingStatusLog(List<BookingStatusLogDto> all)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|