From 881dd6a4d27b43ab7acd28830ea0c7ce933fa9ed Mon Sep 17 00:00:00 2001
From: wanghaomei <86whm@163.com>
Date: Wed, 3 Apr 2024 10:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Entity/BookingCustomerOrder.cs  |  5 +++++
 .../Entity/BookingSoTemplate/BookingSoTemplate.cs      |  9 ++++++++-
 .../BookingCustomerOrderService.cs                     |  3 +--
 .../Service/BookingCustomerOrder/Dto/Dtos.cs           | 10 ++++++++++
 .../BookingSoTemplate/Dto/BookingSoTemplateDto.cs      |  5 +++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Myshipping.Application/Entity/BookingCustomerOrder.cs b/Myshipping.Application/Entity/BookingCustomerOrder.cs
index a3a4ce1a..4bad0842 100644
--- a/Myshipping.Application/Entity/BookingCustomerOrder.cs
+++ b/Myshipping.Application/Entity/BookingCustomerOrder.cs
@@ -313,6 +313,11 @@ namespace Myshipping.Application.Entity
         /// 运输条款代码
         /// </summary>
         public string SERVICECODE { get; set; }
+
+        /// <summary>
+        /// 船公司航线代码
+        /// </summary>
+        public string LANECODE { get; set; }
     }
 
     /// <summary>
diff --git a/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs b/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs
index 9ce672a5..b88dfe3f 100644
--- a/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs
+++ b/Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs
@@ -58,7 +58,14 @@ namespace Myshipping.Application.Entity
         [SugarColumn(ColumnName = "TemplateName")]
         [Description("模板名称")]
         public string TemplateName{ get; set; }
-        
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        [SugarColumn(ColumnName = "Category")]
+        [Description("分类")]
+        public string Category { get; set; }
+
         /// <summary>
         /// 船司ID
         /// </summary>
diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs
index c64fb54a..c8ce03e2 100644
--- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs
+++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs
@@ -517,7 +517,6 @@ namespace Myshipping.Application
         }
         #endregion
 
-
         #region 客户端操作与接口
         /// <summary>
         /// 提交订舱
@@ -1769,6 +1768,7 @@ namespace Myshipping.Application
             var serviceList = await _cache.GetAllCodeService();
             var frtList = await _cache.GetAllCodeFrt();
             var ctnList = await _cache.GetAllCodeCtn();
+
             #region 校验
             /*
 1.必填字段：船公司，开船日期，起运港，目的港，箱型箱量，服务项目，运输条款，付费方式，件数，毛重，包装，货物标识，品名，HSCODE。
@@ -1974,7 +1974,6 @@ namespace Myshipping.Application
             custOrder.SERVICE = service.Name;
             custOrder.BLFRT = frt.EnName;
 
-
             //订舱账号、密码
             var jobj = new JObject();
             if (!string.IsNullOrEmpty(custOrder.ExtendData))
diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs
index b4b61873..7c30878a 100644
--- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs
+++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs
@@ -325,6 +325,11 @@ namespace Myshipping.Application
         /// 运输条款代码
         /// </summary>
         public string SERVICECODE { get; set; }
+
+        /// <summary>
+        /// 船公司航线代码
+        /// </summary>
+        public string LANECODE { get; set; }
     }
 
     //保存dto
@@ -934,5 +939,10 @@ namespace Myshipping.Application
         /// 订舱密码
         /// </summary>
         public string BOOKINGPASSWORD { get; set; }
+
+        /// <summary>
+        /// 航线代码
+        /// </summary>
+        public string LINECODE { get; set; }
     }
 }
diff --git a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs
index fa92a42f..3a0c8fa1 100644
--- a/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs
+++ b/Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs
@@ -47,6 +47,11 @@ namespace Myshipping.Application
         /// </summary>
         public string TemplateName { get; set; }
 
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string Category { get; set; }
+
         /// <summary>
         /// 船司ID
         /// </summary>