From 33fdefe7be48e5a14402149b7a5bd34a0623b8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 16 Aug 2023 10:41:33 +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 --- .../src/SettleAccount.Application/Bases/BA_SERVICE.cs | 3 +++ .../SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 038f321a..89c383c0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -150,9 +150,12 @@ namespace Win.Sfs.SettleAccount.Bases var wdtos = ObjectMapper.Map, List>(w); var s = await _sRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); var sdtos = ObjectMapper.Map, List>(s); + var adjs = await _adjRepository.GetListByFilterAsync(input.Filters); + var adjdtos = ObjectMapper.Map, List>(adjs); entity.INVOICE_NOT_SETTLE = sdtos; entity.INVOICE_WAIT_DETAIL = wdtos; entity.INVOICE_MAP_GROUP = mdtos; + entity.ADJ_DETAIL = adjdtos; return entity; } /// 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 bbf9415f..1934be47 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 @@ -81,7 +81,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ throw new UserFriendlyException($"选择发票:{p_invbillnum}对应的可结算单不在请检查!"); } - version = settle.Version; if (inv != null) {