diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs index 76d3e6b7..b6552572 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs @@ -140,7 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { var jobItem = this.GetJobItem(job.Id); Guid? jobLogId = null; - // 如果作业正在运行并且心跳超过120分钟,则停止作业 + // 如果作业正在运行并且心跳超过20秒,则停止作业 if (jobItem.IsRunning && (DateTime.Now - jobItem.HeartBeat.Value).TotalMinutes > 120) { JobItemStop(jobItem.Id); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs index 30f3d749..721ed0e2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs @@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(1_000).ToList(); + .OrderBy(b => b.UID).Take(5000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -136,7 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -147,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(1_000).ToList(); + .OrderBy(b => b.UID).Take(5000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index 103ec92e..6ef2dbb7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public ExChangeCenterDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs index 2426c87e..4b1576fe 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs @@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public WMSBJBMPTDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder)