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 117bd11c..f447a674 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 @@ -52,12 +52,11 @@ namespace SettleAccount.Job.Services.Report var strSeStartDateTime = property.Where(p => p.Name == "SeStartDateTime").FirstOrDefault().Value; var strSeEndDateTime = property.Where(p => p.Name == "SeEndDateTime").FirstOrDefault().Value; - var businessTypeDisplayName = EnumBusinessType.JisBBAC.GetAttributeOfType()?.Name?? EnumBusinessType.JisBBAC.ToString(); var seStartDateTime = DateTime.Parse(strSeStartDateTime); var seEndDateTime = DateTime.Parse(strSeEndDateTime); var filename = exportName.FirstOrDefault(); - var excelExporter = GetSeEdiCompareData(seStartDateTime, seEndDateTime, businessTypeDisplayName); + var excelExporter = GetSeEdiCompareData(seStartDateTime, seEndDateTime, EnumBusinessType.JisBBAC); var result = excelExporter.ExportAppendDataAsByteArray(); result.ShouldNotBeNull(); _fileContainer.SaveAsync(filename, result.Result, true); 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 830d0589..40741a08 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 @@ -49,12 +49,11 @@ namespace SettleAccount.Job.Services.Report var strSeStartDateTime = property.Where(p => p.Name == "SeStartDateTime").FirstOrDefault().Value; var strSeEndDateTime = property.Where(p => p.Name == "SeEndDateTime").FirstOrDefault().Value; - var businessTypeDisplayName = EnumBusinessType.JisHBPO.GetAttributeOfType()?.Name ?? EnumBusinessType.JisHBPO.ToString(); var seStartDateTime = DateTime.Parse(strSeStartDateTime); var seEndDateTime = DateTime.Parse(strSeEndDateTime); var filename = exportName.FirstOrDefault(); - var excelExporter = GetSeEdiCompareData(seStartDateTime, seEndDateTime, businessTypeDisplayName); + var excelExporter = GetSeEdiCompareData(seStartDateTime, seEndDateTime, EnumBusinessType.JisHBPO); var result = excelExporter.ExportAppendDataAsByteArray(); result.ShouldNotBeNull(); _fileContainer.SaveAsync(filename, result.Result, true); 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 51ca667c..47bc6d7c 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 @@ -1,8 +1,10 @@ using System; +using System.ComponentModel.DataAnnotations; using System.Linq; using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.SignalR; +using Microsoft.OpenApi.Extensions; using SettleAccount.Bases; using SettleAccount.Domain.BQ; using SettleAccount.Job.SignalR; @@ -36,11 +38,12 @@ namespace SettleAccount.Job.Services.Report /// /// 获取发运、Eid比对数据 /// - public ExcelExporter GetSeEdiCompareData(DateTime seStartDateTime, DateTime seEndDateTime, string businessTypeDisplayName) + public ExcelExporter GetSeEdiCompareData(DateTime seStartDateTime, DateTime seEndDateTime, EnumBusinessType businessType) where TSe : JisSeBase where TEdi : SE_EDI where TCompareReport : SeEidCompareReport, new() { + var businessTypeDisplayName = businessType.GetAttributeOfType()?.Name ?? businessType.ToString(); // Sheet行数 var maxRowNumberOnASheet = AppConst.DefaultRowNumberOnASheet; var excelExporterAttribute = typeof(TCompareReport).GetAttribute(inherit: true); @@ -72,7 +75,9 @@ namespace SettleAccount.Job.Services.Report t.Remark = string.IsNullOrEmpty(t.SequenceNumber) ? "PJIS出单,AJIS未上" : ""; }); //无EDI有发运 - var notHaveEdiHaveSeList = _settleAccountDbContext.Set().Where(t => t.IsHaveEdiData == false) + var notHaveEdiHaveSeList = _settleAccountDbContext.Set() + .Where(t => t.BusinessType == businessType) + .Where(t => t.IsHaveEdiData == false) .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }) .Select(t => new TCompareReport() { @@ -107,7 +112,7 @@ namespace SettleAccount.Job.Services.Report LineStationCode = groupItem.Max(t => t.LineStationCode) }; var seGroup = from se in _settleAccountDbContext.Set() - where se.IsHaveEdiData == true && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime + where se.BusinessType == businessType && se.IsHaveEdiData == true && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new {