chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

Browse Source
dev
cjy 1 month ago
parent e465dacee9 3cd2aaafe0
commit 7bc6495785
5 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs
Unescape Escape View File

@ -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("未能找到任务")]

11
ds-wms-service/DS.WMS.Core/HangfireJob/Method/WSLReportJobService.cs
Unescape Escape View File

@ -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" + "<br/>" + "Pls kindly check the daily report for your member's nomination booking:",
//ShowName = "",
Body = @"<article class='4ever-article'>
<p style='line-height: 1;'>Dear WSL Team,</p>
<p style='line-height: 1;'>Pls kindly check the daily report for your member's nomination booking:&nbsp;</p>
<p style='line-height: 1;'>&nbsp;</p>
<p style='line-height: 1;'>Thanks &amp; Best regards</p>
<p style='line-height: 1;'>Candy SHAO 邵芳</p>
<p style='line-height: 1;'>General Manager| <strong><span style='color: #e67e23;'>SUNNINESS LOGISTICS CO.,LTD.</span></strong></p>
<p style='line-height: 1;'>TEL: +(86) (0532-80688387)1 MB./We chat: +(86)(18866622731) | QQ:2853083553|Email:candy@sunniness. net |WCA ID: 60272</p>
</article>",
Account = config["TaskMail:DefaultSetting:Account"],
Password = config["TaskMail:DefaultSetting:Password"],
Server = config["TaskMail:DefaultSetting:Host"],

2
ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs
Unescape Escape View File

@ -247,7 +247,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
var businessTask = await TenantDb.Queryable<BusinessTask>().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<string, object>
{

15
ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
Unescape Escape View File

@ -185,6 +185,21 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
/// <returns></returns>
public async Task<DataResult> CreateTaskAsync(TaskCreationRequest request, bool useTransaction = true)
{
//if (request.BusinessType.HasValue)
//{
// bool isBizValid = false;
// switch (request.BusinessType.Value)
// {
// case BusinessType.OceanShippingExport:
// isBizValid = await TenantDb.Queryable<SeaExport>().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));

3
ds-wms-service/DS.WMS.OpApi/appsettings.json
Unescape Escape View File

@ -119,7 +119,8 @@
"Host": "smtp.mxhichina.com",
"Port": 465,
"UseSSL": true,
"Receivers": "daisusu@dongshengsoft.com"
"Receivers": "daisusu@dongshengsoft.com",
"Content" : ""
}
},
"FeeService": {

Write Preview
Loading…
Cancel
Save