diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java index f845b3b87..14f7290db 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java @@ -36,7 +36,6 @@ import ru.spcex.clearing.session.state.action.SaveRegistriesAndContinueAction; import ru.spcex.clearing.session.state.action.Sdf56Action; import ru.spcex.clearing.session.state.action.SdfReceivedAction; import ru.spcex.clearing.session.state.action.UpdateWorkflowStatusAction; -import ru.spcex.clearing.session.state.guard.ErroneousRegistriesPresentGuard; import ru.spcex.clearing.session.state.guard.PaymentsWereCreatedGuard; import ru.spcex.clearing.session.state.guard.PaymentsWereNotCreatedGuard; import ru.spcex.clearing.session.state.guard.SdfGuardUtil; @@ -70,10 +69,6 @@ public class IntermediateMkrSessionStateMachineConfig private final FinishingSessionAction finishingSessionAction; private final SaveRegistriesAndContinueAction obligationAdmissionContinueAction; private final SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction; - private final DiscardRegistriesAction discardInspOblStash = new DiscardRegistriesAction( - DataEnum.inspectionObligationStashedRgs - ); - private final ErroneousRegistriesPresentGuard inspErrGuard = new ErroneousRegistriesPresentGuard(); private final DiscardRegistriesAction discardOblAdmStash = new DiscardRegistriesAction(DataEnum.obligationAdmissionStashedRgs); private final StashedRegistriesPresentGuard oblAdmGuard = new StashedRegistriesPresentGuard( @@ -160,8 +155,7 @@ public class IntermediateMkrSessionStateMachineConfig TaskType.FinishingSession, TaskType.PSEUDO_waitSdfAfterPaymentInstructions, TaskType.PSEUDO_waitAfterObligationAdmissionError, - TaskType.PSEUDO_waitSdfAfterAgainRevise, - TaskType.PSEUDO_waitAfterInspectionError + TaskType.PSEUDO_waitSdfAfterAgainRevise ))) .end(TaskType.FinishingSession); } @@ -193,7 +187,6 @@ public class IntermediateMkrSessionStateMachineConfig sourceObligationAdmission(transitions); sourcePseudoAfterOAError(transitions); - sourcePseudoAfterIOError(transitions); sourceFormingPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourceAgainRevise(transitions); @@ -203,15 +196,8 @@ public class IntermediateMkrSessionStateMachineConfig private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { transitions - .withExternal() - .source(TaskType.InspectionObligations) - .target(TaskType.PSEUDO_waitAfterInspectionError) - .guard(inspErrGuard) - .action(pauseWsAction) - .and() .withExternal() .source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction) - .guard(invert(inspErrGuard)) .action(saveRegistriesAfterInspectionAndContinueAction) .action(formingPaymentInstructionAssetsAction); } @@ -244,22 +230,6 @@ public class IntermediateMkrSessionStateMachineConfig .event(SsnEvent.REPEAT); } - private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer transitions) throws Exception { - transitions - //continue and repeat after InspectionObligations - .withExternal() - .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) - .action(activeWsAction) - .action(saveRegistriesAfterInspectionAndContinueAction) - .action(formingPaymentInstructionAssetsAction) - .event(SsnEvent.CONTINUE) - .and() - .withExternal() - .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.InspectionObligations) - .action(chain(activeWsAction, discardInspOblStash, inspectionObligationsV2Action)) - .event(SsnEvent.REPEAT); - } - private void sourceFormingPaymentInstructions(StateMachineTransitionConfigurer transitions) throws Exception { transitions //если не создалось paymentInstruction'ов