diff --git a/Myshipping.Application/Job/HCDataCompareWorker.cs b/Myshipping.Application/Job/HCDataCompareWorker.cs index c8b3c8a2..458376a5 100644 --- a/Myshipping.Application/Job/HCDataCompareWorker.cs +++ b/Myshipping.Application/Job/HCDataCompareWorker.cs @@ -71,7 +71,8 @@ namespace Myshipping.Application.Job { x.Id, x.MBLNO, - x.ParentId + x.ParentId, + x.VERSION }) .ToList(); @@ -82,7 +83,8 @@ namespace Myshipping.Application.Job .Select(x => new HCDataCompareSendSubModel { Id = x.Id, - MBLNO = x.MBLNO + MBLNO = x.MBLNO, + VERSION = x.VERSION }) .ToList(); } @@ -98,7 +100,8 @@ namespace Myshipping.Application.Job .Select(x => new HCDataCompareSendModel { Id = x.Id, - MBLNO = x.MBLNO + MBLNO = x.MBLNO, + VERSION = x.VERSION }) .ToList(); @@ -171,6 +174,8 @@ namespace Myshipping.Application.Job public string MBLNO { get; set; } + public string VERSION { get; set; } + public List Sub { get; set; } } @@ -179,5 +184,7 @@ namespace Myshipping.Application.Job public long Id { get; set; } public string MBLNO { get; set; } + + public string VERSION { get; set; } } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 29e2a6b4..237160c5 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -11111,6 +11111,11 @@ 客服 + + + 提单信息 + + 服务项目 diff --git a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs index 459cfa14..8eb9de90 100644 --- a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs +++ b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs @@ -156,6 +156,10 @@ namespace Myshipping.Core.Service /// public string CUSTSERVICE { get; set; } /// + /// 提单信息 + /// + public string TIDANINFO { get; set; } + /// /// 服务项目 /// public string ServiceItem { get; set; } diff --git a/Myshipping.Report/Controllers/ReportController.cs b/Myshipping.Report/Controllers/ReportController.cs index 73682e78..a09ac03d 100644 --- a/Myshipping.Report/Controllers/ReportController.cs +++ b/Myshipping.Report/Controllers/ReportController.cs @@ -297,10 +297,10 @@ namespace Myshipping.Report.Controllers private string GetBookingJson(long bookingId) { log.Debug($"准备获取订舱数据:{bookingId}"); - var order = sqlSugarClient.Queryable().First(x => x.Id == bookingId); - var ctns = sqlSugarClient.Queryable().Where(x => x.BILLID == bookingId).ToList(); - var bookingEdi = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId); - var letterYard = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId); + var order = sqlSugarClient.Queryable().First(x => x.Id == bookingId && x.IsDeleted == false); + var ctns = sqlSugarClient.Queryable().Where(x => x.BILLID == bookingId && x.IsDeleted == false).ToList(); + var bookingEdi = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId && x.IsDeleted == false); + var letterYard = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId && x.IsDeleted == false); long uid = 0; if (!string.IsNullOrEmpty(order.OPID))