diff --git a/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs index 73d63d27..840d675c 100644 --- a/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs @@ -74,5 +74,8 @@ namespace Myshipping.Application Task SetGoodsStatus(string code, long bookingId); Task SaveLog(BookingOrder newOrder, BookingOrder oldOrder); + + + Task AutoYardData(long bookId); } } \ No newline at end of file diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs index 5b515296..d545431a 100644 --- a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs +++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs @@ -262,7 +262,6 @@ namespace Myshipping.Application var key = _webAccountConfig.GetAccountConfig("DjyCangDan", UserManager.UserId).Result; if (key == null) { - throw Oops.Bah("当前用户未配置key,请联系管理员"); } var dicUrl = _cache.GetAllDictData().Result.First(x => x.TypeCode == "url_set" && x.Code == "request_emf"); @@ -283,7 +282,7 @@ namespace Myshipping.Application { throw Oops.Bah(BookingErrorCode.BOOK127); } - + MDATA mDATA = new MDATA(); List CTNDATA = new List(); @@ -398,13 +397,6 @@ namespace Myshipping.Application } } - - - - - - - } } #endregion @@ -458,11 +450,7 @@ namespace Myshipping.Application if (input.Id == 0) { - - await _repTemplate.InsertAsync(entity); - - } else { @@ -476,9 +464,6 @@ namespace Myshipping.Application it.IsDeleted }).ExecuteCommandAsync(); } - - - } diff --git a/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs b/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs index 7cdf6ab3..fcf850be 100644 --- a/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs +++ b/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs @@ -214,6 +214,7 @@ namespace Myshipping.Application BookingStatusLogDetail.OPTime = dt.TiXiangShiJian; await _statuslogdetail.InsertAsync(BookingStatusLogDetail); } + await _bookingorderservice.AutoYardData(bookingId); } if (xl > 0 && fcnum > 0) diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index 9a717b88..d870bea4 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -161,13 +161,10 @@ namespace Myshipping.Application { throw Oops.Bah("等级为R1/R2,客服必填"); - } entity.PropString = entity.PropString.Replace("forwarder", "booking_agent"); if (m == null) { - - entity.TenantId = UserManager.TENANT_ID; await _djycustomer.InsertAsync(entity); foreach (var item in model.ContactList) @@ -193,13 +190,11 @@ namespace Myshipping.Application } else { - ship.Code = entity.CodeName; ship.Name = entity.ShortName; ship.ModifyTime = DateTime.Now; ship.ModifyUser = UserManager.DjyUserId; await _codeForwarder.UpdateAsync(ship); - } await _commonDBService.GetAllForwarder(false); } @@ -2107,7 +2102,7 @@ namespace Myshipping.Application bookingStatusLog.MBLNO = item.MBLNO; await _repStatuslog.InsertAsync(bookingStatusLog); - + if (item.detail != null && item.detail.Count > 0) { foreach (var dt in item.detail) @@ -2119,6 +2114,14 @@ namespace Myshipping.Application BookingStatusLogDetail.OPTime = dt.OPTime; await _statuslogdetail.InsertAsync(BookingStatusLogDetail); } + + + + } + + if (item.Status == "提箱") + { + await _bookingorderservice.AutoYardData(item.BookingId); } #endregion @@ -2355,6 +2358,8 @@ namespace Myshipping.Application } } #endregion + + } if (flag) {