From 6bd123c64cd61b4e4fdc97e5b5eaea95141cecb7 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Mon, 30 Jan 2023 13:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1-=E6=8D=A2?=
 =?UTF-8?q?=E8=88=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/TaskChangeShipResultDto.cs               | 15 +++++++++++++++
 .../Service/TaskManagePlat/TaskManageService.cs   | 13 +++++++++++++
 2 files changed, 28 insertions(+)

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
         /// </summary>
         public string MailUrl { get; set; }
 
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBlNo { get; set; }
+
+        /// <summary>
+        /// 原始船名
+        /// </summary>
+        public string OriginalVessel { get; set; }
+        /// <summary>
+        /// 原始航次
+        /// </summary>
+        public string OriginalVoyno { get; set; }
+
         /// <summary>
         /// 相同主单未处理任务合计
         /// </summary>
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();