1

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -345,6 +345,7 @@ namespace Myshipping.Application
                  .WhereIF(!string.IsNullOrWhiteSpace(input.FREIGHTPAYER), u => u.FREIGHTPAYER.Contains(input.FREIGHTPAYER))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.DZRemark), u => u.DZRemark.Contains(input.DZRemark))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.CZRemark), u => u.CZRemark.Contains(input.CZRemark))
+                 .WhereIF(!string.IsNullOrWhiteSpace(input.ZhanCangFlag), u => u.ZhanCangFlag==input.ZhanCangFlag)
                  .WhereIF(userlist != null && userlist.Count() > 0, u => userlist.Contains((long)u.CreatedUserId) || UserManager.UserId.ToString() == u.ROUTEID || UserManager.Name.ToString() == u.ROUTE || UserManager.UserId.ToString() == u.SALEID || UserManager.Name.ToString() == u.SALE || UserManager.UserId.ToString() == u.OPID || UserManager.Name.ToString() == u.OP || UserManager.UserId.ToString() == u.DOCID || UserManager.Name.ToString() == u.DOC || UserManager.UserId.ToString() == u.CUSTSERVICEID || UserManager.Name.ToString() == u.CUSTSERVICE)
                  .OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort))
                  .ToPagedListAsync(input.PageNo, input.PageSize);

Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs

@@ -818,6 +818,11 @@ namespace Myshipping.Application
         /// 操作备注
         /// </summary>
         public string CZRemark { get; set; }
+
+        /// <summary>
+        /// 是否占舱
+        /// </summary>
+        public string ZhanCangFlag { get; set; }
     }
 
     public class AddBookingOrderInput : BookingOrderDto