diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 903d275c1..9bb878dcd 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index ced719e9f..eb37e5ed2 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.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 27b23dcf9..daada35b3 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 783eb9819..efad5529c 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 83fb23c54..e1ae690db 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.16.218 + SPCEX-3.16.219 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.16.218 + SPCEX-3.16.219 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 4ad8d358c..0dde2aafc 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java index 2bf160ce3..a7913fda8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java @@ -19,7 +19,6 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.registry.Registry; -import ru.spcex.clearing.component.predicate.cash.registry.AssetByObligationCashedPredicate; import ru.spcex.clearing.component.predicate.cash.registry.AssetByTcrCompanyAccountCashedPredicate; import ru.spcex.clearing.error.ClearingError; import ru.spcex.clearing.error.RgsError; @@ -167,9 +166,9 @@ public class InspectionObligationsV2 implements ISessionStage { checkResults.add(new CheckResult(obligation, false)); continue; } - ImdgPredicate assetPrdct = AssetByObligationCashedPredicate - .getPredicate(obligation) - .cashed(rgsPb, a__fCash); + ImdgPredicate assetPrdct = AssetByTcrCompanyAccountCashedPredicate + .getPredicate(obligation, A__F.type(obligation.getRegistryInstrumentType())) + .cashed(rgsPb, a___Cash); Registry asset = registryImdg.getFirstObjectByPredicate(assetPrdct); if (asset == null) { log.warn("Not found asset by registry.id={}", obligation.getId()); diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index dffa603fd..6666e8a21 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile ru.spcex.clearing dictionary - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 1c5db5e3e..ae9515bf5 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 972dcc547..3a86e626a 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 18b1a60fb..fc3c1b06b 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 3840983dc..479761287 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 1d0151bf8..fc06695f8 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 92cd8c639..5df05d1e4 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.16.218 + SPCEX-3.16.219 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.16.218 + SPCEX-3.16.219 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index d5ea0604d..5ce3e7bb0 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 728ab41dc..872d403df 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile ru.spcex.clearing dictionary - SPCEX-3.16.218 + SPCEX-3.16.219 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 2ec797726..151d74723 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile ru.spcex.clearing dictionary - SPCEX-3.16.218 + SPCEX-3.16.219 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index fd6fd945b..2e58cd263 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.16.218 + SPCEX-3.16.219 jar ru.spcex.clearing clearing-parent - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index c75ebfc34..a3c34c836 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.16.218 + SPCEX-3.16.219 clearing ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index dee3f685b..2e1018d6f 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 6dc78e062..93f53c0a8 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 2833f1728..2cf458651 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.16.218 + SPCEX-3.16.219 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index a340821e1..10aeca5ea 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 01c4f0a2d..834e80f28 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile ru.spcex.clearing dictionary - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 63608c799..8829e392c 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.16.218 + SPCEX-3.16.219 jar ru.spcex.clearing clearing-parent - SPCEX-3.16.218 + SPCEX-3.16.219 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 1ec6fa4b6..c60448e8e 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 2c7bdbd2b..80c048351 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.16.218 + SPCEX-3.16.219 test-clearing Test-clearing - SPCEX-3.16.218 + SPCEX-3.16.219 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index b1bc73b24..ed88f75e0 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.16.218 + SPCEX-3.16.219 trade-importer trade-importer Trade importer module - SPCEX-3.16.218 + SPCEX-3.16.219 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.16.218 + SPCEX-3.16.219 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 1f9bafaee..b0cf65b00 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.16.218 + SPCEX-3.16.219 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 557420407..9bcb18222 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index ff9c6cacd..341ed366f 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.16.218 + SPCEX-3.16.219 clearing-parent ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 7f1ab6efb..04558ec5e 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.16.218 + SPCEX-3.16.219 diff --git a/pom.xml b/pom.xml index 3f4ec1780..a985d2d53 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.16.218 + SPCEX-3.16.219 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.16.218 + SPCEX-3.16.219 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 70faeb31c..3bacef233 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.16.218 + SPCEX-3.16.219 4.0.0