From 6d60d7715480d62b1592cc91cdab2322cf4932f5 Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Wed, 20 Dec 2023 16:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/BBAC_BA_SERVICE.cs | 7 +---- .../Entities/BQ/INVOICE_SERVICE.cs | 28 +++++-------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 71505790..56213eb1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs @@ -235,7 +235,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！", "400"); } var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum).ConfigureAwait(false);//发票对应结算零件 - // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 + // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 //if (adjlist != null && adjlist.Count > 0) //{ // var relationList = _relationRepository.Where(p => p.BusinessType == inv.BusinessType); @@ -366,12 +366,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 if (adjlist != null && adjlist.Count > 0) { - var relationList =_relationRepository.Where(p => p.BusinessType == inv.BusinessType).ToList(); - var relist= relationList.GroupBy(p => new { p.SettleMaterialCode, p.ErpMaterialCode }).Select(p => p.FirstOrDefault()).ToList(); - - foreach (var itm in adjlist) { @@ -379,7 +375,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ itm.BusinessType= inv.BusinessType; if (itm.Qty > 0) { - bbaclist.Add(new BBAC_CAN_SA_DETAIL( guid: GuidGenerator.Create(), keyCode: itm.KeyCode, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 62fbd813..22ecc801 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -237,10 +237,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ await _exChangeCenterDbContext.BulkInsertAsync(new List() { teaTaskSub }).ConfigureAwait(false); await _exChangeCenterDbContext.BulkInsertAsync(tedsaInvs1).ConfigureAwait(false); invoiceGrp.State = SettleBillState.已提交QAD; - _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); + await _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); await BindInvoiceSyncQadAsync(teaTaskSub, invoiceGrp.RealnvBillNum, invoiceGrp.InvbillNum, invoiceGrp.ClientCode).ConfigureAwait(false); - //await _exChangeCenterDbContext.SaveChangesAsync().ConfigureAwait(false); + //await _exChangeCenterDbContext.SaveChangesAsync().ConfigureAwait(false); // var retryPolicyAsync = Policy.Handle().WaitAndRetryAsync(new[] { // TimeSpan.FromSeconds(1), // TimeSpan.FromSeconds(5), @@ -330,28 +330,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { await SubmitToQadHongChongAsync(invoiceGrp.ParentInvbillNum).ConfigureAwait(false); } - //await _exChangeCenterDbContext.Set().AddAsync(teaTaskSub).ConfigureAwait(false); - //await _exChangeCenterDbContext.Set().AddRangeAsync(tedSaInvs).ConfigureAwait(false); - //invoiceGrp.State = SettleBillState.已提交QAD; - ////构建发票同步Qad状态表数据 - //await BindInvoiceSyncQadAsync(teaTaskSub, invoiceGrp.RealnvBillNum, invoiceGrp.InvbillNum, invoiceGrp.ClientCode).ConfigureAwait(false); + await _exChangeCenterDbContext.BulkInsertAsync(new List() { teaTaskSub }).ConfigureAwait(false); await _exChangeCenterDbContext.BulkInsertAsync(tedSaInvs).ConfigureAwait(false); invoiceGrp.State = SettleBillState.已提交QAD; - _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); + await _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); await BindInvoiceSyncQadAsync(teaTaskSub, invoiceGrp.RealnvBillNum, invoiceGrp.InvbillNum, invoiceGrp.ClientCode).ConfigureAwait(false); - // await _exChangeCenterDbContext.SaveChangesAsync().ConfigureAwait(false); - // var retryPolicyAsync = Policy.Handle().WaitAndRetryAsync(new[] { - // TimeSpan.FromSeconds(1), - // TimeSpan.FromSeconds(5), - // TimeSpan.FromSeconds(5), - // TimeSpan.FromSeconds(5) - //}, (exception, timeSpan, retryCount, context) => - //{ - // _logger.LogError($"提交到QAD，修改发票状态执行失败，第 {retryCount} 次重试"); - //}); - // await retryPolicyAsync.ExecuteAsync(async () => await _settleAccountDbContext.SaveChangesAsync().ConfigureAwait(false)).ConfigureAwait(false); + } } @@ -477,7 +463,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ await _exChangeCenterDbContext.BulkInsertAsync(new List() { teaTaskSub }).ConfigureAwait(false); await _exChangeCenterDbContext.BulkInsertAsync(tedsaInvs1).ConfigureAwait(false); invoiceGrp.State = SettleBillState.已提交QAD; - _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); + await _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); await BindInvoiceSyncQadAsync(teaTaskSub, invoiceGrp.RealnvBillNum, invoiceGrp.InvbillNum, invoiceGrp.ClientCode).ConfigureAwait(false); } } @@ -549,7 +535,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ await _exChangeCenterDbContext.BulkInsertAsync(new List() { teaTaskSub }).ConfigureAwait(false); await _exChangeCenterDbContext.BulkInsertAsync(tedSaInvs).ConfigureAwait(false); invoiceGrp.State = SettleBillState.已提交QAD; - _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); + await _repository.DbContext.BulkUpdateAsync(new List() { invoiceGrp }); await BindInvoiceSyncQadAsync(teaTaskSub, invoiceGrp.RealnvBillNum, invoiceGrp.InvbillNum, invoiceGrp.ClientCode).ConfigureAwait(false); }