From a2a3a3eafbd966fbcabeb0c50b42182b21abff88 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Sat, 8 Jan 2022 14:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E6=97=97=E4=B8=80=E6=B1=BD=E8=BD=BF?=
=?UTF-8?q?=E8=BD=A6=E5=8F=91=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ReportServices/ReportMakeService.cs | 67 +++++++++++++++++++
.../SettleAccount.Application.xml | 21 ++++++
.../SettleAccountJobModule.cs | 31 ++++++++-
3 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
index cd2bfa3e..c137b53d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
@@ -753,6 +753,73 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
}
+ ///
+ /// H平台发运核对输出
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("HQHShippingExportService")]
+ [DisableRequestSizeLimit]
+ public async Task HQHShippingExportServiceMake(
+ HQKanbanRequestDto input
+ )
+ {
+ List customConditionList = new List();
+ 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;
+ }
+
+ ///
+ /// F平台发运核对输出
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("HQHShippingExportService")]
+ [DisableRequestSizeLimit]
+ public async Task HQFShippingExportServiceMake(
+ HQKanbanRequestDto input
+ )
+ {
+ List customConditionList = new List();
+ 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;
+ }
+
+ ///
+ /// M平台发运核对输出
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("HQMShippingExportService")]
+ [DisableRequestSizeLimit]
+ public async Task HQMShippingExportServiceMake(
+ HQKanbanRequestDto input
+ )
+ {
+ List customConditionList = new List();
+ 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;
+ }
+
+
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 15663265..2eb0f544 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -3171,6 +3171,27 @@
+
+
+ H平台发运核对输出
+
+
+
+
+
+
+ F平台发运核对输出
+
+
+
+
+
+
+ M平台发运核对输出
+
+
+
+
红旗F平台导入
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
index 716ae44c..88b662b9 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
@@ -148,6 +148,7 @@ namespace Win.Sfs.SettleAccount
{
return implementationFactory.GetService();
}
+ //红旗、一汽轿车结算报表
if (key.Equals(typeof(HQFSettledDetailDiffExportService).FullName))
{
return implementationFactory.GetService();
@@ -156,8 +157,36 @@ namespace Win.Sfs.SettleAccount
{
return implementationFactory.GetService();
}
+ if (key.Equals(typeof(HQMSettledDetailDiffExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(HQMSharePartSettledDetailDiffExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(HQHSettledDetailDiffExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(HQHSharePartSettledDetailDiffExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ //红旗、轿车发运报表
+ if (key.Equals(typeof(HQMShippingExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(HQHShippingExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(HQFShippingExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
-
else
{