From 9c942448017ac93a2a23308eb17946edd5db7c7a Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Tue, 23 May 2023 08:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TSL=20EDI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/EDI/TSLEdiHelper.cs            | 10 +++++-----
 .../Interface/ITaskShippingOrderCompareService.cs     |  8 ++++++++
 .../TaskManagePlat/TaskShippingOrderCompareService.cs | 11 +++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Myshipping.Application/EDI/TSLEdiHelper.cs b/Myshipping.Application/EDI/TSLEdiHelper.cs
index 28344cc9..cc4adc5f 100644
--- a/Myshipping.Application/EDI/TSLEdiHelper.cs
+++ b/Myshipping.Application/EDI/TSLEdiHelper.cs
@@ -866,7 +866,7 @@ namespace Myshipping.Application.EDI.TSL
                 //if (bill.ISSUETYPE == "正本")
                 if (bill.ISSUETYPE == "ORIGINAL") 
                 {
-                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL).EmptyDefaultNum() + "'");
+                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL) + "'");
                     icount = icount + 1;
                     if (!string.IsNullOrWhiteSpace(copynum))
                     {
@@ -877,14 +877,14 @@ namespace Myshipping.Application.EDI.TSL
                 }
                 else if (bill.ISSUETYPE == "海运单" || bill.ISSUETYPE.ToUpper() == "SEAWAY" || bill.ISSUETYPE.ToUpper() == "SEAWAY BILL" || bill.ISSUETYPE.ToUpper() == "WAYBILL" || bill.ISSUETYPE.ToUpper() == "SWB正本" || bill.ISSUETYPE.ToUpper() == "SWB无正本")
                 {
-                    r.WriteLine("DOC+710+:26++" + GetBillNum(bill.NOBILL).EmptyDefaultNum() + "'");
+                    r.WriteLine("DOC+710+:26++" + GetBillNum(bill.NOBILL) + "'");
                     icount = icount + 1;
 
                 }
                 //else if (bill.ISSUETYPE.ToUpper() == "BILL COPY" || bill.ISSUETYPE == "电放")
                 else if (bill.ISSUETYPE.ToUpper() == "BILL COPY" || bill.ISSUETYPE == "TELEX")
                 {
-                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL).EmptyDefaultNum() + "'");
+                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL) + "'");
                     icount = icount + 1;
                     if (!string.IsNullOrWhiteSpace(copynum))
                     {
@@ -895,7 +895,7 @@ namespace Myshipping.Application.EDI.TSL
                 }
                 else if (bill.ISSUETYPE == "正副本")
                 {
-                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL).EmptyDefaultNum() + "'");
+                    r.WriteLine("DOC+706+:26++" + GetBillNum(bill.NOBILL) + "'");
                     icount = icount + 1;
                     if (!string.IsNullOrWhiteSpace(copynum))
                     {
@@ -906,7 +906,7 @@ namespace Myshipping.Application.EDI.TSL
                 }
                 else if (bill.ISSUETYPE.ToUpper() == "HOUSE BILL")
                 {
-                    r.WriteLine("DOC+714+:26++" + GetBillNum(bill.NOBILL).EmptyDefaultNum() + "'");
+                    r.WriteLine("DOC+714+:26++" + GetBillNum(bill.NOBILL) + "'");
                     icount = icount + 1;
 
                 }
diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs
index d58d406c..0d99d76b 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs
@@ -25,5 +25,13 @@ namespace Myshipping.Application
         /// <param name="bookingIds">订舱主键组</param>
         /// <returns>返回回执</returns>
         Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync(string[] bookingIds);
+
+
+        /// <summary>
+        /// 批量执行下货纸比对
+        /// </summary>
+        /// <param name="bookingIds">订舱主键组</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(string[] bookingIds);
     }
 }
diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
index 906777ab..e91551bd 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
@@ -275,6 +275,17 @@ namespace Myshipping.Application
 
             return result;
         }
+
+
+        /// <summary>
+        /// 批量执行下货纸比对
+        /// </summary>
+        /// <param name="bookingIds">订舱主键组</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(string[] bookingIds)
+        {
+            return new TaskManageExcuteResultDto();
+        }
         /// <summary>
         /// 生成请求规则报文
         /// </summary>