Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

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

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

@@ -837,8 +837,19 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动
         /// </summary>
         public string LstShipOrderCompareMode { get; set; }
- 
+        /// <summary>
+        /// 业务来源代码
+        /// </summary>
+        public string SourceCode { get; set; }
 
+        /// <summary>
+        /// 业务来源名称
+        /// </summary>
+        public string SourceName { get; set; }
+        /// <summary>
+        /// 是否占舱
+        /// </summary>
+        public string ZhanCangFlag { get; set; }
 
         #region 船舶日期相关
         /// <summary>

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1748,7 +1748,7 @@ namespace Myshipping.Application
                             });
                             it.ATD = item.ATD;
                         }
-                        if (item.ATA != it.StartATA)
+                        if (it.StartATA != item.ATA)
                         {
                             ////添加booking日志
                             var bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
@@ -1767,7 +1767,7 @@ namespace Myshipping.Application
                                 OldValue = it.StartATA == null ? "" : it.StartATA.ToString(),
                                 NewValue = item.ATA == null ? "" : item.ATA.ToString(),
                             });
-                            it.StartATA = item.ATD;
+                            it.StartATA = item.ATA;
                         }
                         await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
 

Myshipping.Core/Entity/DJY/DjyTenantConfig.cs

@@ -21,5 +21,7 @@ namespace Myshipping.Core.Entity
         /// 配置数据json
         /// </summary>
         public string ConfigJson { get; set; }
+
+
     }
 }