From a5bfb5a0b7d062ab0f1df0da980a17c539773c44 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 16:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B0=E5=BA=A6=E4=BB=B6=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 35d20ef6..6de6f8ca 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 @@ -581,8 +581,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ SettleGroupNum = p.FirstOrDefault().SettleGroupNum, } ); - if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC)//BBAC直供未结 + if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType==EnumBusinessType.YinDuJian)//BBAC直供未结 { + entity.INVOICE_MAP_GROUP = mdtos; //var all = entity.INVOICE_NOT_SETTLE.Select(p => p.SettleGroupNum).Distinct().ToList();//全部分组号 //var part = mquery.ToList().Select(p => p.SettleGroupNum).Distinct().ToList();//发票对应分组号 //var unsettled = all.Where(p => !part.Contains(p));//排除发票对应分组号，都为不可结 @@ -747,12 +748,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _excel.Append(hbpounsettle, "未结零件汇总"); } } - if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC) + if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType== EnumBusinessType.YinDuJian) { if (jitunsettle != null) { _excel.Append(jitunsettle, "未结零件汇总"); } + if (m != null) + { + _excel.Append(m, "发票结算分组对应");//发票分组对应结算号 + } } //jis业务，发票分组对应关系，未结数据，调整数据 if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO)