BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发运、EDI对比

master
mahao 1 year ago
parent
c0da840274
commit
7ffc29083a
7 changed files with 95 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
  2. 41
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
  3. 9
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
  4. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs
  5. 9
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
  6. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs
  7. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs

41
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Coravel.Invocable; using Coravel.Invocable;
@ -37,20 +36,20 @@ public class JisBBACSeEdiCompareAppService : ApplicationService, IInvocable
await HandDelEdiDataAsync().ConfigureAwait(false); await HandDelEdiDataAsync().ConfigureAwait(false);
var seDetailGroup = db.Set<BBAC_SE_DETAIL>().Where(t => t.IsHaveEdiData == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, LU = t.Key.CustomerPartCodeNoSpace }); var seDetailGroup = db.Set<BBAC_SE_DETAIL>().Where(t => t.IsHaveEdiData == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, t.Key.CustomerPartCodeNoSpace });
var ediDetailGroup = db.Set<BBAC_SE_EDI>().Where(t => t.IsDeleted == false).GroupBy(t => new { t.PN, t.LU }).Select(t => new { t.Key.PN, t.Key.LU }); var ediDetailGroup = db.Set<BBAC_SE_EDI>().Where(t => t.IsDeleted == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, t.Key.CustomerPartCodeNoSpace });
var keyCodes = from se in seDetailGroup var keyCodes = from se in seDetailGroup
from edi in ediDetailGroup from edi in ediDetailGroup
where se.PN == edi.PN && se.LU == edi.LU where se.PN == edi.PN && se.CustomerPartCodeNoSpace == edi.CustomerPartCodeNoSpace
select new { se.PN, se.LU }; select new { se.PN, se.CustomerPartCodeNoSpace };
var seDetailsQuery = from se in db.Set<BBAC_SE_DETAIL>() var seDetailsQuery = from se in db.Set<BBAC_SE_DETAIL>()
from keyCode in keyCodes from keyCode in keyCodes
where se.PN == keyCode.PN && se.CustomerPartCodeNoSpace == keyCode.LU && se.IsHaveEdiData == false where se.PN == keyCode.PN && se.CustomerPartCodeNoSpace == keyCode.CustomerPartCodeNoSpace && se.IsHaveEdiData == false
select se; select se;
var ediDetailsQuery = from edi in db.Set<BBAC_SE_EDI>() var ediDetailsQuery = from edi in db.Set<BBAC_SE_EDI>()
from keyCode in keyCodes from keyCode in keyCodes
where edi.PN == keyCode.PN && edi.LU == keyCode.LU && edi.IsDeleted == false && edi.IsHaveSeData == false where edi.PN == keyCode.PN && edi.CustomerPartCodeNoSpace == keyCode.CustomerPartCodeNoSpace && edi.IsDeleted == false && edi.IsHaveSeData == false
select edi; select edi;
var seDetails = seDetailsQuery.Take(5000).ToList(); var seDetails = seDetailsQuery.Take(5000).ToList();
@ -90,24 +89,38 @@ public class JisBBACSeEdiCompareAppService : ApplicationService, IInvocable
*/ */
using var serviceScope = _serviceProvider.CreateScope(); using var serviceScope = _serviceProvider.CreateScope();
var db = serviceScope.ServiceProvider.GetRequiredService<SettleAccountDbContext>(); var db = serviceScope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
var seed = 0;
while (seed < 10)
{
seed++;
//Edi 删除的数据（有发运数据） //Edi 删除的数据（有发运数据）
var ediDelKeyCodes = db.Set<BBAC_SE_EDI>().Where(t => t.IsDeleted == true && t.IsHaveSeData == true).Select(t => new { t.PN, t.LU }).Distinct().ToList(); var ediDelKeyCodes = db.Set<HBPO_SE_EDI>().Where(t => t.IsDeleted == true && t.IsHaveSeData == true).GroupBy(t => t.PN).Select(t => t.Key).Take(1000).ToList();
if (ediDelKeyCodes.Any()) if (ediDelKeyCodes.Any())
{ {
var seDetails = db.Set<BBAC_SE_DETAIL>().Join(ediDelKeyCodes, a => new { a.PN, LU = a.CustomerPartCodeNoSpace }, b => new { b.PN, b.LU }, (a, b) => a); var seDetails = db.Set<HBPO_SE_DETAIL>()
var ediDetails = db.Set<BBAC_SE_EDI>().Join(ediDelKeyCodes, a => new { a.PN, a.LU }, b => new { b.PN, b.LU }, (a, b) => a); .Where(t => t.IsHaveEdiData == true)
.Where(t => ediDelKeyCodes.Contains(t.PN))
.ToList();
if (seDetails.Any()) if (seDetails.Any())
{ {
seDetails.ForEach(t => t.IsHaveEdiData = false); seDetails.ForEach(t => t.IsHaveEdiData = false);
db.Set<BBAC_SE_DETAIL>().UpdateRange(seDetails); await db.BulkUpdateAsync<HBPO_SE_DETAIL>(seDetails).ConfigureAwait(false);
} }
var ediDetails = db.Set<HBPO_SE_EDI>()
.Where(t => t.IsHaveSeData == true)
.Where(t => ediDelKeyCodes.Contains(t.PN))
.ToList();
if (ediDetails.Any()) if (ediDetails.Any())
{ {
ediDetails.ForEach(t => t.IsHaveSeData = false); ediDetails.ForEach(t => t.IsHaveSeData = false);
db.Set<BBAC_SE_EDI>().UpdateRange(ediDetails); await db.BulkUpdateAsync<HBPO_SE_EDI>(ediDetails).ConfigureAwait(false);
}
}
else
{
break;
} }
await db.SaveChangesAsync().ConfigureAwait(false);
} }
} }
} }

