From 84160fbfab2410550b83a8357b2967eb5f0c7b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Mon, 19 Aug 2024 17:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interface/TaskInteraction/ISeaExportTaskService.cs | 4 ++-- .../Op/Method/TaskInteraction/SeaExportTaskService.cs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs index 49dfa424..d1c135dd 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs @@ -24,10 +24,10 @@ namespace DS.WMS.Core.Op.Interface.TaskInteraction Task CreateSubTaskAsync(BusinessTask task); /// - /// 创建关联子任务 + /// 生成关联子任务 /// /// /// - Task CreateSubTask(TaskFlowDataContext dataContext); + Task GenerateSubTaskAsync(TaskFlowDataContext dataContext); } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs index e9723c0c..f7cccd31 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs @@ -65,6 +65,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction var taskList = new List(); var taskLogList = new List(); + //获取任务接收人 var dic = await GetRecvUsersAsync(first.BusinessId, first.BusinessType, request.Select(x => x.TaskType).ToList()); foreach (var item in request) { @@ -136,16 +137,16 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction /// public async Task CreateSubTaskAsync(BusinessTask task) { - var list = await GetSubRequestAsync(task.BusinessId, task.BusinessType, task.RecvUserIdArray); + var list = await GetSubRequestAsync(task.BusinessId, task.BusinessType); await CreateSubTaskAsync(list.FindAll(x => x.TaskType != TaskBaseTypeEnum.NOT_SPECIFIED).OrderBy(x => x.TaskType)); } /// - /// 创建关联子任务 + /// 生成关联子任务 /// /// /// - public async Task CreateSubTask(TaskFlowDataContext dataContext) + public async Task GenerateSubTaskAsync(TaskFlowDataContext dataContext) { ArgumentNullException.ThrowIfNull(dataContext, nameof(dataContext)); @@ -232,7 +233,8 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction if (((JObject)result.data)["ext"] is not JArray extArray || extArray.Count == 0) return []; - return extArray.Where(x => x["isYield"].Value()).Select(x => x["projectName"]?.Value() ?? string.Empty).ToArray(); + return extArray.Where(x => x["isYield"].Value()).Select( + x => x["projectName"]?.Value() ?? string.Empty).ToArray(); } }