From 075a430c358b4e0239ff9240a98beea53446bb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Fri, 22 Sep 2023 16:46:36 +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/PUB_CAN_SA_SERVICE.cs | 3 +++ .../src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 47c00c1f..e83e842f 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 @@ -94,6 +94,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } if (await _pubMng.SetForwardState(main, SettleBillState.已开票).ConfigureAwait(false)) { + + + var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList(); entitys = entitys.OrderBy(p => p.IndexNum).ToList(); var dto1s = ObjectMapper.Map, List>(entitys); 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 3c7267fc..8c0f8273 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 @@ -1245,7 +1245,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers var nolist = p_notlist.Where(p => !grouplist.Contains(p.GroupNum)).Select(p => p.GroupNum).ToList();//不可结分组 int count = invoiceMap.Keys.Count;//计算第几张发票计数器 - int i = 0; + int i = 1; foreach (var itm in invoiceMap)//分组影响和 { var key = itm.Key;//发票票号