From 9d7308c48aed7686accc855405fd7e532bdef6ef Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Tue, 30 May 2023 17:57:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=B1=E5=9E=8B?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TaskManagePlat/Interface/ITaskManageService.cs | 7 +++++++
 .../Service/CommomDBPage/CommonDBPageService.cs            | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
index fe58f9c5..b26147cf 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
@@ -268,5 +268,12 @@ namespace Myshipping.Application
         /// <param name="model">请求LARA纸详情</param>
         /// <returns>返回结果</returns>
         Task<List<LaraPaperRegistPostDto>> CalcLaraPageNumbers(CalcLaraPageNumbersDto model);
+
+        /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        /// <param name="queryTaskManageDto">查询条件</param>
+        /// <returns>返回结果</returns>
+        //Task<List<TaskBaseInfoDto>> GetTaskList(QueryTaskManageDto queryTaskManageDto);
     }
 }
diff --git a/Myshipping.Core/Service/CommomDBPage/CommonDBPageService.cs b/Myshipping.Core/Service/CommomDBPage/CommonDBPageService.cs
index df21f5b9..be35f586 100644
--- a/Myshipping.Core/Service/CommomDBPage/CommonDBPageService.cs
+++ b/Myshipping.Core/Service/CommomDBPage/CommonDBPageService.cs
@@ -351,7 +351,11 @@ public class CommonDBPageService : IDynamicApiController, ITransient
          
        return await _mappingCtnRep.AsQueryable().Where(x => x.Module == input.Module)
             .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
-             || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)).OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort)).ToPagedListAsync(input.PageNo, input.PageSize);
+             || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) 
+             || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+             || x.Remark.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase))
+            
+            .OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort)).ToPagedListAsync(input.PageNo, input.PageSize);
 
     }
 

From 9eceaa7d1d52f25099f163abde0ded318fafe9ab Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Wed, 31 May 2023 10:00:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=B1=E4=BD=BF?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Entity/BookingOrder.cs                | 5 +++++
 .../Service/BookingOrder/Dto/BookingOrderDto.cs              | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs
index 5c1ef4b0..4890d53e 100644
--- a/Myshipping.Application/Entity/BookingOrder.cs
+++ b/Myshipping.Application/Entity/BookingOrder.cs
@@ -954,5 +954,10 @@ namespace Myshipping.Application.Entity
         public DateTime? ATA { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
index bfddc5d0..dca831e2 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
@@ -783,5 +783,10 @@ namespace Myshipping.Application
         public DateTime? ATA { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
     }
 }