diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs index ba65e4e6..7ae323ba 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs @@ -269,7 +269,7 @@ namespace Win.Sfs.SettleAccount.Bases var usepriceList = p_pricelist.Where(p => p.ClientCode == first.Site && p.IsCancel == false).ToList(); - var errorlist = _baseservice.CheckPriceListContinuity(usepriceList); + // var errorlist = _baseservice.CheckPriceListContinuity(usepriceList); var prices = p_pricelist.Where(p => p.ClientCode == p_site && p.IsCancel == false).ToList(); @@ -320,10 +320,10 @@ namespace Win.Sfs.SettleAccount.Bases keyname = "交付识别号"; break; } - foreach (var error in errorlist) - { - errorList.Add(new ERR_EXP_DTO() { ItemCode = error.LU, CustomCode = $"{name}", Message = $"LU:{error.LU},价格表开始日期:{error.BeginTime}价格表结束日期:{error.EndTime}在用价格时间段有交集或价格时间不连续!" }); - } + //foreach (var error in errorlist) + //{ + // errorList.Add(new ERR_EXP_DTO() { ItemCode = error.LU, CustomCode = $"{name}", Message = $"LU:{error.LU},价格表开始日期:{error.BeginTime}价格表结束日期:{error.EndTime}在用价格时间段有交集或价格时间不连续!" }); + //} foreach (var error in left) { errorList.Add(new ERR_EXP_DTO() { ItemCode = error.LU, CustomCode = $"{name}", Message = $"LU:{error.LU}{keyname}:{error.PN},下线日期:{error.SettleDate}没有对应区间销售价格表!" }); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index a0c11df7..92e37924 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -52,7 +52,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ public PUB_CAN_SA_SERVICE - (IExcelImportAppService excelImportService, + ( + IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs index 3c91d6b4..86ce97a5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; using System.Threading.Tasks; +using System.Transactions; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using TaskJob.EventArgs; @@ -253,6 +254,11 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs public async Task NotifyEnqueueAsync([FromForm] IFormFileCollection files, string currentApplicationName, ICurrentUser user, Type moudle, List customConditions, Action beginAction = null, Action endaction = null) { + + + + + if (beginAction != null) { beginAction(files);