From 6b7c41705c922279111bb1c176af10e2df1562f3 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 20 Sep 2023 11:06:13 +0300
Subject: [PATCH] data, meta 3.8.0.54

---
 .../backend-api/src/main/resources/meta/data.xml       |  6 ++++--
 .../backend-api/src/main/resources/meta/meta.json      |  4 ++--
 .../backend-api/src/main/resources/meta/meta.xml       |  4 ++--
 .../backend-api/src/test/resources/meta.json           |  4 ++--
 .../db-scripts/src/main/resources/db/DATA.sql          | 10 +++++++++-
 5 files changed, 19 insertions(+), 9 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 1563fdffb..09378a6ee 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -155,6 +155,7 @@
 		<registryUnit id="4" code="C" name="Комиссия"/>
 		<registryUnit id="5" code="U" name="Невыясненные"/>
 		<registryUnit id="5" code="I" name="Списания/зачисления"/>
+		<registryUnit id="7" code="V" name="Выписка"/>
         <registryCode id="1" code="AMAT" name="Денежные средства - общие"/>
         <registryCode id="2" code="AMAF" name="Денежные средства - свободные"/>
         <registryCode id="3" code="AMAB" name="Денежные средства - блокированные"/>
@@ -185,6 +186,7 @@
         <registryCode id="28" code="DMAX" name="Возврат инициатору"/>
         <registryCode id="29" code="DMBX" name="Возврат инициатору (кл)"/>
         <registryCode id="30" code="DMAU" name="Денежные средства - невыясненные"/>
+		<registryCode id="31" code="DMAV" name="Треб. выписки"/>
 		<registryStatus id="1" code="OK" name="Рассчитано"/>
 		<registryStatus id="2" code="UNCV" name="Не исполнено"/>
 		<registryStatus id="3" code="FAIL" name="Не исполнено контрагентом"/>
@@ -310,6 +312,8 @@
 		<objectType id="2" code="VFRS" name="verificationResult"/>
 		<objectType id="3" code="RGST" name="registry"/>
 		<objectType id="4" code="GTWY" name="gateway-api"/>
+		<objectType id="5" code="ACCA" name="account"/>
+		<objectType id="6" code="ACCB" name="account"/>
 		<notificationStatus id="1" code="PEND" name="В ожидании"/>
 		<notificationStatus id="2" code="CNCL" name="Отменено"/>
 		<notificationStatus id="3" code="ACPT" name="Принято"/>
@@ -522,8 +526,6 @@
 		<account id="1" companyId="1" account="30414810300000006000" accountType="TRAN" status="ACTV" processingSign="ALWD"/>
 		<account id="2" companyId="1" account="30414810600000007000" accountType="ANLT" status="ACTV" processingSign="ALWD"/>
 		<account id="3" companyId="1" account="700100000AT0" accountType="DTRN" status="ACTV" processingSign="ALWD"/>
-
-
 		<market id="1" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UESC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Обыкновенные акции"/>
 		<market id="2" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NESC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Обыкновенные акции"/>
 		<market id="3" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DESC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Обыкновенные акции"/>
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 b875f9f02..568e0c945 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.8.0.53",
+		"version": "3.8.0.54",
 		
 		"enums": {
 		
@@ -4141,7 +4141,7 @@
 		,
 			{"method":"put",
 				
-					"name": "Установить отметку о получение выписки",
+					"name": "Установить отметку о получении выписки",
 				
 					"destination": "registries/changeStatusExtract",
 				
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 3f68c3eb4..387cebacf 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.8.0.53">
+<meta version="3.8.0.54">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -961,7 +961,7 @@
 					<contract type="2" length="255" name="Договор" shortname="Номер договора" required="true" enabled="false"/>
 					<refundDate type="6" name="Дата возврата депозита" shortname="Возврат депозита" visible="true" enabled="true"/>
 				</put>
-				<put name="Установить отметку о получение выписки" destination="registries/changeStatusExtract" confirmation="shortName,contract,balance" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew">
+				<put name="Установить отметку о получении выписки" destination="registries/changeStatusExtract" confirmation="shortName,contract,balance" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>
 					<shortName type="2" length="255" name="Краткое наименование компании" shortname="Компания" enabled="false"/>
 					<contract type="2" length="255" name="Договор" shortname="Номер договора" required="true" enabled="false"/>
diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json
index b875f9f02..568e0c945 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.8.0.53",
+		"version": "3.8.0.54",
 		
 		"enums": {
 		
@@ -4141,7 +4141,7 @@
 		,
 			{"method":"put",
 				
-					"name": "Установить отметку о получение выписки",
+					"name": "Установить отметку о получении выписки",
 				
 					"destination": "registries/changeStatusExtract",
 				
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 537ad50c9..19a395013 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
@@ -1,4 +1,4 @@
--- DB version: 3.7.0.46
+-- DB version: 3.8.0.54
 -- DATA version: 3.5.0.13
 
 
@@ -310,6 +310,8 @@ INSERT INTO REGISTRY_UNIT_DICTIONARY(ID, CODE, NAME) values (5, 'U', 'Невыя
 
 INSERT INTO REGISTRY_UNIT_DICTIONARY(ID, CODE, NAME) values (5, 'I', 'Списания/зачисления') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
+INSERT INTO REGISTRY_UNIT_DICTIONARY(ID, CODE, NAME) values (7, 'V', 'Выписка') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
 INSERT INTO REGISTRY_CODE_DICTIONARY(ID, CODE, NAME) values (1, 'AMAT', 'Денежные средства - общие') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO REGISTRY_CODE_DICTIONARY(ID, CODE, NAME) values (2, 'AMAF', 'Денежные средства - свободные') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -370,6 +372,8 @@ INSERT INTO REGISTRY_CODE_DICTIONARY(ID, CODE, NAME) values (29, 'DMBX', 'Воз
 
 INSERT INTO REGISTRY_CODE_DICTIONARY(ID, CODE, NAME) values (30, 'DMAU', 'Денежные средства - невыясненные') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
+INSERT INTO REGISTRY_CODE_DICTIONARY(ID, CODE, NAME) values (31, 'DMAV', 'Треб. выписки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
 INSERT INTO REGISTRY_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'OK', 'Рассчитано') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO REGISTRY_STATUS_DICTIONARY(ID, CODE, NAME) values (2, 'UNCV', 'Не исполнено') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -614,6 +618,10 @@ INSERT INTO OBJECT_TYPE_DICTIONARY(ID, CODE, NAME) values (3, 'RGST', 'registry'
 
 INSERT INTO OBJECT_TYPE_DICTIONARY(ID, CODE, NAME) values (4, 'GTWY', 'gateway-api') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
+INSERT INTO OBJECT_TYPE_DICTIONARY(ID, CODE, NAME) values (5, 'ACCA', 'account') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
+INSERT INTO OBJECT_TYPE_DICTIONARY(ID, CODE, NAME) values (6, 'ACCB', 'account') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
 INSERT INTO NOTIFICATION_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'PEND', 'В ожидании') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO NOTIFICATION_STATUS_DICTIONARY(ID, CODE, NAME) values (2, 'CNCL', 'Отменено') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;