diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java index bbfcc3524..6fa3dd0b4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java @@ -154,6 +154,7 @@ public class Sdf21Executor extends AbstractExecutor { .rgsCode(RegistryTradingParams.AS_T) .companyId(company.getId()) //раньше было stmt.getAddresseeId() .accountId(account.getId()) //раньше было stmt.getAccountId() + .securityId(stmt.getSecurityId()) .find(); astFound.ifPresentOrElse(rgs -> { log.debug("stmt.id={}, found AS*T.id={}, updating...", stmt.getId(), rgs.getId()); @@ -368,6 +369,11 @@ public class Sdf21Executor extends AbstractExecutor { return this; } + private RegistrySearch securityId(Long securityId) { + predicate = pb.and(predicate, pb.equals("securityId", securityId)); + return this; + } + private RegistrySearch status() { predicate = pb.and(predicate, pb.or( pb.equals("registryStatus", RegistryStatus.PROC.getKey()), diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java index 545887faa..2c1cc654a 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java @@ -178,7 +178,6 @@ public enum ReadingPatterns { public void reed(String line, SWTRecord record) { String[] cells = getValueWitoutKey(line, ":83D:").split(":"); cells = Arrays.copyOf(cells, 3); - record.setValFor35BTag(cells); record.setValFor83DTag(cells); } },