189 买单价BBAC与EDI对比

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<BBAC_SE_EDI>().Where(t => keyCodes.Contains(t.KeyCode));
+            var ediKeyCodes = _settleAccountDbContext.Set<BBAC_SE_EDI>()
-            saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe).ForEach(saSeCompareDiff =>
+                .Where(t => keyCodes.Contains(t.PN + t.CustomerPartCodeNoSpace))
+                .Select(t => t.PN + t.CustomerPartCodeNoSpace)
+                .Distinct().ToList();
+
+            if (ediKeyCodes.Any())
             {
-                saSeCompareDiff.Remark = "有Edi";
+                saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe && ediKeyCodes.Contains(t.PN + t.CustomerPartCode)).ForEach(saSeCompareDiff =>
-            });
+                {
-            return null;
+                    saSeCompareDiff.Remark = "有Edi";
+                });
+            }
+            return saSeCompareDiffs;
         }
     }
 }