From 178dbac2dfbce85bcaab229644e2200e3abd3d0a Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Wed, 20 Sep 2023 14:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E9=A1=B5=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E8=AE=A2=E8=88=B1=E9=99=84=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskManagePlat/TaskDraftCompareService.cs     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskDraftCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskDraftCompareService.cs
index f4a81e9d..1a5e24ba 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskDraftCompareService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskDraftCompareService.cs
@@ -627,6 +627,12 @@ namespace Myshipping.Application
                 //附件暂存
                 var fileFullName = await FileAttachHelper.TempSaveWebFile(model.Head.GID, file, batchNo, CONST_DRAFT_FILE_CODE);
 
+                string fileAttchedFullName = string.Empty;
+
+                if(fileAttach != null)
+                {
+                    fileAttchedFullName = await FileAttachHelper.TempSaveWebFile(model.Head.GID, fileAttach, batchNo, CONST_DRAFT_FILE_CODE);
+                }
                 //Draft文件解析
                 NameValueCollection par = new NameValueCollection();
                 par.Add("jsonMessage", JSON.Serialize(readFileMessageInfo));
@@ -784,6 +790,15 @@ namespace Myshipping.Application
                 await SaveEDIFile(bookingOrder.Id, bookFilePath, new System.IO.FileInfo(fileFullName).Name, entity.TenantId.Value,
                     CONST_DRAFT_FILE_CODE, CONST_DRAFT_FILE_NAME);
 
+                if(!string.IsNullOrWhiteSpace(fileAttchedFullName))
+                {
+                    var currBookFilePath = await FileAttachHelper.MoveFile(bookingOrder.Id.ToString(), fileAttchedFullName, batchNo);
+
+                    //将格式单附件写入订舱的附件
+                    await SaveEDIFile(bookingOrder.Id, currBookFilePath, new System.IO.FileInfo(fileAttchedFullName).Name, entity.TenantId.Value,
+                        CONST_DRAFT_FILE_CODE, CONST_DRAFT_FILE_NAME);
+                }
+
                 result = compareResult;
             }
             catch (Exception ex)