diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
index 7d5811c0..469dff81 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
@@ -25,6 +25,8 @@ namespace SettleAccount.Domain.BQ
///
[Display(Name = "状态")]
public string State { get; set; } = null!;
+ [Display(Name = "其他状态")]
+ public string StateOther { get; set; } = null!;
///
/// 选择工厂导入
///
@@ -36,13 +38,14 @@ namespace SettleAccount.Domain.BQ
[Display(Name = "业务类型")]
public EnumBusinessType BusinessType { get; set; }
- public BBAC_SA(Guid guid, int version, string billNum, string dNBillNum, string state) : base(guid)
+ public BBAC_SA(Guid guid, int version, string billNum, string dNBillNum, string state,string stateOther) : base(guid)
{
Version = version;
BillNum = billNum;
DNBillNum = dNBillNum;
State = state;
+ StateOther = stateOther;
}
public BBAC_SA() : base()
{
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 483045f9..452c869e 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
@@ -115,6 +115,15 @@ namespace SettleAccount.Job.Services.Report
result.ShouldNotBeNull();
_fileContainer.SaveAsync(filename, result.Result, true);
+ //比对完成后更新状态
+ var pubSaEntityList = _settleAccountDbContext.Set().Where(t => t.Version == version && t.BusinessType == businessType).ToList();
+ foreach (var item in pubSaEntityList)
+ {
+ item.State = "2";
+ }
+
+ _settleAccountDbContext.SaveChanges();
+
Notify();
return id.ToString();
}
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 d689d65b..7f7ed6af 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
@@ -128,6 +128,15 @@ namespace SettleAccount.Job.Services.Report
result.ShouldNotBeNull();
_fileContainer.SaveAsync(filename, result.Result, true);
+ //比对完成后更新状态
+ var pubSaEntityList = _settleAccountDbContext.Set().Where(t => t.Version == version && t.BusinessType == businessType).ToList();
+ foreach (var item in pubSaEntityList)
+ {
+ item.StateOther = "2";
+ }
+
+ _settleAccountDbContext.SaveChanges();
+
Notify();
return id.ToString();
}
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 990a12a7..ff84c1e0 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
@@ -114,6 +114,15 @@ namespace SettleAccount.Job.Services.Report
result.ShouldNotBeNull();
_fileContainer.SaveAsync(filename, result.Result, true);
+ //比对完成后更新状态
+ var pubSaEntityList = _settleAccountDbContext.Set().Where(t => t.Version == version && t.BusinessType == businessType).ToList();
+ foreach (var item in pubSaEntityList)
+ {
+ item.State = "2";
+ }
+
+ _settleAccountDbContext.SaveChanges();
+
Notify();
return id.ToString();
}
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 8e74be04..ce773686 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
@@ -4,12 +4,14 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
using Microsoft.OpenApi.Extensions;
using SettleAccount.Domain.BQ;
using SettleAccount.Job.SignalR;
using Shouldly;
using TaskJob.EventArgs;
using TaskJob.Interfaces;
+using Volo.Abp;
using Volo.Abp.BlobStoring;
using Volo.Abp.DependencyInjection;
using Volo.Abp.ObjectMapping;
@@ -27,6 +29,10 @@ namespace SettleAccount.Job.Services.Report
///
public class PubSaSeCompareExportService : SaSeCompareExportBaseService, ITransientDependency, IExportJob
{
+ ///
+ /// PUB结算仓储
+ ///
+ //private readonly INormalEfCoreRepository _pubSaRepository;
///
/// DbContext
///
@@ -47,11 +53,18 @@ namespace SettleAccount.Job.Services.Report
IHubContext hubContext,
SettleAccountDbContext settleAccountDbContext,
IBlobContainer fileContainer,
- IObjectMapper objectMapper) : base(hubContext, settleAccountDbContext)
+ IObjectMapper objectMapper,
+ INormalEfCoreRepository pubSaRepository
+
+ ) : base(hubContext, settleAccountDbContext
+
+
+ )
{
_settleAccountDbContext = settleAccountDbContext;
_fileContainer = fileContainer;
_objectMapper = objectMapper;
+ //_pubSaRepository = pubSaRepository;
}
///
@@ -156,6 +169,16 @@ namespace SettleAccount.Job.Services.Report
result.ShouldNotBeNull();
_fileContainer.SaveAsync(filename, result.Result, true);
+ //比对完成后更新状态
+ var pubSaEntityList = _settleAccountDbContext.Set().Where(t => t.Version == version&&t.BusinessType== businessType).ToList();
+ foreach(var item in pubSaEntityList)
+ {
+ item.State = "2";
+ }
+
+ _settleAccountDbContext.SaveChanges();
+
+
Notify();
return id.ToString();
}