diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index a029fa31..77d87372 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -6657,6 +6657,15 @@ namespace Myshipping.Application { row.CreateCell(1).SetCellValue(edi.EmcNameAccount); } + ICell _cell = row.GetCell(4); + if (_cell != null) + { + row.Cells[4].SetCellValue(edi.EmcNameAccount); + } + else + { + row.CreateCell(4).SetCellValue(edi.EmcNameAccount); + } } if (i == 47) { diff --git a/Myshipping.Core/EventSubscriber/CompanyUserSyncSubscriber.cs b/Myshipping.Core/EventSubscriber/CompanyUserSyncSubscriber.cs index 7b3cb851..9c091bf0 100644 --- a/Myshipping.Core/EventSubscriber/CompanyUserSyncSubscriber.cs +++ b/Myshipping.Core/EventSubscriber/CompanyUserSyncSubscriber.cs @@ -338,6 +338,14 @@ namespace Myshipping.Core user.Password = DESCEncryption.Encrypt("123456", keyDES); await repoUser.UpdateAsync(user); + + + //客户端用户信息同步给运营端往来单位 + if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_CUST) + { + var evtPub = App.GetService(); + await evtPub.PublishAsync(new ChannelEventSource($"DjySync:TenantUserToCustomer", tenant.Id)); + } } } } diff --git a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs index de1a9f95..f758cd80 100644 --- a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs +++ b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs @@ -17,6 +17,7 @@ using NPOI.Util; using StackExchange.Profiling.Internal; using Microsoft.AspNetCore.Authorization; using static NPOI.HSSF.Util.HSSFColor; +using TinyPinyin; namespace Myshipping.Core.Service { @@ -399,7 +400,7 @@ namespace Myshipping.Core.Service FullName = dto.Name, Email = dto.Email, Tel = dto.Phone, - CodeName = "", + CodeName = PinyinHelper.GetPinyinInitials(shortName), ShortName = shortName, DjyGid = dto.DjyGid, PropString = "[consignor]"