Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@@ -616,6 +616,73 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
         }
 
 
+        /// <summary>
+        /// H平台发运核对输出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("HQHShippingExportService")]
+        [DisableRequestSizeLimit]
+        public async Task<string> HQHShippingExportServiceMake(
+           HQKanbanRequestDto input
+          )
+        {
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
+            customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
+            customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
+            var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) =>
+            {
+            });
+            return _taskid;
+        }
+
+        /// <summary>
+        /// F平台发运核对输出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("HQHShippingExportService")]
+        [DisableRequestSizeLimit]
+        public async Task<string> HQFShippingExportServiceMake(
+           HQKanbanRequestDto input
+          )
+        {
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
+            customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
+            customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
+            var _taskid = await _service.ExportEnqueueAsync("F平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) =>
+            {
+            });
+            return _taskid;
+        }
+
+        /// <summary>
+        /// M平台发运核对输出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("HQMShippingExportService")]
+        [DisableRequestSizeLimit]
+        public async Task<string> HQMShippingExportServiceMake(
+           HQKanbanRequestDto input
+          )
+        {
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
+            customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
+            customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
+            var _taskid = await _service.ExportEnqueueAsync("M平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) =>
+            {
+            });
+            return _taskid;
+        }
+
+
 
 
 

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@@ -3291,6 +3291,27 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQHShippingExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)">
+            <summary>
+            H平台发运核对输出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQFShippingExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)">
+            <summary>
+            F平台发运核对输出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQMShippingExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)">
+            <summary>
+            M平台发运核对输出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.SettleAccountApplicationAutoMapperProfile.CreateMapBT_Car_Platform">
             <summary>
             红旗F平台导入

src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@@ -148,6 +148,7 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<SharePartUnSettledExport>();
                     }
+                    //红旗、一汽轿车结算报表
                     if (key.Equals(typeof(HQFSettledDetailDiffExportService).FullName))
                     {
                         return implementationFactory.GetService<HQFSettledDetailDiffExportService>();
@@ -156,7 +157,35 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<HQFSharePartSettledDetailDiffExportService>();
                     }
-
+                    if (key.Equals(typeof(HQMSettledDetailDiffExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQMSettledDetailDiffExportService>();
+                    }
+                    if (key.Equals(typeof(HQMSharePartSettledDetailDiffExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQMSharePartSettledDetailDiffExportService>();
+                    }
+                    if (key.Equals(typeof(HQHSettledDetailDiffExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQHSettledDetailDiffExportService>();
+                    }
+                    if (key.Equals(typeof(HQHSharePartSettledDetailDiffExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQHSharePartSettledDetailDiffExportService>();
+                    }
+                    //红旗、轿车发运报表
+                    if (key.Equals(typeof(HQMShippingExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQMShippingExportService>();
+                    }
+                    if (key.Equals(typeof(HQHShippingExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQHShippingExportService>();
+                    }
+                    if (key.Equals(typeof(HQFShippingExportService).FullName))
+                    {
+                        return implementationFactory.GetService<HQFShippingExportService>();
+                    }
 
 
                     else