From 0b71319bbec95863956897c9996fc139af6b08c3 Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Mon, 8 Jul 2024 17:26:47 +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 --- .../SettleAccount.HttpApi.Host/wwwroot.rar | Bin 9005483 -> 9005482 bytes .../BQ/Syncs/GenerateJisInvoiceService.cs | 38 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot.rar b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot.rar index 9ff093c7cb94acf9e50c45ebb73c736d79510c35..a28fcb40952182e8eca6928dbc6da4fde71ef59b 100644 GIT binary patch delta 2390 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 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs index 24482013..a4170657 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs @@ -1193,25 +1193,25 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } return _invls; } - public List FirstInvoiceExtend1(List p_list, List p_adjlist, List dtos, List p_notlist, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType) - where TDetail : SA_CAN_BASE, new() - { - var gener = new InvoiceGenerator(); - gener.GenerateInvoices(p_list); - var invList = gener.Invoices; - if (invList.Count > 0) - { - foreach (var inv in invList) - { - var partlist = inv.Parts; - if (partlist.Count > 0) - { - partlist.GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID, p.LU }) - } - } - } - return new List(); - } + // public List FirstInvoiceExtend1(List p_list, List p_adjlist, List dtos, List p_notlist, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType) + //where TDetail : SA_CAN_BASE, new() + // { + // var gener = new InvoiceGenerator(); + // gener.GenerateInvoices(p_list); + // var invList = gener.Invoices; + // if (invList.Count > 0) + // { + // foreach (var inv in invList) + // { + // var partlist = inv.Parts; + // if (partlist.Count > 0) + // { + // partlist.GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID, p.LU }) + // } + // } + // } + // return new List(); + // }