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 /// 运输条款代码 /// public string SERVICECODE { get; set; } + + /// + /// 船公司航线代码 + /// + public string LANECODE { get; set; } } /// 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; } - + + /// + /// 分类 + /// + [SugarColumn(ColumnName = "Category")] + [Description("分类")] + public string Category { get; set; } + /// /// 船司ID /// 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 客户端操作与接口 /// /// 提交订舱 @@ -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 /// 运输条款代码 /// public string SERVICECODE { get; set; } + + /// + /// 船公司航线代码 + /// + public string LANECODE { get; set; } } //保存dto @@ -934,5 +939,10 @@ namespace Myshipping.Application /// 订舱密码 /// public string BOOKINGPASSWORD { get; set; } + + /// + /// 航线代码 + /// + 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 /// public string TemplateName { get; set; } + /// + /// 分类 + /// + public string Category { get; set; } + /// /// 船司ID ///