From 9208483045dc4dac244c6d7b825af98802b5593d Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 3 Aug 2023 12:11:48 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-462=20?= =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=BB=20=D0=B2=D1=8B=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=B7=D0=BA=D1=83=20=D0=BF=D0=BE=D0=BB=D1=8F=2035A=20?= =?UTF-8?q?=D0=BA=20=D0=B2=D0=B8=D0=B4=D1=83=20":35A:SHS10000,"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swt/exporter/services/exportimpl/DF12Exporter.java | 3 ++- .../ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 0b4314f9f..924744fde 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 @@ -63,7 +63,8 @@ public class DF12Exporter extends AbstractExporterService { lastHeader20 = record.getOutDocument(); } stringBuilder.append(":23:").append(record.getDirection()).append(lineSeparator); - stringBuilder.append(":35A:SHS").append(record.getQuantity()).append(lineSeparator); + String quantity = record.getQuantity() == null ? "" : record.getQuantity().split("\\.")[0] + ","; + stringBuilder.append(":35A:SHS").append(quantity).append(lineSeparator); stringBuilder.append(":35B:ISIN ").append(record.getSecurityCode()).append(lineSeparator); stringBuilder.append(":82D:").append(record.getDepoCodeSender()).append(lineSeparator); stringBuilder.append(":87C:").append(record.getDepoCodeAdressee()).append(lineSeparator); diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java index f3591cd29..6a40376a0 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java @@ -156,7 +156,8 @@ public class SWTHeaderData { stringBuilder.append(":23:").append(valFor23Tag).append('\n'); } if (valFor35ATag != null) { - stringBuilder.append(":35A:SHS").append(valFor35ATag).append('\n'); + String val = valFor35ATag.split("\\.")[0] + ","; + stringBuilder.append(":35A:SHS").append(val).append('\n'); } if (valFor35BTag != null) { stringBuilder.append(":35B:ISIN ").append(valFor35BTag).append('\n');