From 814536a06e7a271cae88fffea852efe3031da708 Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Fri, 11 Oct 2024 15:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=88=B1=E6=94=B9=E9=85=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Enums/TaskPlat/TaskBaseTypeEnum.cs        | 14 ++++++-------
 .../Op/Method/SeaExportRefundService.cs       | 21 +++++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs
index 8c045316..52079574 100644
--- a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs
+++ b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs
@@ -235,9 +235,9 @@ namespace DS.Module.Core
 
         #region 工作流--其他任务类型
         /// <summary>
-        /// 退舱
+        /// 退舱确认
         /// </summary>
-        [Description("退舱")]
+        [Description("退舱确认")]
         RETURN_CABIN = 401,
 
         /// <summary>
@@ -315,11 +315,11 @@ namespace DS.Module.Core
         /// </summary>
         [Description("SI提交驳回")]
         WAIT_SI_REJECTED = -206,
-        /// <summary>
-        /// 退舱驳回
-        /// </summary>
-        [Description("退舱驳回")]
-        RETURN_CABIN_REJECTED = -401,
+        ///// <summary>
+        ///// 退舱驳回
+        ///// </summary>
+        //[Description("退舱驳回")]
+        //RETURN_CABIN_REJECTED = -401,
         /// <summary>
         /// 退舱审核驳回
         /// </summary>
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs
index c66b9503..ddd12852 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs
@@ -378,8 +378,10 @@ namespace DS.WMS.Core.Op.Method
 
                 if (req.IsRefund)
                 {
-                    if (req.OrderProgress =="2") //已出号未申报 发起退舱入池任务
-                    {
+                    var userList = new List<long>();
+                    if (req.OrderProgress =="2") //已出号未申报 发起退舱入池任务  推给当票商务
+                    { 
+                        userList.Add(entity.LaneId);
                         var taskReq = new TaskCreationRequest()
                         {
                             BusinessId = newKey,
@@ -387,13 +389,15 @@ namespace DS.WMS.Core.Op.Method
                             TaskTypeName = TaskBaseTypeEnum.RETURN_CABIN_POOL.ToString(),
                             TaskTitle = $"【{TaskBaseTypeEnum.RETURN_CABIN_POOL.GetDescription()}】{entity?.CustomerNo}",
                             TaskDescription = $"【{TaskBaseTypeEnum.RETURN_CABIN_POOL.GetDescription()}】{entity?.CustomerNo}",
+                            RecvUserIdList = userList.ToArray()
                         };
                         var result = await taskService.CreateTaskAsync(taskReq, false);
                         if (!result.Succeeded)
                             return await Task.FromResult(DataResult.Failed(result.Message));
                     }
-                    else //退舱确认任务
+                    else //退舱确认任务 推给当票操作
                     {
+                        userList.Add(info.OperatorId);
                         var taskReq = new TaskCreationRequest()
                         {
                             BusinessId = newKey,
@@ -401,6 +405,7 @@ namespace DS.WMS.Core.Op.Method
                             TaskTypeName = TaskBaseTypeEnum.RETURN_CABIN.ToString(),
                             TaskTitle = $"【{TaskBaseTypeEnum.RETURN_CABIN.GetDescription()}】{entity?.CustomerNo}",
                             TaskDescription = $"【{TaskBaseTypeEnum.RETURN_CABIN.GetDescription()}】{entity?.CustomerNo}",
+                            RecvUserIdList = userList.ToArray()
                         };
                         var result = await taskService.CreateTaskAsync(taskReq, false);
                         if (!result.Succeeded)
@@ -502,9 +507,10 @@ namespace DS.WMS.Core.Op.Method
             if (callback.FlowStatus == FlowStatusEnum.Approve)
             { 
                 await seaComService.SetGoodsStatus("YSTC", callback.BusinessId, tenantDb);
-
-                if (info.OrderProgress =="2")//已出号未申报 发起退舱入池任务
+                var userList = new List<long>();
+                if (info.OrderProgress =="2")//已出号未申报 发起退舱入池任务 推给当票商务
                 {
+                    userList.Add(info.LaneId);
                     var taskReq = new TaskCreationRequest()
                     {
                         BusinessId = info.Id,
@@ -512,13 +518,15 @@ namespace DS.WMS.Core.Op.Method
                         TaskTypeName = TaskBaseTypeEnum.RETURN_CABIN_POOL.ToString(),
                         TaskTitle = $"【{TaskBaseTypeEnum.RETURN_CABIN_POOL.GetDescription()}】{info?.CustomerNo}",
                         TaskDescription = $"【{TaskBaseTypeEnum.RETURN_CABIN_POOL.GetDescription()}】{info?.CustomerNo}",
+                        RecvUserIdList = userList.ToArray()
                     };
                     var result = await taskService.CreateTaskAsync(taskReq, false);
                     if (!result.Succeeded)
                         return await Task.FromResult(DataResult.Failed(result.Message));
                 }
-                else
+                else  //退舱确认任务 推给当票操作
                 {
+                    userList.Add(info.OperatorId);
                     //发起退舱确认任务
                     var taskReq = new TaskCreationRequest()
                     {
@@ -527,6 +535,7 @@ namespace DS.WMS.Core.Op.Method
                         TaskTypeName = TaskBaseTypeEnum.RETURN_CABIN.ToString(),
                         TaskTitle = $"【{TaskBaseTypeEnum.RETURN_CABIN.GetDescription()}】{info?.CustomerNo}",
                         TaskDescription = $"【{TaskBaseTypeEnum.RETURN_CABIN.GetDescription()}】{info?.CustomerNo}",
+                        RecvUserIdList = userList.ToArray()
                     };
                     var result = await taskService.CreateTaskAsync(taskReq, false);
                     if (!result.Succeeded)