From 1411405cd4ddb5cf645b1bc159b14523b916bb92 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 16:07:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Method/TaskInteraction/SeaExportTaskService.cs | 3 ++- .../DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 48b44992..79a65c6c 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 @@ -78,7 +78,8 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction TaskUserName = User.UserName, RecvUserInfoList = userList, TaskTenatId = tenatId, - TaskTenatName = tenatName + TaskTenatName = tenatName, + IsCheckExistsByTaskType = true } }; info.Main.TaskDesp = info.Main.TaskTitle = $"【{item.TaskType.GetDescription()}】 {biz?.Vessel} {biz?.Voyno} ETD:{biz?.ETD?.ToString("yyyy-MM-dd")} BLNo:{biz?.MBLNO}"; 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 a8479482..4f9c5b40 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 @@ -249,7 +249,8 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction TaskUserId = User.UserId, TaskUserName = User.UserName, TaskTenatId = tenatId, - TaskTenatName = tenatName + TaskTenatName = tenatName, + IsCheckExistsByTaskType = true } }; From dce147284b6953b007b7df172dd52d2e52d2a71b 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 17:25:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=8F=8F=E8=BF=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Dtos/TaskInteraction/BusinessTaskDto.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/BusinessTaskDto.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/BusinessTaskDto.cs index 1c3d3b85..b8ff055b 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/BusinessTaskDto.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/BusinessTaskDto.cs @@ -33,7 +33,7 @@ namespace DS.WMS.Core.Op.Dtos.TaskInteraction /// /// 下一任务类型名称 /// - public string NextTypeName => NextType.GetDescription(); + public string? NextTypeName => NextType?.GetDescription(); /// /// 接收人ID列表