diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index 0e9a20e23..a84a67ba6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -343,13 +343,14 @@ public class Sdf57Executor extends AbstractExecutor { private Optional findRegByDesignation(Statement s, RegistryDesignation des) { RegistryTradingParams p = new RegistryTradingParams( - des, RegistryInstrumentType.M, RegistryCapacity.A, RegistryUnit.T + des, RegistryInstrumentType.M, null, RegistryUnit.T ); String sql = RegistryCodeSqlBuilder.getInstance(p).build(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicate rgstrPredicate = pb.and(pb.sql(sql), pb.sql(sql), - pb.equals("companyId", s.getAddresseeId()) //fixme companyId? + pb.equals("companyId", s.getAddresseeId()), + pb.equals("accountId", s.getAccountId()) ); if (des.equals(RegistryDesignation.D) && !TextUtil.isEmpty(s.getContract())) { rgstrPredicate = pb.and(rgstrPredicate, pb.equals("contract", s.getContract()));