From 70833b58315c56ef4a60eb2fcb58c801cb5bf8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Wed, 14 Aug 2024 15:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E4=BB=B6=E4=BA=BA=E4=BB=8E=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskInteraction}/MailTemplateModel.cs | 7 ++++++- .../Booking/MailActionExecutor.cs | 4 ++-- .../IncomingNotificationAction.cs | 4 ++-- .../Op/Method/TaskInteraction/MailService.cs | 20 +++++++++---------- 4 files changed, 19 insertions(+), 16 deletions(-) rename ds-wms-service/{DS.Module.Core/Data => DS.WMS.Core/Op/Entity/TaskInteraction}/MailTemplateModel.cs (91%) diff --git a/ds-wms-service/DS.Module.Core/Data/MailTemplateModel.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/MailTemplateModel.cs similarity index 91% rename from ds-wms-service/DS.Module.Core/Data/MailTemplateModel.cs rename to ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/MailTemplateModel.cs index a6cc4773..e2ee0ef2 100644 --- a/ds-wms-service/DS.Module.Core/Data/MailTemplateModel.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/MailTemplateModel.cs @@ -1,6 +1,6 @@ using System.Dynamic; -namespace DS.Module.Core.Data +namespace DS.WMS.Core.Op.Entity { /// /// 邮件模板模型 @@ -12,6 +12,11 @@ namespace DS.Module.Core.Data /// public long BusinessId { get; set; } + /// + /// 业务ID + /// + public BusinessType BusinessType { get; set; } = BusinessType.OceanShippingExport; + /// /// 发送附件 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/Booking/MailActionExecutor.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/Booking/MailActionExecutor.cs index e72d4346..8456af88 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/Booking/MailActionExecutor.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/Booking/MailActionExecutor.cs @@ -1,6 +1,6 @@ -using DS.Module.Core.Data; -using DS.WMS.Core.Op.Dtos; +using DS.WMS.Core.Op.Dtos; using DS.WMS.Core.Op.Dtos.TaskInteraction; +using DS.WMS.Core.Op.Entity; using DS.WMS.Core.Op.Entity.TaskInteraction; using DS.WMS.Core.Op.Interface; using DS.WMS.Core.Op.Interface.TaskInteraction; diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/SpaceRelease/IncomingNotificationAction.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/SpaceRelease/IncomingNotificationAction.cs index aa128be6..1f0e5209 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/SpaceRelease/IncomingNotificationAction.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/SpaceRelease/IncomingNotificationAction.cs @@ -1,6 +1,6 @@ -using DS.Module.Core.Data; -using DS.WMS.Core.Op.Dtos; +using DS.WMS.Core.Op.Dtos; using DS.WMS.Core.Op.Dtos.TaskInteraction; +using DS.WMS.Core.Op.Entity; using DS.WMS.Core.Op.Entity.TaskInteraction; using DS.WMS.Core.Op.Interface; using DS.WMS.Core.Op.Interface.TaskInteraction; diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/MailService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/MailService.cs index 588f6396..07b4fedd 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/MailService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/MailService.cs @@ -3,7 +3,6 @@ using DS.Module.Core; using DS.Module.Core.Data; using DS.Module.PrintModule; using DS.WMS.Core.Code.Entity; -using DS.WMS.Core.Info.Entity; using DS.WMS.Core.Op.Dtos.TaskInteraction; using DS.WMS.Core.Op.Entity; using DS.WMS.Core.Op.Entity.TaskInteraction; @@ -15,8 +14,6 @@ using Masuit.Tools; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; -using NPOI.HPSF; -using Org.BouncyCastle.Utilities; using RazorEngineCore; namespace DS.WMS.Core.Op.Method.TaskInteraction @@ -149,24 +146,25 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction ccList = await Db.Queryable().Where(x => ccIds.Contains(x.Id)).Select(x => x.Email).ToListAsync(); //设置收件人 - List receiverIds = []; + List receiverTypes = []; if (mailConfig.Receiver.IsCarrier) - receiverIds.Add(order.CarrierId); + receiverTypes.Add("carrier"); if (mailConfig.Receiver.IsBooking) - receiverIds.Add(order.ForwarderId); + receiverTypes.Add("booking"); if (mailConfig.Receiver.IsYard) - receiverIds.Add(order.YardId); + receiverTypes.Add("yard"); if (mailConfig.Receiver.IsTruck) - receiverIds.Add(order.TruckerId); + receiverTypes.Add("truck"); if (mailConfig.Receiver.IsController) - receiverIds.Add(order.CustomerId); + receiverTypes.Add("controller"); - var receiverList = await TenantDb.Queryable().Where(x => receiverIds.Contains(x.Id) && x.Email != null && x.Email != string.Empty) - .Select(x => new { x.ShortName, x.EnShortName, x.Email }).ToListAsync(); + var receiverList = await TenantDb.Queryable().Where(x => receiverTypes.Contains(x.CustomerType) + && x.Email != null && x.Email != string.Empty && x.BusinessId == templateModel.BusinessId && x.BusinessType == templateModel.BusinessType) + .Select(x => new { x.Name, x.Email }).ToListAsync(); var attachmentList = mailConfig.Attachments == null ? [] : new List>(mailConfig.Attachments.Count); try