From a7b7d10c7187f0f21fc59bbd95dd1a9d2f340131 Mon Sep 17 00:00:00 2001
From: zhangxiaofeng <1939543722@qq.com>
Date: Mon, 13 May 2024 10:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=B1=E4=BD=8D=E5=8A=9F=E8=83=BD+=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/BookingSlot/BookingSlotService.cs       |  5 +++++
 .../Service/BookingSlot/Dto/BookingSlotBaseDto.cs   |  5 +++++
 .../BookingSlot/Dto/BookingSlotStockPageInput.cs    | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
index 386dd11f..a4d3c22a 100644
--- a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
+++ b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
@@ -803,6 +803,9 @@ namespace Myshipping.Application
              .WhereIF(!string.IsNullOrEmpty(input.VOYNO), u => u.VOYNO.Contains(input.VOYNO))
              .WhereIF(!string.IsNullOrEmpty(input.CARRIER), u => u.CARRIER.Contains(input.CARRIER))
              .WhereIF(!string.IsNullOrEmpty(input.CTN_STAT), u => u.CTN_STAT.Contains(input.CTN_STAT))
+             .WhereIF(!string.IsNullOrEmpty(input.PORTLOADID), u => u.PORTLOADID == input.PORTLOADID)
+             .WhereIF(!string.IsNullOrEmpty(input.PORTDISCHARGEID), u => u.PORTDISCHARGEID == input.PORTDISCHARGEID)
+             .WhereIF(!string.IsNullOrEmpty(input.PORTDISCHARGE_COUNTRY_CODE), u => u.PORTDISCHARGE_COUNTRY_CODE == input.PORTDISCHARGE_COUNTRY_CODE)
              .WhereIF(input.ETD_START.HasValue, u => u.ETD >= input.ETD_START.Value)
              .WhereIF(input.ETD_END.HasValue, u => u.ETD < input.ETD_END.Value.AddDays(1))
              .WhereIF(input.ETA_START.HasValue, u => u.ETA >= input.ETA_START.Value)
@@ -1146,6 +1149,8 @@ namespace Myshipping.Application
              .WhereIF(input.ETD_END.HasValue, u => u.ETD < input.ETD_END.Value.AddDays(1))
              .WhereIF(input.ETA_START.HasValue, u => u.ETA >= input.ETA_START.Value)
              .WhereIF(input.ETA_END.HasValue, u => u.ETA < input.ETA_END.Value.AddDays(1))
+             .WhereIF(input.STATUS == 1, u => !u.IS_CANCELLATION)
+             .WhereIF(input.STATUS == 2, u => u.IS_CANCELLATION)
              .ToPagedListAsync(input.PageNo, input.PageSize);
 
             var result = entities.Adapt<SqlSugarPagedList<BookingSlotBaseListOutput>>();
diff --git a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
index fd537ece..c7b727ca 100644
--- a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
+++ b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
@@ -100,6 +100,11 @@ namespace Myshipping.Application.Service.BookingSlot.Dto
         /// SI回执
         /// </summary>
         public string SI_RLT_STAT { get; set; }
+
+        /// <summary>
+        /// 舱位状态 0-全部 1-未取消 2:已取消
+        /// </summary>
+        public int STATUS { get; set; }
     }
 
     /// <summary>
diff --git a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotStockPageInput.cs b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotStockPageInput.cs
index 200e8b0e..28112f1c 100644
--- a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotStockPageInput.cs
+++ b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotStockPageInput.cs
@@ -47,7 +47,18 @@ namespace Myshipping.Application.Service.BookingSlot.Dto
         /// 箱型箱量
         /// </summary>
         public string CTN_STAT { get; set; }
-
+        /// <summary>
+        /// 装货港代码
+        /// </summary>
+        public string PORTLOADID { get; set; }
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        public string PORTDISCHARGEID { get; set; }
+        /// <summary>
+        /// 卸货港国家代码
+        /// </summary>
+        public string PORTDISCHARGE_COUNTRY_CODE { get; set; }
     }
 
     /// <summary>