From 1a4bac9c9b0d795eef9aa5b19d8789e13066a943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 26 Sep 2023 09:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E4=BE=9B=E4=BB=B6=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 4fe6af24..d3611ab0 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 @@ -576,6 +576,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ .GroupBy(p => new { p.LU, p.SettleGroupNum }) .Select(p => new JIT_UNSETTLED_DETAIL_DTO { LU = p.Key.LU, GroupNum = p.Key.SettleGroupNum, Qty = p.Sum(itm => itm.Qty.Value) }); entity.JIT_UNSETTLED_DETAIL = unsettledList.ToList().OrderBy(p => p.GroupNum).ThenBy(p => p.LU).ToList(); + + entity.INVOICE_MAP_GROUP =mdtos; + + + } if (first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO) { @@ -739,6 +744,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { _excel.Append(jitunsettle, "未结零件汇总"); } + if (m != null) + { + _excel.Append(m, "发票结算分组对应"); + } + + + } //jis业务,发票分组对应关系,未结数据,调整数据 if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO)