From 7f3a68b01158579724382803de177aa19b964490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Fri, 23 Aug 2024 16:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E7=8E=B0=E8=88=B1=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskInteraction/TaskCreationRequest.cs    |  5 +++
 .../Op/Method/TaskInteraction/TaskService.cs  | 32 +++++++++++++++----
 .../Controllers/SeaExportTaskController.cs    |  4 +--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreationRequest.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreationRequest.cs
index 1e755eda..b133c8c6 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreationRequest.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreationRequest.cs
@@ -31,5 +31,10 @@ namespace DS.WMS.Core.Op.Dtos.TaskInteraction
         /// 下一任务类型
         /// </summary>
         public TaskBaseTypeEnum? NextType { get; set; }
+
+        /// <summary>
+        /// 是否现舱(默认null值)
+        /// </summary>
+        public bool? HasCabin { get; set; }
     }
 }
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 b0e2abc0..3d934e26 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
@@ -110,6 +110,14 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             if (!await EnsureModuleAuthorized())
                 return DataResult.SuccessedWithDesc(nameof(MultiLanguageConst.ModuleUnauthorized));
 
+            if (request.HasCabin.GetValueOrDefault())
+            {
+                //如果为现舱，获取下一任务类型进行创建
+                var nextType = await GetNextTypeAsync(request.BusinessId, request.BusinessType, request.TaskType);
+                if (nextType.HasValue)
+                    request.TaskTypeName = nextType.Value.ToString();
+            }
+
             var task = await GetQuery(request.BusinessId, request.BusinessType, request.TaskType).FirstAsync();
             if (task != null && task.TaskStatus != TaskStatusEnum.Cancel)
                 return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskExists));
@@ -742,14 +750,24 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         /// <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 await GetNextTypeAsync(current.BusinessId, current.BusinessType, current.TaskType);
+        }
 
-            return taskType;
+        /// <summary>
+        /// 获取给定任务的下一任务类型
+        /// </summary>
+        /// <param name="bsId">业务ID</param>
+        /// <param name="businessType">业务类型</param>
+        /// <param name="currentType">当前任务类型</param>
+        /// <returns></returns>
+        protected async Task<TaskBaseTypeEnum?> GetNextTypeAsync(long bsId, BusinessType businessType, TaskBaseTypeEnum currentType)
+        {
+            var order = await ActionService.GetBusinessDataAsync(bsId, businessType);
+            TaskFlowRuner flowRuner = new(TenantDb, ServiceProvider);
+            return await flowRuner.GetWorkFlowNextConfigByTaskType(TaskBaseTypeEnum.WORK_FLOW_MAIN,
+                 new TaskFlowDataContext(
+                 (TaskFlowDataNameConst.Business, order)
+                 ), currentType);
         }
 
         /// <summary>
diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportTaskController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportTaskController.cs
index a4996bc5..073be7ea 100644
--- a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportTaskController.cs
+++ b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportTaskController.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using DS.Module.Core;
-using DS.WMS.Core;
 using DS.WMS.Core.Flow.Dtos;
 using DS.WMS.Core.Op.Dtos.TaskInteraction;
 using DS.WMS.Core.Op.Entity;
@@ -66,7 +65,8 @@ namespace DS.WMS.OpApi.Controllers
         /// <param name="businessId">业务ID</param>
         /// <param name="businessType">业务类型(可空，默认=海运出口)</param>
         /// <returns></returns>
-        public async Task<DataResult> AutomaticBooking([FromServices] IActionManagerService actionService,
+        [HttpPost, Route("AutomaticBooking")]
+        public async Task<DataResult> AutomaticBookingAsync([FromServices] IActionManagerService actionService,
              [FromQuery] long businessId, [FromQuery] BusinessType businessType = BusinessType.OceanShippingExport)
         {
             return await actionService.AutomaticBooking(businessId, businessType);