From b0da316c4d7f223ea473f0ed1960994bbafcc1f0 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 7 May 2024 08:50:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BC=E4=BB=BB=E5=8A=A1=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/TaskManagePlat/TaskBCInfo.cs | 35 ++++++++++ .../TaskManagePlat/TaskManageBCService.cs | 67 ++++++++++++++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskBCInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskBCInfo.cs index 6ddc2ab6..250ca383 100644 --- a/Myshipping.Application/Entity/TaskManagePlat/TaskBCInfo.cs +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskBCInfo.cs @@ -356,5 +356,40 @@ namespace Myshipping.Application /// 客户样单截止日期 /// public Nullable CUSTOM_SI_CUT_DATE { get; set; } + + /// + /// 是否自动转发邮件 1-是 0-否 + /// + public bool IS_SET_AUTO_EMAIL { get; set; } + + /// + /// 是否已发送邮件 1-已发送 0-未发送 + /// + public bool IS_SEND_EMAIL { get; set; } + + /// + /// 比对差异数量 + /// + public Nullable DIFF_NUM { get; set; } + + /// + /// 邮件接收人 + /// + public string AUTO_SEND_USER { get; set; } + + /// + /// 处理状态 TEMP-待处理，SUCC-处理成功，FAILURE-失败 + /// + public string PROCESS_STATUS { get; set; } + + /// + /// 处理结果 + /// + public string PROCESS_RESULT { get; set; } + + /// + /// 处理时间 + /// + public Nullable PROCESS_DATE { get; set; } } } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs index 3f2fb0e4..c95b21a0 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs @@ -828,6 +828,10 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { @@ -836,7 +840,11 @@ namespace Myshipping.Application it.UpdatedUserId, it.UpdatedUserName, it.RealUserId, - it.RealUserName + it.RealUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -845,12 +853,20 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { it.UpdatedTime, it.UpdatedUserId, - it.UpdatedUserName + it.UpdatedUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -955,6 +971,10 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { @@ -963,7 +983,11 @@ namespace Myshipping.Application it.UpdatedUserId, it.UpdatedUserName, it.RealUserId, - it.RealUserName + it.RealUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -972,12 +996,20 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { it.UpdatedTime, it.UpdatedUserId, - it.UpdatedUserName + it.UpdatedUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -1104,6 +1136,10 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { @@ -1112,7 +1148,11 @@ namespace Myshipping.Application it.UpdatedUserId, it.UpdatedUserName, it.RealUserId, - it.RealUserName + it.RealUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -1121,12 +1161,20 @@ namespace Myshipping.Application taskEntity.UpdatedTime = DateTime.Now; taskEntity.UpdatedUserId = UserManager.UserId; taskEntity.UpdatedUserName = UserManager.Name; + taskEntity.IS_COMPLETE = 1; + taskEntity.COMPLETE_DATE = DateTime.Now; + taskEntity.COMPLETE_DEAL = "MANUAL"; + taskEntity.COMPLETE_DEAL = "手工"; await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new { it.UpdatedTime, it.UpdatedUserId, - it.UpdatedUserName + it.UpdatedUserName, + it.IS_COMPLETE, + it.COMPLETE_DATE, + it.COMPLETE_DEAL, + it.COMPLETE_DEAL_NAME }).ExecuteCommandAsync(); } @@ -1146,7 +1194,7 @@ namespace Myshipping.Application } } - result.succ = true; + result.succ = true; result.msg = "成功"; } catch (Exception ex) @@ -1788,7 +1836,10 @@ namespace Myshipping.Application _logger.LogInformation($"推送邮件完成，结果：{JSON.Serialize(emailRlt)}"); - if(emailRlt.succ) + //var taskBcInfo = _taskBCInfoRepository.AsQueryable().Filter(null, true) + //.First(a => a.PK_ID == taskBCInfo.PK_ID); + + if (emailRlt.succ) { result.succ = true; result.msg = "成功";