treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix обновление регистров при создании ТКР

Browse source 
SDF57 specif -> contractr учитываются регистры со статусом MNG
This commit is contained in:
ialbert 2023-09-25 17:45:17 +03:00
parent 155b899e5d
commit fa45f6335b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java
View file

@ -342,7 +342,7 @@ public class RegistryService {
return Optional.empty(); return Optional.empty();
} }
return Optional.ofNullable(prdBldr.and( return Optional.ofNullable(prdBldr.and(
prdBldr.or(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue())), prdBldr.and(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue())),
prdBldr.equals("companyId", companyId), prdBldr.equals("companyId", companyId),
prdBldr.sql("tradingClearingRegistryId == null") prdBldr.sql("tradingClearingRegistryId == null")
)); ));

5
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
View file

@ -664,7 +664,10 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
ImdgPredicate prdct = pb.and( ImdgPredicate prdct = pb.and(
pb.sql(RegistryCodeSqlBuilder.getInstance(OM_T).build()), pb.sql(RegistryCodeSqlBuilder.getInstance(OM_T).build()),
pb.equals("registryStatus", RegistryStatus.PROC.getKey()), pb.or(
pb.equals("registryStatus", RegistryStatus.PROC.getKey()),
pb.equals("registryStatus", RegistryStatus.MNG.getKey())
),
pb.notNull("contract"), pb.notNull("contract"),
pb.not(pb.equals("contract", "")) pb.not(pb.equals("contract", ""))
); );