diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java index fbc1ba5cd..248cf7fca 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java @@ -126,6 +126,7 @@ public class UnitedSessionStateMachineConfig dealsPrepareFinal.addExecutionDepositCondition(pb.regex("firstLegSettlementCode", "^T0.*$")); this.finishingSessionAction.setPr("1"); + this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InclusionToPoolAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InclusionToPoolAction.java index e048fe24e..f466b421d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InclusionToPoolAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InclusionToPoolAction.java @@ -102,7 +102,7 @@ public class InclusionToPoolAction extends AbstractSessionActionForOkErrorHandli RegistryUnit.T.getKey()); ImdgPredicateBuilder prdctBuilder = registryImdg.predicateBuilder(); ImdgPredicate defaultCondition = prdctBuilder.sql(sqlCondition); - if (sessionType != null) { + if (sessionType != null && sessionType.equals(SessionType.XDEP)) { //не всегда нужное условие defaultCondition = prdctBuilder.and(defaultCondition, sessionTypePredicate()); } @@ -204,6 +204,11 @@ public class InclusionToPoolAction extends AbstractSessionActionForOkErrorHandli rgsPb.equals("sessionType", SessionType.MEDM.getKey()), rgsPb.equals("sessionType", SessionType.XDEP.getKey()) ); + } else if (SessionType.PAYM.equals(sessionType)) { + return rgsPb.or( + rgsPb.equals("sessionType", SessionType.PREP.getKey()), + rgsPb.equals("sessionType", SessionType.PAYM.getKey()) + ); } else { return rgsPb.equals("sessionType", sessionType.getKey()); }