diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java index ae52897de..8fc8838eb 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java @@ -158,12 +158,13 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action) + .source(TaskType.InclusionToPool) + .target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction) .and() .withExternal() .source(TaskType.FormingPaymentInstruction) @@ -191,9 +192,9 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -215,8 +216,8 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions