Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs

@@ -98,7 +98,7 @@ namespace SettleAccount.Job.Services.Report
 
         #region 私有方法
         /// <summary>
-        /// 获取结算与发运比对数据
+        /// 获取比对数据
         /// </summary>
         public List<SaSeEdiCompareDiff> GetEdiSeSaCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime)
         {

code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs

@@ -97,7 +97,7 @@ namespace SettleAccount.Job.Services.Report
 
         #region 私有方法
         /// <summary>
-        /// 获取结算与发运比对数据
+        /// 获取比对数据
         /// </summary>
         public List<SaSeEdiCompareDiff> GetEdiSeSaCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime)
         {

code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobAutoMapperProfile.cs

@@ -8,14 +8,15 @@ namespace SettleAccount.Job
     {
         public SettleAccountJobAutoMapperProfile()
         {
-            CreateMapBBACEdiSeCompare();
+            CreateMapEdiSeCompare();
-            CreateMapPubSaSeCompare();
+            CreateMapSaSeEdiCompare();
+            CreateMapSaSeCompare();
         }
 
         /// <summary>
-        /// BBAC EDI与发运对比
+        /// 发运、EDI对比
         /// </summary>
-        public void CreateMapBBACEdiSeCompare()
+        public void CreateMapEdiSeCompare()
         {
             //CreateMap<PubSaSeCompareDiff, JisBBACEidSeCompareExport>()
             //    .ForMember(x => x.ReplaceLU, y => y.MapFrom(y => y.ReplaceLU));
@@ -23,9 +24,18 @@ namespace SettleAccount.Job
         }
 
         /// <summary>
-        /// Pub结算与发运对比
+        /// 结算、发运、Edi对比
         /// </summary>
-        private void CreateMapPubSaSeCompare()
+        public void CreateMapSaSeEdiCompare()
+        {
+            CreateMap<SaSeEdiCompareDiff, SaSeEdiCompareDetailExportJisBBAC>();
+            CreateMap<SaSeEdiCompareDiff, SaSeEdiCompareDetailExportJisHBPO>();
+        }
+
+        /// <summary>
+        /// 结算、发运对比
+        /// </summary>
+        private void CreateMapSaSeCompare()
         {
             CreateMap<PubSaSeCompareDiff, PubSaSeCompareDetailExportZhiGongJianBBAC>();
             CreateMap<PubSaSeCompareDiff, PubSaSeCompareDetailExportZhiGongJianHBPO>();