From 4e8be502cb704190051c1855b764d25081fd18b9 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 5 Jul 2024 16:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MSK=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 1 + .../BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index 6953821c..17dd68e4 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -1436,6 +1436,7 @@ namespace Myshipping.Application.Service.BookingOrder .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.BOOKING_CHANNEL_TYPE == QuerySearch.BookingChannelType) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalCurrency), t => t.SHIP_RATE_TOTAL_CURRENCY == QuerySearch.TotalCurrency) + .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.Carrier), t => t.CARRIERID.Equals(QuerySearch.Carrier)) .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)) diff --git a/Myshipping.Application/Service/BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs index a3c8639e..956cf639 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs @@ -172,5 +172,10 @@ namespace Myshipping.Application /// 预估币别 /// public string TotalCurrency { get; set; } + + /// + /// 船公司 + /// + public string Carrier { get; set; } } }