From f6f7c9c446d75ae61e017a7a732a303a19c256ab Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 20 Jun 2024 13:19:51 +0300
Subject: [PATCH] meta 3.12.0.94, data 3.12.0.92

---
 clearing-parent/backend-api/src/main/resources/meta/data.xml | 5 +++--
 .../backend-api/src/main/resources/meta/meta.json            | 4 ++--
 clearing-parent/backend-api/src/main/resources/meta/meta.xml | 4 ++--
 clearing-parent/backend-api/src/test/resources/meta.json     | 4 ++--
 clearing-parent/db-scripts/src/main/resources/db/DATA.sql    | 5 +++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml
index 144ea737f..ac1bab32d 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<meta version="3.12.0.91">
+<meta version="3.12.0.92">
 	<enums>
 		<allowed id="1" code="ALWD" name="Разрешено"/>
 		<allowed id="2" code="DEND" name="Запрещено"/>
@@ -9,7 +9,7 @@
 		<section id="1" code="MKR" name="Секция Денежного рынка МКР"/>
 		<section id="2" code="FOND" name="Фондовая секция"/>
 		<section id="3" code="CURR" name="Валютная секция"/>
-		<section id="4" code="MULT" name="Многосекционный клиринг"/>
+		<section id="4" code="MULT" name="Единая"/>
 		<userRole id="1" code="ADMN" name="Администратор Клиринга МКР"/>
 		<userRole id="2" code="SPVS" name="Супервайзер Клиринга МКР"/>
 		<userRole id="3" code="SCRT" name="Администратор безопасности Клиринга МКР"/>
@@ -459,6 +459,7 @@
 		<errorCode id="5028" code="ACNT" name="Указанный ТКР не найден в клиринговой системе."/>
 		<errorCode id="5029" code="ACNT" name="Счет %s не найден в клиринговой системе."/>
 		<errorCode id="5030" code="ACNT" name="Компания %s не найдена в клиринговой системе."/>
+		<errorCode id="5031" code="ACNT" name="Для данной валюты в ТКР уже задан счет."/>
 		<!-- error code for balance-service -->
 		<errorCode id="5200" code="BLNC" name="Общая ошибка модуля balance-service."/>
 		<errorCode id="5210" code="BLNC" name="Клиринговая сессия неактивна."/>
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index ad37e5070..9f45f5642 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.12.0.93",
+		"version": "3.12.0.94",
 		
 		"enums": {
 		
@@ -4607,7 +4607,7 @@
 				
 					"destination": "registries/identificationFunds",
 				
-					"confirmation": "balance,tradingClearingRegistryId",
+					"confirmation": "securitySymbol,balance,tradingClearingRegistryId",
 				
 					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew",
 				
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index b6ada0a84..3a423ccc6 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.12.0.93">
+<meta version="3.12.0.94">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -1069,7 +1069,7 @@
 					<id type="1" name="Регистр требований" shortname="Регистр требований" required="true" enabled="false" visible="false"/>
 					<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
 				</post>
-				<post name="Идентификация неразмеченных средств" destination="registries/identificationFunds" confirmation="balance,tradingClearingRegistryId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew">
+				<post name="Идентификация неразмеченных средств" destination="registries/identificationFunds" confirmation="securitySymbol,balance,tradingClearingRegistryId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>
 					<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
 					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json
index ad37e5070..9f45f5642 100644
--- a/clearing-parent/backend-api/src/test/resources/meta.json
+++ b/clearing-parent/backend-api/src/test/resources/meta.json
@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.12.0.93",
+		"version": "3.12.0.94",
 		
 		"enums": {
 		
@@ -4607,7 +4607,7 @@
 				
 					"destination": "registries/identificationFunds",
 				
-					"confirmation": "balance,tradingClearingRegistryId",
+					"confirmation": "securitySymbol,balance,tradingClearingRegistryId",
 				
 					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew",
 				
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
index 85054cafd..7ba3386d5 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
@@ -1,5 +1,5 @@
 -- DB version: 3.12
--- DATA version: 3.12.0.91
+-- DATA version: 3.12.0.92
 
 
 /* Dictionaries */
@@ -20,7 +20,7 @@ INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (2, 'FOND', 'Фондов
 
 INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (3, 'CURR', 'Валютная секция') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
-INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (4, 'MULT', 'Многосекционный клиринг') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (4, 'MULT', 'Единая') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO USER_ROLE_DICTIONARY(ID, CODE, NAME) values (1, 'ADMN', 'Администратор Клиринга МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
@@ -893,6 +893,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5028, 'ACNT', 'Ука
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5029, 'ACNT', 'Счет %s не найден в клиринговой системе.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5030, 'ACNT', 'Компания %s не найдена в клиринговой системе.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5031, 'ACNT', 'Для данной валюты в ТКР уже задан счет.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5200, 'BLNC', 'Общая ошибка модуля balance-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;