diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 9a7d616b..84314403 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -354,7 +354,7 @@ namespace Myshipping.Application Select((goods, config) => new { bookingid = goods.bookingId, - ConfigId = config.Id, + ConfigId = goods.ConfigId, SystemCode = config.SystemCode, StatusName = config.StatusName, FinishTime = goods.FinishTime, diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index 04514ff5..d763a6bb 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -57,14 +57,14 @@ namespace Myshipping.Application private readonly SqlSugarRepository _goodsStatus; private readonly SqlSugarRepository _goodsStatusConfig; private readonly SqlSugarRepository _repline; - + private readonly SqlSugarRepository _mapcarrier; public DataSyncService(ILogger logger, ISysCacheService cache, SqlSugarRepository rep, SqlSugarRepository repCtn, SqlSugarRepository repUser, SqlSugarRepository repTenant, SqlSugarRepository djycustomer, SqlSugarRepository djycustomercontact, SqlSugarRepository vesselinfo, SqlSugarRepository ctndetailrep , SqlSugarRepository bookingEDIExt, SqlSugarRepository bookinglog, SqlSugarRepository bookinglogdetail, SqlSugarRepository goodsStatus, SqlSugarRepository goodsStatusConfig, SqlSugarRepository repline, - SqlSugarRepository bookingremark) + SqlSugarRepository bookingremark, SqlSugarRepository mapcarrier) { this._logger = logger; this._rep = rep; @@ -83,6 +83,7 @@ namespace Myshipping.Application this._goodsStatus = goodsStatus; this._goodsStatusConfig = goodsStatusConfig; this._repline = repline; + this._mapcarrier = mapcarrier; } @@ -115,7 +116,10 @@ namespace Myshipping.Application else { entity.Id = m.Id; - await _djycustomer.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + await _djycustomer.AsUpdateable(entity).IgnoreColumns(it => new + { + it.TIDANINFO + }).ExecuteCommandAsync(); await _djycustomercontact.DeleteAsync(x => x.CustomerId == entity.Id); foreach (var item in model.ContactList) { @@ -160,7 +164,10 @@ namespace Myshipping.Application else { entity.Id = m.Id; - await _djycustomer.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + await _djycustomer.AsUpdateable(entity).IgnoreColumns(it => new + { + it.TIDANINFO + }).ExecuteCommandAsync(); await _djycustomercontact.DeleteAsync(x => x.CustomerId == entity.Id); foreach (var it in item.ContactList) {