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

Myshipping.Application/Job/HCDataCompareWorker.cs

@@ -60,11 +60,25 @@ namespace Myshipping.Application.Job
                 })
                 .ToList();
 
+            //获取分单，构建数据对象
+            var zhuIdList = listZhu.Select(x => x.Id).ToList();
+            var listFen = _repBooking.AsQueryable()
+                .Where(x => x.IsDeleted == false
+                && x.TenantId == tenantId
+                && x.ParentId != null
+                && zhuIdList.Contains(x.ParentId.Value))
+                .Select(x => new
+                {
+                    x.Id,
+                    x.MBLNO,
+                    x.ParentId
+                })
+                .ToList();
+
             foreach (var item in listZhu)
             {
-                item.Sub = _repBooking.AsQueryable()
-                    .Filter(null, true)
-                    .Where(x => x.IsDeleted == false && x.ParentId == item.Id)
+                item.Sub = listFen
+                    .Where(x => x.ParentId == item.Id)
                     .Select(x => new HCDataCompareSendSubModel
                     {
                         Id = x.Id,

Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs

@@ -1419,7 +1419,7 @@ namespace Myshipping.Application
                 if (model.ETD.HasValue)
                 {
                     _logger.LogInformation("批次={no} id={id} 更新截港日期 原：{date1} 变更为 {date2}", batchNo, bookingOrder.Id,
-                       bookingOrder.CLOSINGDATE, model.CYCutOffTime);
+                       bookingOrder.ETD, model.ETD);
 
                     bookingOrder.ETD = model.ETD;
                 }
@@ -1456,7 +1456,7 @@ namespace Myshipping.Application
                 bookingOrder.UpdatedUserId = UserManager.UserId;
                 bookingOrder.UpdatedUserName = UserManager.Name;
 
-                await _bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new
+                _bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new
                 {
                     it.UpdatedTime,
                     it.UpdatedUserId,
@@ -1468,7 +1468,7 @@ namespace Myshipping.Application
                     it.VESSEL,
                     it.VOYNO,
                     it.MBLNO
-                }).ExecuteCommandAsync();
+                }).ExecuteCommand();
 
                 _logger.LogInformation("批次={no} id={id} BC引入更新订舱完成", batchNo, bookingOrder.Id);