From 670c863b9f77afd432c54ddcbef6202302fb782a Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Wed, 18 Jan 2023 11:36:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8D=95=E4=BF=A1=E6=81=AFedi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 10 +++++++--- .../Service/BookingOrder/Dto/BookingOrderDto.cs | 2 +- .../Service/DataSync/DataSyncService.cs | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 0cd8d1a5..c9ebab74 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -321,7 +321,6 @@ namespace Myshipping.Application return list; } - [HttpPost("/BookingOrder/AddOrUpdate")] public async Task AddOrUpdate(BookingOrderDto Dto) { @@ -671,10 +670,15 @@ namespace Myshipping.Application var ctndetaillist = await _ctndetailrep.AsQueryable().Where(x => x.CTNID == it.Id).ToListAsync(); it.ctnDetailInputs = ctndetaillist.Adapt>(); } - item.ctnInputs = ctninput; - } + //检索EDI扩展 + var ediExt = _bookingEDIExt.FirstOrDefault(u => u.BookingId == item.Id); + if (ediExt != null) + { + item.BookingEDIExt = ediExt.Adapt(); + } + } ordOut.HbList = HbList; } diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs index 576ee55b..034c48b3 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs @@ -8,7 +8,7 @@ namespace Myshipping.Application /// /// 订舱主表输出参数 /// - public class BookingOrderDto + public class BookingOrderDto { /// /// 主键 diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index 1ad2cc87..af63ddc1 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -79,7 +79,7 @@ namespace Myshipping.Application /// /// 同步客户 /// - /// + /// 参数 /// [HttpPost("/DataSync/SyncCustomer"), ApiUser(ApiCode = "SyncCustomer")] public async Task SyncCustomer(DjyCustomerSyncDto model) @@ -620,9 +620,6 @@ namespace Myshipping.Application } - - - #endregion #region 下载数据