From 76ee52976b3b29ca3baf04a66c16b0dbd2631526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Mon, 19 Aug 2024 16:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=8C=E6=88=90=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Op/Method/TaskInteraction/TaskService.cs  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
index 82f06120..c27464fb 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
@@ -99,22 +99,6 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             TenantDb.QueryFilter.Clear<IOrgId>();
         }
 
-        /// <summary>
-        /// 获取给定任务的下一任务类型
-        /// </summary>
-        /// <param name="current">当前任务对象</param>
-        /// <returns></returns>
-        protected async Task<TaskBaseTypeEnum?> GetNextTypeAsync(BusinessTask current)
-        {
-            var order = await ActionService.GetBusinessDataAsync(current.BusinessId, current.BusinessType);
-            TaskFlowRuner flowRuner = new(TenantDb, ServiceProvider);
-            var taskType = await flowRuner.GetWorkFlowNextConfigByTaskType(TaskBaseTypeEnum.WORK_FLOW_MAIN,
-                new TaskFlowDataContext(
-                (TaskFlowDataNameConst.Business, order)
-                ), current.TaskType);
-
-            return taskType;
-        }
 
         /// <summary>
         /// 创建关联任务
@@ -376,8 +360,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                     {
                         BusinessId = request.BusinessId,
                         BusinessType = request.BusinessType,
-                        TaskTypeName = task.NextType.Value.ToString(),
-                        RecvUserIdList = task.RecvUserIdArray
+                        TaskTypeName = task.NextType.Value.ToString()
                     };
                     result = await CreateTaskAsync(req, false);
                     if (!result.Succeeded)
@@ -393,7 +376,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
                 if (task.TaskStatus == TaskStatusEnum.Complete)//目前限制任务完成才触发
                 {
                     Dictionary<string, object>? dic = null;
-                    if (request.TaskType == TaskBaseTypeEnum.WAIT_ORDER_AUDIT)
+                    if (task.NextType == TaskBaseTypeEnum.WAIT_BOOKING)
                     {
                         dic = new Dictionary<string, object>();
                         var param = await ClientParamService.GetParamAsync<string>(task.BusinessId, BookingSelector.Booking_Route,
@@ -690,6 +673,23 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             });
         }
 
+        /// <summary>
+        /// 获取给定任务的下一任务类型
+        /// </summary>
+        /// <param name="current">当前任务对象</param>
+        /// <returns></returns>
+        protected async Task<TaskBaseTypeEnum?> GetNextTypeAsync(BusinessTask current)
+        {
+            var order = await ActionService.GetBusinessDataAsync(current.BusinessId, current.BusinessType);
+            TaskFlowRuner flowRuner = new(TenantDb, ServiceProvider);
+            var taskType = await flowRuner.GetWorkFlowNextConfigByTaskType(TaskBaseTypeEnum.WORK_FLOW_MAIN,
+                new TaskFlowDataContext(
+                (TaskFlowDataNameConst.Business, order)
+                ), current.TaskType);
+
+            return taskType;
+        }
+
         /// <summary>
         /// 获取指定类型的业务关联任务
         /// </summary>