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 b182031b..fbfaca70 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 @@ -20,6 +20,7 @@ using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Uow; using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; @@ -81,6 +82,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// [HttpPost] + [UnitOfWork(false)] public virtual async Task ApprovalPassed(List p_invs) { await _invMng.SetForwardState(p_invs, SettleBillState.财务已审核); @@ -207,12 +209,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - public virtual async Task RejectAsync([FromBody] string p_invGroupNum) + public virtual async Task RejectAsync([FromBody] string p_invGroupNum) { - - bool state = await _invMng.Reject(p_invGroupNum); var entities=await _invMng.GetMainListAsync(p_invGroupNum); var entity=entities.FirstOrDefault(); + bool state = await _invMng.Reject(p_invGroupNum); if (state == true) { switch (entity.BusinessType) @@ -237,7 +238,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ break; } } - return string.Empty; + return new JsonResult(new { Code = 200, Message = "重开成功" }); ; } /// /// 同步QAD @@ -272,8 +273,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { var newinv = ls.Where(p => p.InvbillNum == inv.InvbillNum).FirstOrDefault(); inv.Tax = newinv.Tax; - inv.TaxAmt = Math.Round(inv.Amt * newinv.Tax, 2); + inv.TaxAmt = inv.Amt+ Math.Round(inv.Amt * newinv.Tax, 2); inv.RealnvBillNum = newinv.RealnvBillNum; + inv.RealAmt = newinv.RealAmt; + inv.TaxDiff = inv.TaxAmt-newinv.RealAmt; + } foreach (var detail in invdetail) {