|
@ -5,6 +5,7 @@ using System.Linq; |
|
|
using System.Linq.Dynamic.Core; |
|
|
using System.Linq.Dynamic.Core; |
|
|
using Magicodes.ExporterAndImporter.Excel; |
|
|
using Magicodes.ExporterAndImporter.Excel; |
|
|
using Microsoft.AspNetCore.SignalR; |
|
|
using Microsoft.AspNetCore.SignalR; |
|
|
|
|
|
using Microsoft.Extensions.Logging; |
|
|
using Microsoft.OpenApi.Extensions; |
|
|
using Microsoft.OpenApi.Extensions; |
|
|
using SettleAccount.Domain.BQ; |
|
|
using SettleAccount.Domain.BQ; |
|
|
using SettleAccount.Job.SignalR; |
|
|
using SettleAccount.Job.SignalR; |
|
@ -27,6 +28,7 @@ namespace SettleAccount.Job.Services.Report |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
public class MaiDanBBACSaSeCompareExportService : SaSeCompareExportBaseService, ITransientDependency, IExportJob |
|
|
public class MaiDanBBACSaSeCompareExportService : SaSeCompareExportBaseService, ITransientDependency, IExportJob |
|
|
{ |
|
|
{ |
|
|
|
|
|
private readonly ILogger<MaiDanBBACSaSeCompareExportService> _logger; |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// 业务类型
|
|
|
/// 业务类型
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
@ -48,11 +50,13 @@ namespace SettleAccount.Job.Services.Report |
|
|
/// 构造
|
|
|
/// 构造
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
public MaiDanBBACSaSeCompareExportService( |
|
|
public MaiDanBBACSaSeCompareExportService( |
|
|
|
|
|
ILogger<MaiDanBBACSaSeCompareExportService> logger, |
|
|
IHubContext<PageHub> hubContext, |
|
|
IHubContext<PageHub> hubContext, |
|
|
IBlobContainer<MyFileContainer> fileContainer, |
|
|
IBlobContainer<MyFileContainer> fileContainer, |
|
|
IObjectMapper objectMapper, |
|
|
IObjectMapper objectMapper, |
|
|
SettleAccountDbContext settleAccountDbContext) : base(hubContext, settleAccountDbContext) |
|
|
SettleAccountDbContext settleAccountDbContext) : base(hubContext, settleAccountDbContext) |
|
|
{ |
|
|
{ |
|
|
|
|
|
_logger = logger; |
|
|
_fileContainer = fileContainer; |
|
|
_fileContainer = fileContainer; |
|
|
_objectMapper = objectMapper; |
|
|
_objectMapper = objectMapper; |
|
|
_settleAccountDbContext = settleAccountDbContext; |
|
|
_settleAccountDbContext = settleAccountDbContext; |
|
@ -309,6 +313,7 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
|
|
|
|
|
foreach ((var key, var value) in matchPNs) |
|
|
foreach ((var key, var value) in matchPNs) |
|
|
{ |
|
|
{ |
|
|
|
|
|
_logger.LogInformation($"买单件BBAC三次对比:【{key}】-【{value}】"); |
|
|
//获取二次比对上的数据
|
|
|
//获取二次比对上的数据
|
|
|
var threeMatchHaveSaHaveSesItem = (from notHaveSaHaveSe in notHaveSaHaveSes.Where(t => t.PN == key) |
|
|
var threeMatchHaveSaHaveSesItem = (from notHaveSaHaveSe in notHaveSaHaveSes.Where(t => t.PN == key) |
|
|
join haveSaNotHaveSe in haveSaNotHaveSes.Where(t => t.PN == value) |
|
|
join haveSaNotHaveSe in haveSaNotHaveSes.Where(t => t.PN == value) |
|
|