diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index 00e9edba..eeb4f939 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -88,6 +88,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (main != null) { + + if (main.State != SettleBillState.未结状态) { return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" }); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index 2e0d0405..60946852 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -163,7 +163,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { throw new UserFriendlyException($"提交发票状态不一致"); } - var nols = appls.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State == SettleBillState.客户已收票).ToList(); if (nols.Count > 0) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs index 66529bf2..c8a4c691 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs @@ -82,9 +82,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { priceErrors = await _service.CheckPriceList(notlist); } - - - if (priceErrors.Count > 0) { foreach (var itm in priceErrors) @@ -170,13 +167,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers await _notRepository.DbContext.BulkDeleteAsync(p_list); await _repository.DbContext.BulkInsertAsync(new List() { _entity }); await _repository.DbContext.BulkInsertAsync(_entityList); - - - - } - - return errors; }