From 2e25c733bab8142840168d19329f6d9ecf38aadc Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 9 Aug 2023 16:03:58 +0300 Subject: [PATCH] swt-exporter DF12Exporter fix header 20 --- .../swt/exporter/services/exportimpl/DF12Exporter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java index 57b49a4ec..040452d60 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java @@ -58,8 +58,10 @@ public class DF12Exporter extends AbstractExporterService { @Override protected String convertRecord(SDf12 record, ConvertionContext context) { StringBuilder stringBuilder = new StringBuilder(); - if (!Objects.equals(lastHeader20, record.getOutDocument())) { // header - stringBuilder.append(":20:").append(record.getOutDocument()).append(SWTHeaderData.LINE_SEPARATOR); + if (!Objects.equals(lastHeader20, record.getOutDocument())) { // header, тег :20: должен быть 1 раз только в начале документа + //stringBuilder.append(":20:").append(record.getOutDocument()).append(SWTHeaderData.LINE_SEPARATOR); + log.debug("SWT generationId={} last header :20: was \"{}\" but next record OutDocument=\"{}\"", + record.getGenerationId(), lastHeader20, record.getOutDocument()); lastHeader20 = record.getOutDocument(); } stringBuilder.append(":23:").append(record.getDirection()).append(SWTHeaderData.LINE_SEPARATOR); @@ -81,9 +83,9 @@ public class DF12Exporter extends AbstractExporterService { swtHeaderData.setType(typeForHeader()); swtHeaderData.setDateTime(LocalDateTime.now()); if (record != null) { -// swtHeaderData.setValFor20Tag(record.getOutDocument()); + swtHeaderData.setValFor20Tag(record.getOutDocument()); + lastHeader20 = null; } - lastHeader20 = null; return swtHeaderData; }