From 2866f31744a9c62dfd1fc7c8b74655adc2befea2 Mon Sep 17 00:00:00 2001 From: mahao Date: Fri, 20 Oct 2023 09:06:45 +0800 Subject: [PATCH] =?UTF-8?q?189=20=E4=B9=B0=E5=8D=95=E4=BB=B7BBAC=E4=B8=8EE?= =?UTF-8?q?DI=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaiDanBBACSaSeCompareExportService.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index 528ea414..45347853 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -369,12 +369,19 @@ namespace SettleAccount.Job.Services.Report //有结算无发运 var haveSaNotHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe); var keyCodes = haveSaNotHaveSes.Select(t => t.PN + t.CustomerPartCode).ToList(); - var edis = _settleAccountDbContext.Set().Where(t => keyCodes.Contains(t.KeyCode)); - saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe).ForEach(saSeCompareDiff => + var ediKeyCodes = _settleAccountDbContext.Set() + .Where(t => keyCodes.Contains(t.PN + t.CustomerPartCodeNoSpace)) + .Select(t => t.PN + t.CustomerPartCodeNoSpace) + .Distinct().ToList(); + + if (ediKeyCodes.Any()) { - saSeCompareDiff.Remark = "有Edi"; - }); - return null; + saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe && ediKeyCodes.Contains(t.PN + t.CustomerPartCode)).ForEach(saSeCompareDiff => + { + saSeCompareDiff.Remark = "有Edi"; + }); + } + return saSeCompareDiffs; } } }