41
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Dynamic.Core; using System.Linq.Dynamic.Core;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -38,20 +37,20 @@ public class JisHBPOSeEdiCompareAppService : ApplicationService, IInvocable
await HandDelEdiDataAsync().ConfigureAwait(false); await HandDelEdiDataAsync().ConfigureAwait(false);
var seDetailGroup = db.Set<HBPO_SE_DETAIL>().Where(t => t.IsHaveEdiData == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, LU = t.Key.CustomerPartCodeNoSpace }); var seDetailGroup = db.Set<HBPO_SE_DETAIL>().Where(t => t.IsHaveEdiData == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, t.Key.CustomerPartCodeNoSpace });
var ediDetailGroup = db.Set<HBPO_SE_EDI>().Where(t => t.IsDeleted == false && t.IsHaveSeData == false).GroupBy(t => new { t.PN, t.LU }).Select(t => new { t.Key.PN, t.Key.LU }); var ediDetailGroup = db.Set<HBPO_SE_EDI>().Where(t => t.IsDeleted == false && t.IsHaveSeData == false).GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace }).Select(t => new { t.Key.PN, t.Key.CustomerPartCodeNoSpace });
var keyCodes = from se in seDetailGroup var keyCodes = from se in seDetailGroup
from edi in ediDetailGroup from edi in ediDetailGroup
where se.PN == edi.PN && se.LU == edi.LU where se.PN == edi.PN && se.CustomerPartCodeNoSpace == edi.CustomerPartCodeNoSpace
select new { se.PN, se.LU }; select new { se.PN, se.CustomerPartCodeNoSpace };
var seDetailsQuery = from se in db.Set<HBPO_SE_DETAIL>() var seDetailsQuery = from se in db.Set<HBPO_SE_DETAIL>()
from keyCode in keyCodes from keyCode in keyCodes
where se.PN == keyCode.PN && se.CustomerPartCodeNoSpace == keyCode.LU && se.IsHaveEdiData == false where se.PN == keyCode.PN && se.CustomerPartCodeNoSpace == keyCode.CustomerPartCodeNoSpace && se.IsHaveEdiData == false
select se; select se;
var ediDetailsQuery = from edi in db.Set<HBPO_SE_EDI>() var ediDetailsQuery = from edi in db.Set<HBPO_SE_EDI>()
from keyCode in keyCodes from keyCode in keyCodes
where edi.PN == keyCode.PN && edi.LU == keyCode.LU && edi.IsDeleted == false && edi.IsHaveSeData == false where edi.PN == keyCode.PN && edi.CustomerPartCodeNoSpace == keyCode.CustomerPartCodeNoSpace && edi.IsDeleted == false && edi.IsHaveSeData == false
select edi; select edi;
var seDetails = seDetailsQuery.Take(5000).ToList(); var seDetails = seDetailsQuery.Take(5000).ToList();
@ -85,24 +84,38 @@ public class JisHBPOSeEdiCompareAppService : ApplicationService, IInvocable
{ {
using var serviceScope = _serviceProvider.CreateScope(); using var serviceScope = _serviceProvider.CreateScope();
var db = serviceScope.ServiceProvider.GetRequiredService<SettleAccountDbContext>(); var db = serviceScope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
var seed = 0;
while (seed < 10)
{
seed++;
//Edi 删除的数据（有发运数据） //Edi 删除的数据（有发运数据）
var ediDelKeyCodes = db.Set<HBPO_SE_EDI>().Where(t => t.IsDeleted == true && t.IsHaveSeData == true).Select(t => new { t.PN, t.LU }).Distinct().ToList(); var ediDelKeyCodes = db.Set<HBPO_SE_EDI>().Where(t => t.IsDeleted == true && t.IsHaveSeData == true).GroupBy(t => t.PN).Select(t => t.Key).Take(1000).ToList();
if (ediDelKeyCodes.Any()) if (ediDelKeyCodes.Any())
{ {
var seDetails = db.Set<HBPO_SE_DETAIL>().Join(ediDelKeyCodes, a => new { a.PN, LU = a.CustomerPartCodeNoSpace }, b => new { b.PN, b.LU }, (a, b) => a); var seDetails = db.Set<HBPO_SE_DETAIL>()
var ediDetails = db.Set<HBPO_SE_EDI>().Join(ediDelKeyCodes, a => new { a.PN, a.LU }, b => new { b.PN, b.LU }, (a, b) => a); .Where(t => t.IsHaveEdiData == true)
.Where(t => ediDelKeyCodes.Contains(t.PN))
.ToList();
if (seDetails.Any()) if (seDetails.Any())
{ {
seDetails.ForEach(t => t.IsHaveEdiData = false); seDetails.ForEach(t => t.IsHaveEdiData = false);
db.Set<HBPO_SE_DETAIL>().UpdateRange(seDetails); await db.BulkUpdateAsync<HBPO_SE_DETAIL>(seDetails).ConfigureAwait(false);
} }
var ediDetails = db.Set<HBPO_SE_EDI>()
.Where(t => t.IsHaveSeData == true)
.Where(t => ediDelKeyCodes.Contains(t.PN))
.ToList();
if (ediDetails.Any()) if (ediDetails.Any())
{ {
ediDetails.ForEach(t => t.IsHaveSeData = false); ediDetails.ForEach(t => t.IsHaveSeData = false);
db.Set<HBPO_SE_EDI>().UpdateRange(ediDetails); await db.BulkUpdateAsync<HBPO_SE_EDI>(ediDetails).ConfigureAwait(false);
}
}
else
{
break;
} }
await db.SaveChangesAsync().ConfigureAwait(false);
} }
} }
} }

