From c942cf081772667d1ec0592a20f17795b04e36a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Mon, 14 Oct 2024 15:26:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?WSL=E6=8A=A5=E8=A1=A8=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E6=AD=A3=E6=96=87=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HangfireJob/Method/WSLReportJobService.cs | 11 +++++++++-- .../Op/Method/TaskInteraction/ActionManagerService.cs | 2 +- ds-wms-service/DS.WMS.OpApi/appsettings.json | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/WSLReportJobService.cs b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/WSLReportJobService.cs index b28ba2bc..04cfe254 100644 --- a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/WSLReportJobService.cs +++ b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/WSLReportJobService.cs @@ -130,8 +130,15 @@ namespace DS.WMS.Core.HangfireJob.Method { SendTo = config["TaskMail:DefaultSetting:Receivers"], Title = "WSL Volume Daily Increase Report", - Body = "Dear WSL Team" + "
" + "Pls kindly check the daily report for your member's nomination booking:", - //ShowName = "", + Body = @"
+

Dear WSL Team,

+

Pls kindly check the daily report for your member's nomination booking: 

+

 

+

Thanks & Best regards

+

Candy SHAO 邵芳

+

General Manager| SUNNINESS LOGISTICS CO.,LTD.

+

TEL: +(86) (0532-80688387)1 MB./We chat: +(86)(18866622731) | QQ:2853083553|Email:candy@sunniness. net |WCA ID: 60272

+
", Account = config["TaskMail:DefaultSetting:Account"], Password = config["TaskMail:DefaultSetting:Password"], Server = config["TaskMail:DefaultSetting:Host"], diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs index 47b80a75..0972f396 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs @@ -247,7 +247,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction var businessTask = await TenantDb.Queryable().Where( x => x.BusinessId == businessId && x.BusinessType == businessType && x.TaskType == TaskBaseTypeEnum.WAIT_BOOKING).FirstAsync(); if (businessTask == null) - return DataResult.FailedWithDesc(MultiLanguageConst.BookingTaskNotFound); + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.BookingTaskNotFound)); var dic = new Dictionary { diff --git a/ds-wms-service/DS.WMS.OpApi/appsettings.json b/ds-wms-service/DS.WMS.OpApi/appsettings.json index d031cf89..f86ebc6e 100644 --- a/ds-wms-service/DS.WMS.OpApi/appsettings.json +++ b/ds-wms-service/DS.WMS.OpApi/appsettings.json @@ -119,7 +119,8 @@ "Host": "smtp.mxhichina.com", "Port": 465, "UseSSL": true, - "Receivers": "daisusu@dongshengsoft.com" + "Receivers": "daisusu@dongshengsoft.com", + "Content" : "" } }, "FeeService": { From 3cd2aaafe0bb321b0998caa6451dfb9aac84b03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Mon, 14 Oct 2024 15:57:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Constants/MultiLanguageConst.cs | 2 ++ .../Op/Method/TaskInteraction/TaskService.cs | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs b/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs index bc4083b6..8d66e7a6 100644 --- a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs +++ b/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs @@ -1516,6 +1516,8 @@ public static class MultiLanguageConst #endregion #region 关联任务 + [Description("传入的业务信息无效，请确保业务状态正确或未被删除")] + public const string Biz_Not_Valid = "Biz_Not_Valid"; [Description("此任务已存在，请勿重复提交")] public const string TaskExists = "Task_Exists"; [Description("未能找到任务")] diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs index 1e39cf4a..800c84a1 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs @@ -185,6 +185,21 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction /// public async Task CreateTaskAsync(TaskCreationRequest request, bool useTransaction = true) { + //if (request.BusinessType.HasValue) + //{ + // bool isBizValid = false; + // switch (request.BusinessType.Value) + // { + // case BusinessType.OceanShippingExport: + // isBizValid = await TenantDb.Queryable().AnyAsync(x => x.Id == request.BusinessId); + // break; + // } + + // if (!isBizValid) + // return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Biz_Not_Valid)); + //} + + if (!await HasAuthorizedAsync()) return DataResult.FailedWithDesc(nameof(MultiLanguageConst.ModuleUnauthorized));