bairubing/VistarStarDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bairubing:7f0a44400fc272f1f6bba273b1c5610730f9b404
Branches Tags
bairubing:main
..
compare: bairubing:0ac2aaf1718bb9920f2619307f53852282d96548
Branches Tags
bairubing:main

No commits in common. "7f0a44400fc272f1f6bba273b1c5610730f9b404" and "0ac2aaf1718bb9920f2619307f53852282d96548" have entirely different histories.
7f0a44400f ... 0ac2aaf171

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
admin.net.pro/Admin.NET/Vistar.Application/Common/DataValidationService.cs
View File

@ -282,7 +282,7 @@ public class DataValidationService : IDynamicApiController, ITransient
{
var contrastNewData = await _obj137Rep.AsQueryable().Where(x => x.RecordGuid == recordGuid && x.deleted == false && x.VersionIndex == newVersion).FirstAsync();
var contrastOlderData = await _obj137Rep.AsQueryable().Where(x => x.RecordGuid == recordGuid && x.deleted == false && x.VersionIndex == olderVersion).FirstAsync();
if (contrastNewData.revision != contrastOlderData.revision)
if (contrastNewData.revision == contrastOlderData.revision)
{
contrastResult = "是";
}

4
admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs
View File

@ -79,7 +79,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
public async Task<SqlSugarPagedList<ChangeNoticeEcnOutput>> Page(PageChangeNoticeEcnInput input)
{
var query = await _obj118Rep.AsQueryable()
.Where(x => x.CheckedStatus == 1 && x.deleted == false && x.IsLatestVersion == true && x._System_CurrentStage == "标准化审核")
.Where(x => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && x._System_CurrentStage == "结束")
.WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim()))
.WhereIF(input.fld004693Range != null && input.fld004693Range.Length == 2, u => u.fld004693 >= input.fld004693Range[0] && u.fld004693 <= input.fld004693Range[1])
.Select<ChangeNoticeEcnOutput>()
@ -219,7 +219,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
public async Task<List<SapOutput>> TimingSyncToSAP()
{
var input = await _obj118Rep.AsQueryable()
.Where(x => x.CheckedStatus == 1 && x._System_CurrentStage == "标准化审核" && x.deleted == false && x.IsLatestVersion == true && x.fld005292 == "A")
.Where(x => x.CheckedStatus == 0 && x._System_CurrentStage == "结束" && x.deleted == false && x.IsLatestVersion == true && x.fld005292 == "A")
.ToListAsync();
var SapOutputList = new List<SapOutput>();
var Requser = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SapUserName);