diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml
index df152d125..23d1ddae7 100644
--- a/clearing-parent/account-service/pom.xml
+++ b/clearing-parent/account-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml
index 01369a12c..2ec0fdafc 100644
--- a/clearing-parent/backend-api/pom.xml
+++ b/clearing-parent/backend-api/pom.xml
@@ -11,7 +11,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml
index 969bc8e63..a1c29a39c 100644
--- a/clearing-parent/balance-service/pom.xml
+++ b/clearing-parent/balance-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml
index 9cc81f726..4250ab79b 100644
--- a/clearing-parent/classes/pom.xml
+++ b/clearing-parent/classes/pom.xml
@@ -12,7 +12,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml
index 04928c373..f22ff84e8 100644
--- a/clearing-parent/cleaning-builders/pom.xml
+++ b/clearing-parent/cleaning-builders/pom.xml
@@ -6,13 +6,13 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
cleaning-builders
cleaning-builders
Cleaning builders module
- SPCEX-3.22.285
+ SPCEX-3.22.286
jar
@@ -26,7 +26,7 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml
index dc9ea788a..c537aab00 100644
--- a/clearing-parent/clearing-service/pom.xml
+++ b/clearing-parent/clearing-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
index c493b6ac4..0cbb9a371 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
@@ -1,6 +1,5 @@
package ru.spcex.clearing.service.execution;
-import static java.lang.String.format;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.Instant;
@@ -11,6 +10,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import static java.lang.String.format;
import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +42,7 @@ import ru.spcex.clearing.service.validation.ValidationStored;
import ru.spcex.clearing.service.validation.strades.CompanyByTradingCodeCashingValidationRule;
import ru.spcex.clearing.service.validation.strades.STradesSecurityPresentValidationRule;
import ru.spcex.clearing.service.validation.strades.TcrByCodeAndCmpIsActiveCashingValidationRule;
+import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
import ru.spcex.platform.enumeration.ObjectType;
import ru.spcex.platform.enumeration.Priority;
import ru.spcex.platform.enumeration.Section;
@@ -266,7 +267,13 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
Company company = validator.getStored(ValidationStored.STradesCompany);
Company counterCompany = validator.getStored(ValidationStored.STradesCounterCompany);
TradingClearingRegistry rgstr = validator.getStored(ValidationStored.STradesTradingClearingRegistry);
- Listing listing = listingImdg.getFirstObjectByFieldValues(Map.of("securityId", security.getId()));
+ Listing listing = listingImdg.getFirstObjectByFieldValues(
+ Map.of(
+ "securityId", security.getId(),
+ "market", sTrades.getClassCode()
+ )
+ );
+
ExecutionCurrency eCurrency = new ExecutionCurrency();
final Instant now = Instant.now();
@@ -424,7 +431,11 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
new CompanyByTradingCodeCashingValidationRule<>(
STrades::getCpFirmId, valCash.cmpCash, ValidationStored.STradesCounterCompany
),
- new TcrByCodeAndCmpIsActiveCashingValidationRule(valCash.tcrCash)
+ new TcrByCodeAndCmpIsActiveCashingValidationRule(valCash.tcrCash),
+ FieldNotBlankRequiredRule.instance(
+ "classCode",
+ STrades::getClassCode,
+ ClearingError.RequiredFieldEmpty, true)
);
}
diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml
index 48a22c561..bf3cf8740 100644
--- a/clearing-parent/clearing-validation/pom.xml
+++ b/clearing-parent/clearing-validation/pom.xml
@@ -8,12 +8,12 @@
clearing-validation
Clearing-module, dependency version of platform-utils
jar
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
ru.spcex.clearing
dictionary
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml
index 29e57f9ba..105f7c276 100644
--- a/clearing-parent/company-service/pom.xml
+++ b/clearing-parent/company-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml
index 6144d2bc3..a23255345 100644
--- a/clearing-parent/db-scripts/pom.xml
+++ b/clearing-parent/db-scripts/pom.xml
@@ -7,12 +7,12 @@
db-scripts
db-scripts
db-scripts for PostgreSQL
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml
index c59fa9323..7696fc59a 100644
--- a/clearing-parent/dbf-exporter/pom.xml
+++ b/clearing-parent/dbf-exporter/pom.xml
@@ -7,12 +7,12 @@
dbf-exporter
dbf-exporter
DBF exporter for DBF files
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml
index a4852f292..398dd38d1 100644
--- a/clearing-parent/dbf-importer/pom.xml
+++ b/clearing-parent/dbf-importer/pom.xml
@@ -8,12 +8,12 @@
dbf-importer
dbf-importer
DBF loader for DBF files
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml
index f24ed0a5e..2bd25acc4 100644
--- a/clearing-parent/dictionary/pom.xml
+++ b/clearing-parent/dictionary/pom.xml
@@ -8,12 +8,12 @@
Clearing dictionary
Clearing dictionary
jar
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml
index 686d47a5f..acf8c13b4 100644
--- a/clearing-parent/extdb-importer/pom.xml
+++ b/clearing-parent/extdb-importer/pom.xml
@@ -4,12 +4,12 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
extdb-importer
extdb-importer
Extdb importer module. Аналог trade-importer.
- SPCEX-3.22.285
+ SPCEX-3.22.286
jar
diff --git a/clearing-parent/fix-service/pom.xml b/clearing-parent/fix-service/pom.xml
index a990906fe..9bfbeadd7 100644
--- a/clearing-parent/fix-service/pom.xml
+++ b/clearing-parent/fix-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml
index e423b404d..df56d888d 100644
--- a/clearing-parent/gateway-api/pom.xml
+++ b/clearing-parent/gateway-api/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml
index 567588b9c..759e17112 100644
--- a/clearing-parent/imdg-hist/pom.xml
+++ b/clearing-parent/imdg-hist/pom.xml
@@ -5,12 +5,12 @@
4.0.0
imdg-hist
jar
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -36,13 +36,13 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
ru.spcex.clearing
dictionary
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
@@ -82,7 +82,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml
index f7a241fbf..2d1f642b9 100644
--- a/clearing-parent/imdg/pom.xml
+++ b/clearing-parent/imdg/pom.xml
@@ -7,12 +7,12 @@
imdg
Clearing in memory data grid
jar
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -32,13 +32,13 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
ru.spcex.clearing
dictionary
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
@@ -89,7 +89,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml
index 131b44b9d..0e3ddaf2f 100644
--- a/clearing-parent/lim-exporter/pom.xml
+++ b/clearing-parent/lim-exporter/pom.xml
@@ -3,13 +3,13 @@
4.0.0
lim-exporter
Lim exporter
- SPCEX-3.22.285
+ SPCEX-3.22.286
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml
index dec5eb5c1..da3a09901 100644
--- a/clearing-parent/pom.xml
+++ b/clearing-parent/pom.xml
@@ -7,12 +7,12 @@
_parent_clearing
Clearing parent module
pom
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml
index c942c31a4..712d8ae2f 100644
--- a/clearing-parent/registry-service/pom.xml
+++ b/clearing-parent/registry-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml
index 81e21b95f..8b00ee5c3 100644
--- a/clearing-parent/reports-service/pom.xml
+++ b/clearing-parent/reports-service/pom.xml
@@ -8,12 +8,12 @@
reports-service
reports-service
Service for creating reports
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml
index 79697af09..057ef29cb 100644
--- a/clearing-parent/scheduler-service/pom.xml
+++ b/clearing-parent/scheduler-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
@@ -51,7 +51,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml
index b3803aab6..fba89482a 100644
--- a/clearing-parent/securities-service/pom.xml
+++ b/clearing-parent/securities-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml
index 20d035128..ee6788f91 100644
--- a/clearing-parent/security-util/pom.xml
+++ b/clearing-parent/security-util/pom.xml
@@ -8,12 +8,12 @@
security-util clearing
Clearing misc util for verify user roles
jar
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
ru.spcex.clearing
dictionary
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml
index edf4cbebf..93f81c3a2 100644
--- a/clearing-parent/swt-exporter/pom.xml
+++ b/clearing-parent/swt-exporter/pom.xml
@@ -3,13 +3,13 @@
4.0.0
swt-exporter
Swt exporter
- SPCEX-3.22.285
+ SPCEX-3.22.286
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml
index e77579ccf..ed62fbd25 100644
--- a/clearing-parent/swt-importer/pom.xml
+++ b/clearing-parent/swt-importer/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml
index 6e519acfd..1c753803d 100644
--- a/clearing-parent/test-clearing/pom.xml
+++ b/clearing-parent/test-clearing/pom.xml
@@ -4,11 +4,11 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
test-clearing
Test-clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
ru.spcex.platform
diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml
index 524e37523..ac842f152 100644
--- a/clearing-parent/trade-importer/pom.xml
+++ b/clearing-parent/trade-importer/pom.xml
@@ -4,12 +4,12 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.22.285
+ SPCEX-3.22.286
trade-importer
trade-importer
Trade importer module
- SPCEX-3.22.285
+ SPCEX-3.22.286
jar
@@ -55,7 +55,7 @@
ru.spcex.clearing
classes
- SPCEX-3.22.285
+ SPCEX-3.22.286
compile
diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml
index fd64021de..fe89461ca 100644
--- a/clearing-parent/utility-service/pom.xml
+++ b/clearing-parent/utility-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0
diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml
index 4a8f811a3..d0a21e8e4 100644
--- a/clearing-parent/xml-exporter/pom.xml
+++ b/clearing-parent/xml-exporter/pom.xml
@@ -7,12 +7,12 @@
xml-exporter
xml-exporter
XML exporter for XML files
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml
index fc116daac..61e462517 100644
--- a/clearing-parent/xml-importer/pom.xml
+++ b/clearing-parent/xml-importer/pom.xml
@@ -8,12 +8,12 @@
xml-importer
xml-importer
XML loader for XML files
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml
index 3985023a6..e74d61c59 100644
--- a/platform-parent/pom.xml
+++ b/platform-parent/pom.xml
@@ -14,7 +14,7 @@
ru.spcex.clearing
clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
diff --git a/pom.xml b/pom.xml
index 9a8a4fe97..fd90ca824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
__parent_ROOT
Clearing main parent
pom
- SPCEX-3.22.285
+ SPCEX-3.22.286
clearing-parent
@@ -24,7 +24,7 @@
17
Maven
- SPCEX-3.22.285
+ SPCEX-3.22.286
2.6.3
diff --git a/z-distr/pom.xml b/z-distr/pom.xml
index cb41e6326..da360997d 100644
--- a/z-distr/pom.xml
+++ b/z-distr/pom.xml
@@ -5,7 +5,7 @@
clearing
ru.spcex.clearing
- SPCEX-3.22.285
+ SPCEX-3.22.286
4.0.0