From 05e7933ad8ee8f0c08eefcbe1d157ea50b7eaefc Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Tue, 23 Apr 2024 09:21:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=9D=E5=AD=98EDI=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 1468b1fa..c17c6abd 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -6655,6 +6655,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) { From 10a8d21a9a0d4d0820152c91095b9b6d36ddd378 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 23 Apr 2024 09:56:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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]" From e91dbdedfed614b7f89b20c6dffe6b0a1d7082d4 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 23 Apr 2024 10:42:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventSubscriber/CompanyUserSyncSubscriber.cs | 8 ++++++++ 1 file changed, 8 insertions(+) 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)); + } } } }