diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs index 1024e34c..10114629 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs @@ -58,7 +58,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出JisBBAC结算、发运、Edi比对报表 /// public string ExportFile(Guid id, List exportName, List property) { @@ -123,6 +123,11 @@ namespace SettleAccount.Job.Services.Report /// /// 获取比对数据 /// + /// + /// 获取全量有结算无发运的数据 + /// 获取全量无结算有发运的数据 + /// 获取当期有结算有发运的数据 + /// public List GetEdiSeSaCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime) { //结算 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs index bfc054c1..2a08da22 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs @@ -40,7 +40,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出JisBBAC发运、Edi比对报表 /// public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs index 3c86bd10..0d616cc8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs @@ -57,7 +57,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出JisHBPO结算、发运、Edi比对报表 /// public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs index 2216b3e5..6e497e20 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs @@ -37,7 +37,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出JisHBPO发运、Edi比对报表 /// public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index b90d7cbf..b87efbb6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -58,7 +58,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出买单件BBAC结算、发运比对报表 /// public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs index dded713d..990a12a7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs @@ -58,7 +58,7 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 + /// 输出买单件HBPO结算、发运比对报表 /// public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs index 23069cb1..eee084a8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs @@ -55,15 +55,17 @@ namespace SettleAccount.Job.Services.Report } /// - /// 导出 - /// 输出报表 + /// 输出比对报表 + /// + /// + /// 直供件BBAC、直供件HBPO、配件、印度件输出比对报表 /// 结算核对明细输出 /// 结算核对汇总输出 /// 有结算有发货明细输出 /// 有结算有发货汇总输出 /// 有结算无发货明细输出 /// 有结算无发货汇总输出 - /// + /// public string ExportFile(Guid id, List exportName, List property) { var version = int.Parse(property.Where(p => p.Name == "Version").FirstOrDefault().Value); @@ -162,6 +164,11 @@ namespace SettleAccount.Job.Services.Report /// /// 获取比对数据 /// + /// + /// 获取全量有结算无发运的数据 + /// 获取全量无结算有发运的数据 + /// 获取当期有结算有发运的数据 + /// private List GetSaSeCompareData(EnumBusinessType businessType, int version) { //印度件LU对比 @@ -275,9 +282,11 @@ namespace SettleAccount.Job.Services.Report } /// - /// 获取比对数据 - /// 印度件根据客户零件号对比 + /// 获取比对数据印度件 /// + /// + /// 印度件根据客户零件号对比 + /// private List GetSaSeCompareDataYinDu(int version) { //结算 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs index af51e079..681eebdf 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs @@ -38,6 +38,11 @@ namespace SettleAccount.Job.Services.Report /// /// 获取结算、发运比对数据 /// + /// + /// 获取全量有结算无发运的数据 + /// 获取全量无结算有发运的数据 + /// 获取当期有结算有发运的数据 + /// public List GetSaSeCompareDataJis(EnumBusinessType businessType, int version, DateTime seStartDateTime, DateTime seEndDateTime) where TSaDetail : SA_BASE where TSeDetail : JisSeBase @@ -147,6 +152,12 @@ namespace SettleAccount.Job.Services.Report return haveSaHaveSeList.Union(haveSaNotHaveSeList).Union(notHaveSaHaveSeList).ToList(); } + /// + /// 区分比对类型 + /// + /// + /// 根据 是否有结算、是否有发运数据区分类型 + /// public virtual void HandlePubSaSeCompareDiffList(List saSeCompareDiffs) { saSeCompareDiffs.ForEach(p => @@ -189,6 +200,12 @@ namespace SettleAccount.Job.Services.Report /// /// 二次比对 /// + /// + /// 检索出有 有结算无发运 和 无结算有发运的数据 + /// 根据厂内零件号替换关系替换发运数据的厂内零件号 + /// 再次对比 + /// + /// 二次对比上的数据 public virtual List HandleSecondCompare(List saSeCompareDiffs, EnumBusinessType businessType) { //二次匹配上的记录 @@ -275,8 +292,10 @@ namespace SettleAccount.Job.Services.Report /// /// 结算数据处理 - /// 结算详情表写入库位、替换零件号 /// + /// + /// 对比上发运的结算数据写入库位、替换零件号(开票使用) + /// public virtual void HandleSaDetails(List saSeCompareDiffs, EnumBusinessType businessType, int version) where TCanSa : SA_CAN_BASE where TNotSa : SA_NOT_BASE @@ -319,8 +338,10 @@ namespace SettleAccount.Job.Services.Report /// /// 处理结算数据 - /// 结算、发运对比上的数据修改结算详情表匹配类型 /// + /// + /// 对比上发运的结算数据修改匹配类型 + /// public virtual void HandleSaDetailsMain(List saSeCompareDiffs, EnumBusinessType businessType, int version) where T : SA_BASE { var haveSaHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe); @@ -353,6 +374,9 @@ namespace SettleAccount.Job.Services.Report /// /// 创建导出文件结构 /// + /// + /// 根据导出Excel配置的最大行数分Sheel + /// public ExcelExporter BindExcelExporter(List saSeCompareDetailExports, string businessTypeDisplayName) where T : SaSeCompareDetailReport, new() { //详情Sheet行数 @@ -467,6 +491,5 @@ namespace SettleAccount.Job.Services.Report { _hubContext.Clients.All.ServerToClient("SaSeCompare", "refresh", ""); } - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs index af8176a3..fe740dcc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs @@ -34,6 +34,12 @@ namespace SettleAccount.Job.Services.Report _settleAccountDbContext = settleAccountDbContext; } + /// + /// 区分比对类型 + /// + /// + /// 根据 是否有结算、是否有发运、是否有Edi数据区分类型 + /// public virtual void HandleSaSeEdiCompareDiffList(List ediSeSaCompareDiffs) { ediSeSaCompareDiffs.ForEach(p => @@ -75,6 +81,12 @@ namespace SettleAccount.Job.Services.Report /// /// 二次比对 /// + /// + /// 检索出有 有结算无发运 和 无结算有发运的数据 + /// 根据厂内零件号替换关系替换发运数据的厂内零件号 + /// 再次对比 + /// + /// 二次对比上的数据 public virtual List HandleSecondCompare(List saSeEdiCompareDiffs, EnumBusinessType businessType) { //二次匹配上的记录 @@ -133,8 +145,10 @@ namespace SettleAccount.Job.Services.Report /// /// 结算数据处理 - /// 写入库位、替换零件号 /// + /// + /// 比对上发有发运的结算数据写入库位、替换零件号 + /// public virtual void HandleSaDetails(List saSeEdiCompareDiff, EnumBusinessType businessType, int version) where TCanSa : SA_CAN_BASE where TNotSa : SA_NOT_BASE @@ -177,8 +191,10 @@ namespace SettleAccount.Job.Services.Report /// /// 处理结算数据 - /// 结算、发运对比上的数据修改结算详情表匹配类型 /// + /// + /// 比对上的有发运的结算数据写入匹配类型 + /// public virtual void HandleSaDetailsMain(List saSeEdiCompareDiff, EnumBusinessType businessType, int version) where T : SA_BASE { var haveSaHaveSes = saSeEdiCompareDiff.FindAll(t => t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi || t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi); @@ -211,6 +227,9 @@ namespace SettleAccount.Job.Services.Report /// /// 创建导出文件结构 /// + /// + /// 根据单Sheel最大行数配置分Sheel页导出 + /// public ExcelExporter BindExcelExporter(List saSeEdiCompareDetailExports, string businessTypeDisplayName) where T : SaSeEdiCompareDetailReport, new() { //详情Sheet行数 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs index 96e2d553..5e7188e9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs @@ -39,9 +39,10 @@ namespace SettleAccount.Job.Services.Report /// 获取发运、Eid比对数据 /// /// - /// 输出全量的无发运的Edi数据 - /// 输出全量的无Edi的发运数据 - /// 输出检索时间段内的有Edi有发运的数据 + /// 检索全量无发运的Edi数据 + /// 检索全量无Edi的发运数据 + /// 检索时间段内有Edi有发运的数据 + /// 根据导出Excel配置的最大行数分Sheel /// public ExcelExporter GetSeEdiCompareData(DateTime seStartDateTime, DateTime seEndDateTime, EnumBusinessType businessType) where TSe : JisSeBase