From 8dd82f67a6137750211a2048f63bce256c2c1916 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 11 Sep 2025 13:30:24 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-889 --- .../clearing/service/execution/ExecutionFondComponent.java | 3 +-- .../db-scripts/src/main/resources/db/DICTIONARIES.sql | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java index 35af415c5..f581efac3 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java @@ -309,7 +309,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { price = safeBD(sTrades.getPrice()) .multiply(safeBD(dcs.getNominalValue())) .multiply(baseUnitSize); - } else if (NominalTypeCode.INDX.equalsByKey(dcs.getNominalTypeCode())) { + } else if (NominalTypeCode.FIXD.equalsByKey(dcs.getNominalTypeCode())) { price = safeBD(sTrades.getPrice()) .multiply(safeBD(parse(udr.getRightUnit()))) .multiply(baseUnitSize); @@ -474,7 +474,6 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { context.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry); context.addImdg(IMDGDistributedNames.Map_DigitalCertificateSecurity, imdgDigitCertSecurity); context.addImdg(IMDGDistributedNames.Map_UtilitarianDigitalRight, udrImdg); - //fixme add map utilitarian context.setLogPrefix(LogPrefixId.INSTANCE); return new ValidatorImpl<>(context, new STradesSecurityPresentValidationRule(valCash.fixIncSecCash, diff --git a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql index 1e9005809..48bec7907 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql @@ -1241,6 +1241,8 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5434, 'CLRN', 'Опе INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5435, 'CLRN', 'Сверка входящего остатка по транзакции %s не совпала с регистром %s.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5436, 'CLRN', 'Данных по УЦП для ЦC %s не найдено.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5600, 'DBFI', 'Общая ошибка модуля dbf-importer.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5700, 'CLRN', 'При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;