Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.Module.DjyRulesEngine/RulesEngineOrderBookingMainBusinessInfo.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DS.Module.DjyRulesEngine
+namespace DS.Module.DjyRulesEngine
 {
     /// <summary>
     /// 
@@ -31,7 +25,10 @@ namespace DS.Module.DjyRulesEngine
         /// 客户合同号
         /// </summary>
         public string ServContrNo { get; set; }
-
+        /// <summary>
+        /// 运费协议号(约号)
+        /// </summary>
+        public string ContractNo { get; set; }
         /// <summary>
         /// 发货人代码
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -207,6 +207,7 @@ public partial class SeaExportService : ISeaExportService
         //映射规则引擎
         TypeAdapterConfig<SeaExport, RulesEngineOrderBookingMainBusinessInfo>
                .NewConfig()
+               .Map(dto => dto.ContrNo, poco => poco.ContractNo)
                .Map(dto => dto.MasterBlNo, poco => poco.MBLNO)
                .Map(dto => dto.HouseBlNo, poco => poco.HBLNO)
                .Map(dto => dto.BookingNo, poco => poco.BookingNo)