From bf41b71ee82488dc616a6cc1b624fd81e7343005 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 22:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9DRAFT=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/TaskManagePlat/TaskDraftInfo.cs | 6 +++--- Myshipping.Application/Enum/TaskFileCategoryEnum.cs | 10 ++++++++++ .../Service/TaskManagePlat/TaskManageService.cs | 12 ++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs index e569df8f..78c21469 100644 --- a/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs @@ -10,10 +10,10 @@ using System.Threading.Tasks; namespace Myshipping.Application { /// - /// 任务目的港未提货未返箱 + /// 任务格式单 /// - [SugarTable("task_pod_discharge_gateout_full")] - [Description("任务目的港未提货未返箱")] + [SugarTable("task_draft_info")] + [Description("任务格式单")] public class TaskDraftInfo : TaskManageDbEntity { /// diff --git a/Myshipping.Application/Enum/TaskFileCategoryEnum.cs b/Myshipping.Application/Enum/TaskFileCategoryEnum.cs index 9c725be8..c246102e 100644 --- a/Myshipping.Application/Enum/TaskFileCategoryEnum.cs +++ b/Myshipping.Application/Enum/TaskFileCategoryEnum.cs @@ -43,6 +43,16 @@ namespace Myshipping.Application [Description("Booking Cancellation Notice")] BC_CANCEL_NOTICE, /// + /// Booking Cancellation + /// + [Description("Draft")] + DRAFT, + /// + /// Booking Cancellation Notice + /// + [Description("Draft Notice")] + DRAFT_NOTICE, + /// /// 空 /// [Description("NONE")] diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 7b7c243a..d18abe85 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -417,6 +417,12 @@ namespace Myshipping.Application fileCategory = TaskFileCategoryEnum.BC_CANCEL.ToString(); } + else if (TaskBaseTypeEnum.DRAFT.ToString() == taskInfo.TASK_BASE_TYPE) + { + attachFileType = "draftfiles"; + + fileCategory = TaskFileCategoryEnum.DRAFT.ToString(); + } var noExtensionFileName = Path.GetFileNameWithoutExtension(file.FileName); var fileFullName = await FileAttachHelper.SaveFile(taskInfo.PK_ID, bytes, batchNo, noExtensionFileName, @@ -466,6 +472,12 @@ namespace Myshipping.Application fileCategory = TaskFileCategoryEnum.BC_CANCEL_NOTICE.ToString(); } + else if (TaskBaseTypeEnum.DRAFT.ToString() == taskInfo.TASK_BASE_TYPE) + { + attachFileType = "draftnoticefiles"; + + fileCategory = TaskFileCategoryEnum.DRAFT.ToString(); + } var noExtensionFileName = Path.GetFileNameWithoutExtension(modifyFile.FileName); var fileFullName = await FileAttachHelper.SaveFile(taskInfo.PK_ID, bytes, batchNo, noExtensionFileName,