9
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
View File

@ -149,16 +149,17 @@ namespace SettleAccount.Job.Services.Report
//Edi //Edi
var ediGroup = from edi in _settleAccountDbContext.Set<BBAC_SE_EDI>() var ediGroup = from edi in _settleAccountDbContext.Set<BBAC_SE_EDI>()
where edi.IsDeleted == false && edi.IsHaveSeData == true where edi.IsDeleted == false && edi.IsHaveSeData == true
group edi by new { edi.PN, edi.LU } into groupItem group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem
select new select new
{ {
groupItem.Key.PN, groupItem.Key.PN,
groupItem.Key.LU, groupItem.Key.CustomerPartCodeNoSpace,
Qty = groupItem.Sum(t => t.Qty) Qty = groupItem.Sum(t => t.Qty),
LU = groupItem.Max(t => t.LU)
}; };
var seEdiGroup = from se in seGroup var seEdiGroup = from se in seGroup
join edi in ediGroup join edi in ediGroup
on new { se.PN, se.CustomerPartCodeNoSpace } equals new { edi.PN, CustomerPartCodeNoSpace = edi.LU } on new { se.PN, se.CustomerPartCodeNoSpace } equals new { edi.PN, edi.CustomerPartCodeNoSpace }
into ediTemp into ediTemp
from edi in ediTemp.DefaultIfEmpty() from edi in ediTemp.DefaultIfEmpty()
select new select new

