From ef2c7af7886f3aa20da2372162c721be63355003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Tue, 20 Aug 2024 11:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=B7=E8=BF=90=E5=87=BA?=
 =?UTF-8?q?=E5=8F=A3=E8=AE=A2=E5=8D=95=E6=98=A0=E5=B0=84=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RulesEngineOrderBookingMainBusinessInfo.cs      | 13 +++++--------
 .../DS.WMS.Core/Op/Method/SeaExportService.cs       |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ds-wms-service/DS.Module.DjyRulesEngine/RulesEngineOrderBookingMainBusinessInfo.cs b/ds-wms-service/DS.Module.DjyRulesEngine/RulesEngineOrderBookingMainBusinessInfo.cs
index e27a549b..78736c1b 100644
--- a/ds-wms-service/DS.Module.DjyRulesEngine/RulesEngineOrderBookingMainBusinessInfo.cs
+++ b/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>
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
index 54959775..ea8f6afb 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
+++ b/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)