From 22f859627832ac732804d9a207c36f70858f740c Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Sun, 23 Apr 2023 14:43:22 +0800
Subject: [PATCH] 1

---
 .../Entity/BookingOrderSeaeEdi.cs             | 24 ++++++++++++++-----
 .../BookingOrderSeaeEdiService.cs             |  6 +----
 .../Dto/BookingOrderSeaeEdiServiceDto.cs      | 22 +++++++++++++----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs b/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
index cc560911..654c5adf 100644
--- a/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
+++ b/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
@@ -41,13 +41,13 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string VOYNO { get; set; }
         /// <summary>
-        /// 船公司
+        /// 船公司EDI
         /// </summary>
         public string CARRIER { get; set; }
         /// <summary>
-        /// 船公司ID
+        /// 船公司Name
         /// </summary>
-        public string CARRIERID { get; set; }
+        public string CARRIERName { get; set; }
         /// <summary>
         /// 发货人名称
         /// </summary>
@@ -57,10 +57,14 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string SHIPPERADDR1 { get; set; }
         /// <summary>
-        /// 发货人国家
+        /// 发货人国家code
         /// </summary>
         public string SHIPPERCOUNTRY { get; set; }
         /// <summary>
+        /// 发货人国家
+        /// </summary>
+        public string SHIPPERCOUNTRYName { get; set; }
+        /// <summary>
         /// 发货人电话
         /// </summary>
         public string SHIPPERTEL { get; set; }
@@ -73,10 +77,14 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string CONSIGNEEADDR1 { get; set; }
         /// <summary>
-        /// 收货人国家
+        /// 收货人国家code
         /// </summary>
         public string CONSIGNEECOUNTRY { get; set; }
         /// <summary>
+        /// 收货人国家
+        /// </summary>
+        public string CONSIGNEECOUNTRYName { get; set; }
+        /// <summary>
         /// 收货人电话
         /// </summary>
         public string CONSIGNEETEL { get; set; }
@@ -89,10 +97,14 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string NOTIFYPARTYADDR1 { get; set; }
         /// <summary>
-        /// 通知人国家
+        /// 通知人国家code
         /// </summary>
         public string NOTIFYPARTYCOUNTRY { get; set; }
         /// <summary>
+        /// 通知人国家
+        /// </summary>
+        public string NOTIFYPARTYCOUNTRYName { get; set; }
+        /// <summary>
         /// 通知人电话
         /// </summary>
         public string NOTIFYPARTYTEL { get; set; }
diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
index f90c55f0..9c493cb7 100644
--- a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
+++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
@@ -221,7 +221,7 @@ namespace Myshipping.Application
                     var order = await _seaeedi.AsQueryable().Filter(null, true).Where(x => x.Id == Id).FirstAsync();
                     var ctns = await _seaeedictn.AsQueryable().Filter(null, true).Where(x => x.PId == order.Id).ToListAsync();
                     //船公司
-                    if (string.IsNullOrEmpty(order.CARRIERID))
+                    if (string.IsNullOrEmpty(order.CARRIER))
                     {
                         throw Oops.Bah(BookingErrorCode.BOOK118);
                     }
@@ -230,10 +230,6 @@ namespace Myshipping.Application
                     {
                         throw Oops.Bah(BookingErrorCode.BOOK127);
                     }
-                    if (string.IsNullOrEmpty(order.YARDID))
-                    {
-                        throw Oops.Bah("场站未正确选择");
-                    }
                     var dicUrl = _cache.GetAllDictData().Result.First(x => x.TypeCode == "url_set" && x.Code == "request_emf");
                     var key = _webAccountConfig.GetAccountConfig("DjyCangDan", UserManager.UserId).Result;
                     if (key==null) {
diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
index ec3e4545..4d6844f0 100644
--- a/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
+++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
@@ -38,13 +38,13 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string VOYNO { get; set; }
         /// <summary>
-        /// 船公司
+        /// 船公司EDI
         /// </summary>
         public string CARRIER { get; set; }
         /// <summary>
-        /// 船公司ID
+        /// 船公司
         /// </summary>
-        public string CARRIERID { get; set; }
+        public string CARRIERName { get; set; }
         /// <summary>
         /// 发货人名称
         /// </summary>
@@ -58,6 +58,10 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string SHIPPERCOUNTRY { get; set; }
         /// <summary>
+        /// 发货人国家code
+        /// </summary>
+        public string SHIPPERCOUNTRYName { get; set; }
+        /// <summary>
         /// 发货人电话
         /// </summary>
         public string SHIPPERTEL { get; set; }
@@ -70,10 +74,14 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string CONSIGNEEADDR1 { get; set; }
         /// <summary>
-        /// 收货人国家
+        /// 收货人国家code
         /// </summary>
         public string CONSIGNEECOUNTRY { get; set; }
         /// <summary>
+        /// 收货人国家
+        /// </summary>
+        public string CONSIGNEECOUNTRYName { get; set; }
+        /// <summary>
         /// 收货人电话
         /// </summary>
         public string CONSIGNEETEL { get; set; }
@@ -86,10 +94,14 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string NOTIFYPARTYADDR1 { get; set; }
         /// <summary>
-        /// 通知人国家
+        /// 通知人国家code
         /// </summary>
         public string NOTIFYPARTYCOUNTRY { get; set; }
         /// <summary>
+        /// 通知人国家
+        /// </summary>
+        public string NOTIFYPARTYCOUNTRYName { get; set; }
+        /// <summary>
         /// 通知人电话
         /// </summary>
         public string NOTIFYPARTYTEL { get; set; }