From 2d81afec7cc59b9cb1e9c44ea6a81562ab010360 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 22 Feb 2022 15:49:42 +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 --- ...UnInvoiceSettledDetailDiffExportService.cs | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs index 5d3dffd2..43335a1e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -184,6 +184,12 @@ namespace SettleAccount.Job.Services var list1= LSettleSum(id, exportName, p_list); var report1 = report2List.ToList(); + + foreach (var itm in list1) + { + itm.MaterialGroup = itm.MaterialGroup + "(漏结)"; + } + report1.AddRange(list1); ExcelExporter _exporter = new ExcelExporter();//导出Excel @@ -331,14 +337,14 @@ namespace SettleAccount.Job.Services { var _first = exportName.FirstOrDefault(); var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; - var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; - var materailCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; - var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; - var sapcode = p_list.Where(p => p.Name == "SapMaterialCode").FirstOrDefault().Value; - var begin = p_list.Where(p => p.Name == "Begin").FirstOrDefault().Value; - var end = p_list.Where(p => p.Name == "End").FirstOrDefault().Value; + var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var cp7begin = p_list.Where(p => p.Name == "Cp7BeginTime").FirstOrDefault().Value; + var cp7end = p_list.Where(p => p.Name == "Cp7EndTime").FirstOrDefault().Value; var kenncode = p_list.Where(p => p.Name == "KennCode").FirstOrDefault().Value; var chassisNumber = p_list.Where(p => p.Name == "ChassisNumber").FirstOrDefault().Value; + var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; @@ -350,7 +356,7 @@ namespace SettleAccount.Job.Services var _end = DateTime.Parse(_beginstr).AddMonths(1).AddDays(-1); end=_end.ToString("yyyy-MM-dd")+" 23:59:59"; - var _list = _dapperRepository2.GetDiffReport(DateTime.Now.Year.ToString(), begin, end, customerCode, version, materailCode, materialGroup, sapcode); + var _list = _dapperRepository2.GetDiffReport(DateTime.Now.Year.ToString(), begin, end, "", version,"", materialGroup, sapCode); var _ls = _list.Where(p => p.Flag == "L").Where(p => p.ParentSapMaterialCode != p.SapMaterialCode).GroupBy(p => new { p.KENNCode, p.ChassisNumber, p.ParentSapMaterialCode }).Select(p => p.FirstOrDefault()).ToList(); //var _lst = _erpDapper.GetSapList(_ls, version, false); //_lst.ForEach(p => @@ -394,14 +400,14 @@ namespace SettleAccount.Job.Services _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); } } - if (!string.IsNullOrEmpty(materailCode)) - { - var _groupList = materailCode.Split(new char[] { '\n' }).Distinct().ToList(); - if (_groupList.Count() > 0) - { - _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); - } - } + //if (!string.IsNullOrEmpty(materailCode)) + //{ + // var _groupList = materailCode.Split(new char[] { '\n' }).Distinct().ToList(); + // if (_groupList.Count() > 0) + // { + // _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); + // } + //} _list = _list.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ThenBy(p => p.Flag).ToList(); var report2List = _list.Select(p => new { p.MaterialGroup, DiffAmt = p.Price * p.Qty }).GroupBy(p => new { p.MaterialGroup }).Select(p => new SettleDoorPanelSumExport { MaterialGroup = p.Key.MaterialGroup, InvoiceDiffPrice = p.Sum(itm => itm.DiffAmt), Version = version });