111

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -341,6 +341,8 @@ namespace Myshipping.Application
                  .WhereIF(!string.IsNullOrWhiteSpace(input.ShippingMethod), u => u.ShippingMethod.Contains(input.ShippingMethod))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.CreatedUserName), u => u.CreatedUserName.Contains(input.CreatedUserName))
                  .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(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

@@ -807,6 +807,14 @@ namespace Myshipping.Application
         /// 航线管理ID
         /// </summary>
         public string LineManageID { get; set; }
+        /// <summary>
+        /// 单证备注
+        /// </summary>
+        public string DZRemark { get; set; }
+        /// <summary>
+        /// 操作备注
+        /// </summary>
+        public string CZRemark { get; set; }
     }
 
     public class AddBookingOrderInput : BookingOrderDto

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1526,7 +1526,7 @@ namespace Myshipping.Application
         public async Task<dynamic> GetSyncVesselDate()
         {
 
-            var list = await _vesselinfo.AsQueryable().Filter(null, true).Where(x => (x.ETD == null || x.ETA == null || x.ATD == null) && x.TenantId == UserManager.TENANT_ID && (x.Voyno != null && x.Voyno != "")).Select(x => new
+            var list = await _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.ATD == null && x.TenantId == UserManager.TENANT_ID && (x.Voyno != null && x.Voyno != "")).Select(x => new
             {
                 Vessel = x.Vessel,
                 Voyno = x.Voyno,