12
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs
View File

@ -77,7 +77,7 @@ namespace SettleAccount.Job.Services.Report
//有EDI无发运 //有EDI无发运
var haveEdiNotHaveSeList = _settleAccountDbContext.Set<BBAC_SE_EDI>().Where(t => t.IsHaveSeData == false) var haveEdiNotHaveSeList = _settleAccountDbContext.Set<BBAC_SE_EDI>().Where(t => t.IsHaveSeData == false)
.GroupBy(t => new { t.LU, t.PN }) .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace })
.Select(t => new JisBBACEidSeCompareExport() .Select(t => new JisBBACEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",
@ -86,7 +86,7 @@ namespace SettleAccount.Job.Services.Report
SequenceNumber = t.Max(t => t.Extend3), SequenceNumber = t.Max(t => t.Extend3),
ParType = t.Max(t => t.Extend2), ParType = t.Max(t => t.Extend2),
PN = t.Key.PN, PN = t.Key.PN,
MaterialNumber = t.Key.LU, MaterialNumber = t.Max(t => t.LU),
EdiQty = t.Sum(t => t.Qty), EdiQty = t.Sum(t => t.Qty),
AssemblyDate = default, AssemblyDate = default,
MatchNumber = default, MatchNumber = default,
@ -95,7 +95,7 @@ namespace SettleAccount.Job.Services.Report
}).ToList(); }).ToList();
//无EDI有发运 //无EDI有发运
var notHaveEdiHaveSeList = _settleAccountDbContext.Set<BBAC_SE_DETAIL>().Where(t => t.IsHaveEdiData == false) var notHaveEdiHaveSeList = _settleAccountDbContext.Set<BBAC_SE_DETAIL>().Where(t => t.IsHaveEdiData == false)
.GroupBy(t => new { t.CustomerPartCodeNoSpace, t.PN }) .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace })
.Select(t => new JisBBACEidSeCompareExport() .Select(t => new JisBBACEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",
@ -115,11 +115,11 @@ namespace SettleAccount.Job.Services.Report
//有EDI有发运 //有EDI有发运
var ediGroup = from edi in _settleAccountDbContext.Set<BBAC_SE_EDI>() var ediGroup = from edi in _settleAccountDbContext.Set<BBAC_SE_EDI>()
where edi.IsDeleted == false && edi.IsHaveSeData == true where edi.IsDeleted == false && edi.IsHaveSeData == true
group edi by new { edi.PN, edi.LU } into groupItem group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem
select new select new
{ {
groupItem.Key.PN, groupItem.Key.PN,
groupItem.Key.LU, groupItem.Key.CustomerPartCodeNoSpace,
Qty = groupItem.Sum(t => t.Qty), Qty = groupItem.Sum(t => t.Qty),
Extend2 = groupItem.Max(t => t.Extend2), Extend2 = groupItem.Max(t => t.Extend2),
Extend3 = groupItem.Max(t => t.Extend3), Extend3 = groupItem.Max(t => t.Extend3),
@ -146,7 +146,7 @@ namespace SettleAccount.Job.Services.Report
}; };
var haveEdiHaveSeList = (from edi in ediGroup var haveEdiHaveSeList = (from edi in ediGroup
join se in seGroup join se in seGroup
on new { edi.PN, edi.LU } equals new { se.PN, LU = se.CustomerPartCodeNoSpace } on new { edi.PN, edi.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
select new JisBBACEidSeCompareExport() select new JisBBACEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",

9
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
View File

@ -164,16 +164,17 @@ namespace SettleAccount.Job.Services.Report
//Edi //Edi
var ediGroup = from edi in _settleAccountDbContext.Set<HBPO_SE_EDI>() var ediGroup = from edi in _settleAccountDbContext.Set<HBPO_SE_EDI>()
where edi.IsDeleted == false && edi.IsHaveSeData == true where edi.IsDeleted == false && edi.IsHaveSeData == true
group edi by new { edi.PN, edi.LU } into groupItem group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem
select new select new
{ {
groupItem.Key.PN, groupItem.Key.PN,
groupItem.Key.LU, groupItem.Key.CustomerPartCodeNoSpace,
Qty = groupItem.Sum(t => t.Qty) Qty = groupItem.Sum(t => t.Qty),
LU = groupItem.Max(t => t.LU)
}; };
var seEdiGroup = from se in seGroup var seEdiGroup = from se in seGroup
join edi in ediGroup join edi in ediGroup
on new { se.PN, se.CustomerPartCodeNoSpace } equals new { edi.PN, CustomerPartCodeNoSpace = edi.LU } on new { se.PN, se.CustomerPartCodeNoSpace } equals new { edi.PN, edi.CustomerPartCodeNoSpace }
into ediTemp into ediTemp
from edi in ediTemp.DefaultIfEmpty() from edi in ediTemp.DefaultIfEmpty()
select new select new

12
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSeEdiCompareExportService.cs
View File

@ -74,7 +74,7 @@ namespace SettleAccount.Job.Services.Report
//有EDI无发运 //有EDI无发运
var haveEdiNotHaveSeList = _settleAccountDbContext.Set<HBPO_SE_EDI>().Where(t => t.IsHaveSeData == false) var haveEdiNotHaveSeList = _settleAccountDbContext.Set<HBPO_SE_EDI>().Where(t => t.IsHaveSeData == false)
.GroupBy(t => new { t.LU, t.PN }) .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace })
.Select(t => new JisHBPOEidSeCompareExport() .Select(t => new JisHBPOEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",
@ -83,7 +83,7 @@ namespace SettleAccount.Job.Services.Report
SequenceNumber = t.Max(t => t.SeqNumber), SequenceNumber = t.Max(t => t.SeqNumber),
ParType = "01", ParType = "01",
PN = t.Key.PN, PN = t.Key.PN,
MaterialNumber = t.Key.LU, MaterialNumber = t.Max(t => t.LU),
EdiQty = t.Sum(t => t.Qty), EdiQty = t.Sum(t => t.Qty),
AssemblyDate = default, AssemblyDate = default,
MatchNumber = default, MatchNumber = default,
@ -92,7 +92,7 @@ namespace SettleAccount.Job.Services.Report
}).ToList(); }).ToList();
//无EDI有发运 //无EDI有发运
var notHaveEdiHaveSeList = _settleAccountDbContext.Set<HBPO_SE_DETAIL>().Where(t => t.IsHaveEdiData == false) var notHaveEdiHaveSeList = _settleAccountDbContext.Set<HBPO_SE_DETAIL>().Where(t => t.IsHaveEdiData == false)
.GroupBy(t => new { t.CustomerPartCodeNoSpace, t.PN }) .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace })
.Select(t => new JisHBPOEidSeCompareExport() .Select(t => new JisHBPOEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",
@ -114,11 +114,11 @@ namespace SettleAccount.Job.Services.Report
//有EDI有发运 //有EDI有发运
var ediGroup = from edi in _settleAccountDbContext.Set<HBPO_SE_EDI>() var ediGroup = from edi in _settleAccountDbContext.Set<HBPO_SE_EDI>()
where edi.IsDeleted == false && edi.IsHaveSeData == true where edi.IsDeleted == false && edi.IsHaveSeData == true
group edi by new { edi.PN, edi.LU } into groupItem group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem
select new select new
{ {
groupItem.Key.PN, groupItem.Key.PN,
groupItem.Key.LU, groupItem.Key.CustomerPartCodeNoSpace,
Qty = groupItem.Sum(t => t.Qty), Qty = groupItem.Sum(t => t.Qty),
SeqNumber = groupItem.Max(t => t.SeqNumber) SeqNumber = groupItem.Max(t => t.SeqNumber)
}; };
@ -143,7 +143,7 @@ namespace SettleAccount.Job.Services.Report
}; };
var haveEdiHaveSeList = (from edi in ediGroup var haveEdiHaveSeList = (from edi in ediGroup
join se in seGroup join se in seGroup
on new { edi.PN, edi.LU } equals new { se.PN, LU = se.CustomerPartCodeNoSpace } on new { edi.PN, edi.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
select new JisHBPOEidSeCompareExport() select new JisHBPOEidSeCompareExport()
{ {
Category = "JIS", Category = "JIS",

11
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs
View File

@ -4,10 +4,10 @@ using EFCore.BulkExtensions;
using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Core.Extension;
using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore;
using SettleAccount.Bases; using SettleAccount.Bases;
using SettleAccount.Domain.BQ; using SettleAccount.Domain.BQ;
using SettleAccount.Job.SignalR; using SettleAccount.Job.SignalR;
using Volo.Abp;
using Win.Sfs.SettleAccount; using Win.Sfs.SettleAccount;
using Win.Sfs.SettleAccount.Consts; using Win.Sfs.SettleAccount.Consts;
using Win.Sfs.SettleAccount.Enums; using Win.Sfs.SettleAccount.Enums;
@ -184,9 +184,10 @@ namespace SettleAccount.Job.Services.Report
if (haveSaHaveSes.Any()) if (haveSaHaveSes.Any())
{ {
//结算详情 //结算详情
var saDetails = (from sa in _settleAccountDbContext.Set<T>() var saDetails = _settleAccountDbContext.Set<T>()
where sa.BusinessType == businessType && sa.Version == version .Where(t => t.BusinessType == businessType)
select sa).ToList(); .Where(t => t.Version == version)
.ToList();
if (saDetails.Any()) if (saDetails.Any())
{ {
var saDetailsUpdate = saDetails.Join(haveSaHaveSes, o => new { o.PN, o.LU }, i => new { i.PN, LU = i.CustomerPartCode }, (o, i) => var saDetailsUpdate = saDetails.Join(haveSaHaveSes, o => new { o.PN, o.LU }, i => new { i.PN, LU = i.CustomerPartCode }, (o, i) =>
@ -202,6 +203,8 @@ namespace SettleAccount.Job.Services.Report
return o; return o;
}).ToList(); }).ToList();
_settleAccountDbContext.BulkUpdate(saDetailsUpdate); _settleAccountDbContext.BulkUpdate(saDetailsUpdate);
_settleAccountDbContext.Set<BBAC_SA_DETAIL>().FromSqlInterpolated($"SELECT * FROM dbo.Blogs");
_settleAccountDbContext.Database.ExecuteSqlInterpolated($"SELECT * FROM dbo.Blogs");
} }
} }
} }

Write Preview
Loading…
Cancel
Save