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 + + /// + /// 申请箱使 + /// + 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 + + /// + /// 申请箱使 + /// + public string ShenQingXiangShi { get; set; } } } 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 /// 请求LARA纸详情 /// 返回结果 Task> CalcLaraPageNumbers(CalcLaraPageNumbersDto model); + + /// + /// 获取任务列表 + /// + /// 查询条件 + /// 返回结果 + //Task> 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); }