From 782136f26be365206d6430b582190109c010097a Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Thu, 12 Sep 2024 18:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=93=E9=80=9A=E6=88=AA?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Op/EDI/YTEdiHelper.cs         | 24 +++++++++++++------
 .../SeaExportBookingOrClosingEDIService.cs    | 23 +++++++++++-------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs
index 624ec52a..f3a07dc7 100644
--- a/ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs
@@ -431,6 +431,11 @@ namespace DS.WMS.Core.Op.EDI
                     }
                 }
 
+                if (!new string[] { "ORI", "TER", "EXP" }.Contains(headData.ISSUETYPE))
+                {
+                    error = error + "<br />提单号：" + headData.MBLNO + "签单方式未识别";
+                }
+
                 if (string.IsNullOrEmpty(headData.DESCRIPTION))
                 {
                     error = error + "<br />提单号：" + headData.MBLNO + " 货物描述不能为空";
@@ -831,15 +836,20 @@ namespace DS.WMS.Core.Op.EDI
                 }
                 else ISSUETYPE = "EXP";
                 */
-                if (bill.ISSUETYPE == "ORIGINAL")
-                {
-                    ISSUETYPE = "ORI";
-                }
-                else if (bill.ISSUETYPE == "TELEX")
+                //if (bill.ISSUETYPE == "ORIGINAL")
+                //{
+                //    ISSUETYPE = "ORI";
+                //}
+                //else if (bill.ISSUETYPE == "TELEX")
+                //{
+                //    ISSUETYPE = "TER";
+                //}
+                //else ISSUETYPE = "EXP";
+
+                if(new string[] { "ORI", "TER", "EXP" }.Contains(bill.ISSUETYPE))
                 {
-                    ISSUETYPE = "TER";
+                    ISSUETYPE = bill.ISSUETYPE;
                 }
-                else ISSUETYPE = "EXP";
 
                 r.WriteLine("03:" + ISSUETYPE + ":" + bill.ISSUEPLACEID.Trim() + ":" + bill.ISSUEPLACE.Trim() + ":" + GetDateStr(bill.ISSUEDATE, "yyyyMMdd") + ":" + GetBillNum2(bill.NOBILL) + ":" + bill.PREPARDAT + ":" + bill.PAYABLEAT + "'");
                 icount++;
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs
index 91e7f764..a3641dda 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs
@@ -1383,12 +1383,19 @@ namespace DS.WMS.Core.Op.Method
 
             #region 签单方式EDI
             ////签单方式EDI
-            if (!string.IsNullOrWhiteSpace(order.IssueType))
+            if (!string.IsNullOrWhiteSpace(order.IssueTypeCode))
             {
-                long issueTypeId = long.Parse(order.IssueType);
+                //long issueTypeId = long.Parse(order.IssueType);
+
+                var codeIssue = tenantDb.Queryable<CodeIssueType>().First(t => t.EdiCode == order.IssueTypeCode);
+
+                if (codeIssue == null)
+                {
+                    return DataResult<string>.Failed($"签单方式{order.IssueTypeCode}的基础代码未找到");
+                }
 
                 var mapInfo = tenantDb.Queryable<MappingIssueType>()
-                .First(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) && t.CarrierId == order.CarrierId && t.Id == issueTypeId);
+                .First(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) && t.CarrierId == order.CarrierId && t.LinkId == codeIssue.Id);
 
                 if (mapInfo != null)
                 {
@@ -1397,15 +1404,13 @@ namespace DS.WMS.Core.Op.Method
                 else
                 {
                     //签单方式EDI
-                    var codeService = tenantDb.Queryable<CodeIssueType>().First(x => x.Status == StatusEnum.Enable && x.Id == issueTypeId);
-
-                    if (codeService != null && !string.IsNullOrWhiteSpace(codeService.EdiCode))
+                    if (codeIssue != null && !string.IsNullOrWhiteSpace(codeIssue.EdiCode))
                     {
-                        primaryModel.ISSUETYPE = codeService.EdiCode;
+                        primaryModel.ISSUETYPE = codeIssue.EdiCode;
                     }
                     else
                     {
-                        return DataResult<string>.Failed($"签单方式{order.Service}的基础代码未找到");
+                        return DataResult<string>.Failed($"签单方式{order.Service}的基础代码 EdiCode 未配置");
                     }
                 }
             }
@@ -1512,7 +1517,7 @@ namespace DS.WMS.Core.Op.Method
 
             primaryModel.EDIATTNEMAIL = ediExtModel.EDIAttnMail;
 
-            if (string.IsNullOrWhiteSpace(primaryModel.EDIATTNEMAIL))
+            if (string.IsNullOrWhiteSpace(primaryModel.EDIATTNEMAIL) && ediRouteEnum != EDIRouteEnum.YT)
             {
                 primaryModel.EDIATTNEMAIL = ftpSet.SendEmail;
             }