diff --git a/Myshipping.Application/Event/BookingSyncSubscriber.cs b/Myshipping.Application/Event/BookingSyncSubscriber.cs index f2e8b444..93a283e7 100644 --- a/Myshipping.Application/Event/BookingSyncSubscriber.cs +++ b/Myshipping.Application/Event/BookingSyncSubscriber.cs @@ -14,6 +14,7 @@ using Myshipping.Core.Entity; using Myshipping.Core.Service; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using NPOI.XWPF.UserModel; using System; using System.Collections.Generic; using System.IO; @@ -526,7 +527,9 @@ namespace Myshipping.Application.Event //订舱编号和客户端BSNO ord.BSNO = item.GetStringValue("orderId"); ord.CUSTNO = item.GetStringValue("custNO"); - await repoOrder.AsUpdateable(ord).UpdateColumns(x => new { x.BSNO, x.CUSTNO }).ExecuteCommandAsync(); + ord.CUSTOMERNAME = custOrder.BookingTenantName; + ord.LANENAME = ord.LANECODE; + await repoOrder.AsUpdateable(ord).UpdateColumns(x => new { x.BSNO, x.CUSTOMERNAME, x.LANENAME }).ExecuteCommandAsync(); _logger.LogInformation($"生成了订舱台账数据 {ord.Id}"); diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index 5a04e335..49a08ddf 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -2373,7 +2373,9 @@ namespace Myshipping.Application var bkOrder = await CustomerToOrder(model); bkOrder.BSNO = custBookId; - await _repOrder.AsUpdateable(bkOrder).UpdateColumns(x => new { x.BSNO }).ExecuteCommandAsync(); + bkOrder.CUSTOMERNAME = model.BookingTenantName; + bkOrder.LANENAME = bkOrder.LANECODE; + await _repOrder.AsUpdateable(bkOrder).UpdateColumns(x => new { x.BSNO, x.CUSTOMERNAME, x.LANENAME }).ExecuteCommandAsync(); model.BookingId = bkOrder.Id; //客户订舱数据与订舱台账数据关联 await _rep.UpdateAsync(model); diff --git a/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs b/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs index 787447c9..9421227a 100644 --- a/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs +++ b/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs @@ -36,7 +36,7 @@ namespace Myshipping.Core.Service [HttpGet("/DjyApiAuth/page")] public async Task Page([FromQuery] QueryDjyApiAuthInput input) { - var entities = await _rep.AsQueryable() + var entities = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false) .WhereIF(!string.IsNullOrWhiteSpace(input.ApiCode), u => u.ApiCode.Contains(input.ApiCode)) .WhereIF(!string.IsNullOrWhiteSpace(input.ApiName), u => u.ApiName.Contains(input.ApiName)) .WhereIF(!string.IsNullOrWhiteSpace(input.TenantName), u => u.TenantName == input.TenantName)