|
|
|
@ -351,7 +351,7 @@ namespace Myshipping.Application.Service.BookingOrder
|
|
|
|
|
//ETD
|
|
|
|
|
if (b.departureDateTime.HasValue)
|
|
|
|
|
{
|
|
|
|
|
showDto.ETD = b.departureDateTime.Value;
|
|
|
|
|
leg.ETD = b.departureDateTime.Value;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -361,7 +361,7 @@ namespace Myshipping.Application.Service.BookingOrder
|
|
|
|
|
//ETA
|
|
|
|
|
if (b.arrivalDateTime.HasValue)
|
|
|
|
|
{
|
|
|
|
|
showDto.ETA = b.arrivalDateTime.Value;
|
|
|
|
|
leg.ETA = b.arrivalDateTime.Value;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -1434,7 +1434,8 @@ namespace Myshipping.Application.Service.BookingOrder
|
|
|
|
|
.WhereIF(jobEnd != DateTime.MinValue, t => t.JOB_TIME.HasValue && t.JOB_TIME.Value < jobEnd)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalAmountStart), t => t.SHIP_RATE_TOTAL_AMOUNT != null && t.SHIP_RATE_TOTAL_AMOUNT.Value >= decimal.Parse(QuerySearch.TotalAmountStart))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalAmountEnd), t => t.SHIP_RATE_TOTAL_AMOUNT != null && t.SHIP_RATE_TOTAL_AMOUNT.Value <= decimal.Parse(QuerySearch.TotalAmountEnd))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingChannelType), t => t.SHIP_RATE_TOTAL_CURRENCY == QuerySearch.TotalCurrency)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingChannelType), t => t.BOOKING_CHANNEL_TYPE == QuerySearch.BookingChannelType)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalCurrency), t => t.SHIP_RATE_TOTAL_CURRENCY == QuerySearch.TotalCurrency)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.PriceReference), t => t.PRICE_REFERENCE.Contains(QuerySearch.PriceReference))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookedByCompanyName), t => t.BOOKEDBY_COMPANY_NAME.Contains(QuerySearch.BookedByCompanyName))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookedByCompanyPartyCode), t => t.BOOKEDBY_COMPANY_PARTYCODE.Contains(QuerySearch.BookedByCompanyPartyCode))
|
|
|
|
|