From 0e705add64848e9b0ff07ca040026ae13bb466ce Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 27 Apr 2022 08:22:53 +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 --- .../Report/UnSettleDiffExportService.cs | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs index 247580a3..48adf8d3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs @@ -83,6 +83,17 @@ namespace SettleAccount.Job.Services.Report var _ls = new List(); _ls = _dapper.GetDiffReport(0,begin,end, materialCode,kenncode,chassisNumber,version); + foreach (var itm in _ls) + { + if (itm.KENNCode.Length > 8) + { + itm.UNSettleQty = 1; + itm.DiffQty = 0; + itm.DiffAmt = 0; + } + } + + var _list = _ls.Where(p => p.ParentSapMaterialCode != p.SapMaterialCode && !string.IsNullOrEmpty(p.ParentSapMaterialCode)).GroupBy(p => new { p.ParentSapMaterialCode, p.ChassisNumber, p.KENNCode }) .Select(p => p.FirstOrDefault()).ToList(); @@ -170,14 +181,7 @@ namespace SettleAccount.Job.Services.Report List _lsExport = new List(); - foreach (var itm in _ls) - { - if (itm.KENNCode.Length > 8) - { - itm.UNSettleQty = 1; - itm.DiffQty = 0; - } - } + _ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ToList();