From 8f80cb0cc38dede53ee6472affaf7543df0f83a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Thu, 1 Aug 2024 18:48:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=AF=E9=80=89=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=94=9F=E6=88=90bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs | 10 ++++++++++ .../Op/Method/TaskInteraction/SeaExportTaskService.cs | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) 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 4be9c0bb..cfd5b25f 100644 --- a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs +++ b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs @@ -283,6 +283,16 @@ namespace DS.Module.Core /// [Description("待出产地证")] WAIT_CHANDIZHENG = 310, + /// + /// 待拖车 + /// + [Description("待拖车")] + WAIT_TUOCHE = 311, + /// + /// 待办保险 + /// + [Description("待办保险")] + WAIT_Insurance = 312, #endregion } } 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 ce57b6bc..0d23d424 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 @@ -116,7 +116,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction var task = await GetQuery(request.BusinessId, request.BusinessType, request.TaskType).FirstAsync(); if (task != null) { - var list = await GetSubRequestAsync(request.BusinessId, request.BusinessType, task.RecvUserIdArray); + var list = Array.FindAll(await GetSubRequestAsync(request.BusinessId, request.BusinessType, task.RecvUserIdArray), x => !string.IsNullOrEmpty(x.TaskTypeName)); await CreateSubTaskAsync(list); } } @@ -151,6 +151,10 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction dto.TaskTypeName = TaskBaseTypeEnum.WAIT_COA.ToString(); else if (svcName == "产地证") dto.TaskTypeName = TaskBaseTypeEnum.WAIT_CHANDIZHENG.ToString(); + else if (svcName == "拖车") + dto.TaskTypeName = TaskBaseTypeEnum.WAIT_TUOCHE.ToString(); + else if (svcName == "保险") + dto.TaskTypeName = TaskBaseTypeEnum.WAIT_Insurance.ToString(); list[i] = dto; } From d8a23bd58107cfb17023315627cf388c53e238b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Thu, 1 Aug 2024 19:06:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=AD=90=E4=BB=BB=E5=8A=A1=E6=8E=A5=E6=94=B6=E4=BA=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=BA=E7=A9=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Method/TaskInteraction/SeaExportTaskService.cs | 1 + 1 file changed, 1 insertion(+) 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 0d23d424..ba537848 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 @@ -93,6 +93,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction BusinessType = item.BusinessType, TaskType = item.TaskType, TaskStatus = TaskStatusEnum.Create, + RecvUsers = info.Main.RecvUserInfoList == null ? string.Empty : string.Join(",", info.Main.RecvUserInfoList.Select(x => x.RecvUserId)), CreateBy = userId, CreateTime = dt }; From db01db9f99016c1a40c706f5d6eda70e567eb920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Fri, 2 Aug 2024 08:53:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs | 6 ++++++ .../DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs | 3 ++- .../DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs | 2 +- 3 files changed, 9 insertions(+), 2 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 cfd5b25f..27f393ce 100644 --- a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs +++ b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs @@ -7,6 +7,12 @@ namespace DS.Module.Core /// public enum TaskBaseTypeEnum { + /// + /// 未指定 + /// + [Description("未指定")] + NOT_SPECIFIED = -1, + /// /// 重要提醒 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs index db54bf00..138686af 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs @@ -25,7 +25,8 @@ namespace DS.WMS.Core.Op.Dtos.TaskInteraction /// 任务类型 /// [IgnoreDataMember] - public TaskBaseTypeEnum TaskType => _taskType == default ? Enum.Parse(TaskTypeName) : _taskType; + public TaskBaseTypeEnum TaskType => _taskType == default ? + string.IsNullOrEmpty(TaskTypeName) ? TaskBaseTypeEnum.NOT_SPECIFIED : Enum.Parse(TaskTypeName) : _taskType; /// /// 任务类型名称 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 fbc5fe2c..9f9a07ae 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 @@ -53,7 +53,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction /// internal static TaskBaseTypeEnum? GetNextType(BusinessTask current) { - if (current.TaskType == TaskBaseTypeEnum.WAIT_CHECKOUT_BILL) //流程的最后一步 + if (current.TaskType == TaskBaseTypeEnum.NOT_SPECIFIED || current.TaskType == TaskBaseTypeEnum.WAIT_CHECKOUT_BILL) //流程的最后一步 return null; int currentTypeVal = (int)current.TaskType;