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 869c9ac8d..595df124e 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 @@ -315,6 +315,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and( strPb.equals("tradeNum", sTrades.getTradeNum()), strPb.equals("section", sTrades.getSection()), + strPb.equals("classCode", sTrades.getClassCode()), strPb.not(strPb.equals("operation", sTrades.getOperation())))); if (counterSTrades != null) { eCurrency.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java index 999a5b21c..f2fada5e4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java @@ -304,6 +304,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and( strPb.equals("tradeNum", sTrades.getTradeNum()), strPb.equals("section", sTrades.getSection()), + strPb.equals("classCode", sTrades.getClassCode()), strPb.not(strPb.equals("operation", sTrades.getOperation())))); if (counterSTrades != null) { eDeposit.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount()); 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 57d6d2de5..4ffaab18d 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 @@ -381,6 +381,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and( strPb.equals("tradeNum", sTrades.getTradeNum()), strPb.equals("section", sTrades.getSection()), + strPb.equals("classCode", sTrades.getClassCode()), strPb.not(strPb.equals("operation", sTrades.getOperation())))); if (counterSTrades != null) { eFond.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount());