Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Entity/BookingSoTemplate/BookingSoTemplate.cs

@@ -536,5 +536,97 @@ namespace Myshipping.Application.Entity
         [Description("结束周数")]
         public int? EndWeek { get; set; }
 
+
+        /// <summary>
+        /// 合约类型
+        /// </summary>
+        [SugarColumn(ColumnName = "ContractType")]
+        [Description("合约类型")]
+        public string ContractType { get; set; }
+
+        /// <summary>
+        /// 签约方
+        /// </summary>
+        [SugarColumn(ColumnName = "SignType")]
+        [Description("签约方")]
+        public string SignType { get; set; }
+
+        /// <summary>
+        /// 退舱网点
+        /// </summary>
+        [SugarColumn(ColumnName = "CancelAddr")]
+        [Description("退舱网点")]
+        public string CancelAddr { get; set; }
+
+        /// <summary>
+        /// 提单签发地
+        /// </summary>
+        [SugarColumn(ColumnName = "BillSignLoc")]
+        [Description("提单签发地")]
+        public string BillSignLoc { get; set; }
+
+        /// <summary>
+        /// 提单数量
+        /// </summary>
+        [SugarColumn(ColumnName = "BillCount")]
+        [Description("提单数量")]
+        public int? BillCount { get; set; }
+
+        /// <summary>
+        /// 发货人性别
+        /// </summary>
+        [SugarColumn(ColumnName = "ShipperSex")]
+        [Description("发货人性别")]
+        public string ShipperSex { get; set; }
+
+        /// <summary>
+        /// 收货人性别
+        /// </summary>
+        [SugarColumn(ColumnName = "ConsigneeSex")]
+        [Description("收货人性别")]
+        public string ConsigneeSex { get; set; }
+
+        /// <summary>
+        /// 通知人性别
+        /// </summary>
+        [SugarColumn(ColumnName = "NotifypartSex")]
+        [Description("通知人性别")]
+        public string NotifypartSex { get; set; }
+
+        /// <summary>
+        /// 订舱公司性别
+        /// </summary>
+        [SugarColumn(ColumnName = "BookingSex")]
+        [Description("订舱公司性别")]
+        public string BookingSex { get; set; }
+
+        /// <summary>
+        /// 发货人内参号码
+        /// </summary>
+        [SugarColumn(ColumnName = "ShipperInnerCode")]
+        [Description("发货人内参号码")]
+        public string ShipperInnerCode { get; set; }
+
+        /// <summary>
+        /// 收货人内参号码
+        /// </summary>
+        [SugarColumn(ColumnName = "ConsigneeInnerCode")]
+        [Description("收货人内参号码")]
+        public string ConsigneeInnerCode { get; set; }
+
+        /// <summary>
+        /// 通知人内参号码
+        /// </summary>
+        [SugarColumn(ColumnName = "NotifypartInnerCode")]
+        [Description("通知人内参号码")]
+        public string NotifypartInnerCode { get; set; }
+
+        /// <summary>
+        /// 订舱公司内参号码
+        /// </summary>
+        [SugarColumn(ColumnName = "BookingInnerCode")]
+        [Description("订舱公司内参号码")]
+        public string BookingInnerCode { get; set; }
+
     }
 }

Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateDto.cs

@@ -382,6 +382,72 @@ namespace Myshipping.Application
         /// 结束周数
         /// </summary>
         public int? EndWeek { get; set; }
+
+
+        /// <summary>
+        /// 合约类型
+        /// </summary>
+        public string ContractType { get; set; }
+
+        /// <summary>
+        /// 签约方
+        /// </summary>
+        public string SignType { get; set; }
+
+        /// <summary>
+        /// 退舱网点
+        /// </summary>
+        public string CancelAddr { get; set; }
+
+        /// <summary>
+        /// 提单签发地
+        /// </summary>
+        public string BillSignLoc { get; set; }
+
+        /// <summary>
+        /// 提单数量
+        /// </summary>
+        public int? BillCount { get; set; }
+
+        /// <summary>
+        /// 发货人性别
+        /// </summary>
+        public string ShipperSex { get; set; }
+
+        /// <summary>
+        /// 收货人性别
+        /// </summary>
+        public string ConsigneeSex { get; set; }
+
+        /// <summary>
+        /// 通知人性别
+        /// </summary>
+        public string NotifypartSex { get; set; }
+
+        /// <summary>
+        /// 订舱公司性别
+        /// </summary>
+        public string BookingSex { get; set; }
+
+        /// <summary>
+        /// 发货人内参号码
+        /// </summary>
+        public string ShipperInnerCode { get; set; }
+
+        /// <summary>
+        /// 收货人内参号码
+        /// </summary>
+        public string ConsigneeInnerCode { get; set; }
+
+        /// <summary>
+        /// 通知人内参号码
+        /// </summary>
+        public string NotifypartInnerCode { get; set; }
+
+        /// <summary>
+        /// 订舱公司内参号码
+        /// </summary>
+        public string BookingInnerCode { get; set; }
     }
 
     /// <summary>