diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskChangeShipResultDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskChangeShipResultDto.cs index 2fe8c358..1f671d2a 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskChangeShipResultDto.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskChangeShipResultDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -50,6 +51,20 @@ namespace Myshipping.Application /// public string MailUrl { get; set; } + /// + /// 提单号 + /// + public string MBlNo { get; set; } + + /// + /// 原始船名 + /// + public string OriginalVessel { get; set; } + /// + /// 原始航次 + /// + public string OriginalVoyno { get; set; } + /// /// 相同主单未处理任务合计 /// diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 6d637277..3c986abd 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -27,6 +27,7 @@ using Npoi.Mapper; using NPOI.HPSF; using NPOI.HSSF.UserModel; using NPOI.OpenXmlFormats; +using NPOI.OpenXmlFormats.Wordprocessing; using NPOI.POIFS.Crypt.Dsig; using NPOI.SS.Formula.Eval; using NPOI.SS.Formula.Functions; @@ -1876,6 +1877,9 @@ namespace Myshipping.Application //{ // Oops.Oh(sendResult.Value); //} + + result.succ = true; + result.msg = "操作成功"; } catch (Exception ex) { @@ -1933,6 +1937,9 @@ namespace Myshipping.Application //{ // Oops.Oh(sendResult.Value); //} + + result.succ = true; + result.msg = "操作成功"; } catch (Exception ex) { @@ -3313,6 +3320,9 @@ namespace Myshipping.Application model.Voyno = rtl.voyno.ToString(); model.ShipAgency = rtl.shipagency == null? rtl.shipagency.ToString():""; model.MailUrl = rtl.mail_url.ToString(); + + model.OriginalVessel = bookingOrder.VESSEL; + model.OriginalVoyno = bookingOrder.VOYNO; //获得未处理的任务数量 model.TotalTask = await _taskBaseInfoRepository.AsQueryable().Where(t => t.CreatedTime < taskInfo.CreatedTime && t.STATUS == TaskStatusEnum.Create.ToString() @@ -3377,6 +3387,9 @@ namespace Myshipping.Application model.ShipAgency = rtl.shipagency == null ? rtl.shipagency.ToString() : ""; model.MailUrl = rtl.mail_url.ToString(); + model.OriginalVessel = bookingOrder.VESSEL; + model.OriginalVoyno = bookingOrder.VOYNO; + //获得未处理的任务数量 model.TotalTask = await _taskBaseInfoRepository.AsQueryable().Where(t => t.CreatedTime < taskInfo.CreatedTime && t.STATUS == TaskStatusEnum.Create.ToString() && (t.TASK_TYPE == TaskBusiTypeEnum.CHANGE_SHIP.ToString() || t.TASK_TYPE == TaskBusiTypeEnum.ABORT_CHANGE_SHIP.ToString())).CountAsync();