diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java index a37ebc6b2..15efe7631 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java @@ -37,7 +37,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.PaymentsWereCreatedListGuard; import ru.spcex.clearing.session.state.guard.PaymentsWereNotCreatedListGuard; import ru.spcex.clearing.session.state.guard.SdfGuardUtil; @@ -82,7 +81,6 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig private final StashedRegistriesPresentGuard oblAdmGuard = new StashedRegistriesPresentGuard( DataEnum.obligationAdmissionStashedRgs ); - private final ErroneousRegistriesPresentGuard inspErrGuard = new ErroneousRegistriesPresentGuard(); private final Guard reviseSuccessGuard = guardCheckCtxForFlag(DataEnum.againReviseSuccess); private final SessionType SESSION_TYPE = SessionType.IPOM; @@ -167,9 +165,7 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig TaskType.FinishingSession, TaskType.PSEUDO_waitSdfAfterPaymentInstructions, TaskType.PSEUDO_waitAfterObligationAdmissionError, - TaskType.PSEUDO_waitAfterInspectionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore, - TaskType.PSEUDO_waitAfterInspectionRestore, TaskType.AgainRevise, TaskType.PSEUDO_waitSdfAfterAgainRevise ))) @@ -203,7 +199,6 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); - sourcePseudoAfterIOPause(transitions); sourceFormingPaymentInstruction(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourceInspection(transitions); @@ -226,18 +221,10 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig } 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(formingPaymentInstructionSecuritiesAction); + transitions.withExternal() + .source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction) + .action(saveRegistriesAfterInspectionAndContinueAction) + .action(formingPaymentInstructionSecuritiesAction); } private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer transitions) throws Exception { @@ -256,24 +243,6 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig } } - private void sourcePseudoAfterIOPause(StateMachineTransitionConfigurer transitions) throws Exception { - transitions - //continue and repeat after InspectionObligations - .withExternal() - .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) - .action(activeWsAction) - .action(saveRegistriesAfterInspectionAndContinueAction) - .action(formingPaymentInstructionSecuritiesAction) - .event(SsnEvent.CONTINUE); - for (var taskType : List.of(TaskType.PSEUDO_waitAfterInspectionError, TaskType.PSEUDO_waitAfterInspectionRestore)) { - transitions - .withExternal() - .source(taskType).target(TaskType.InspectionObligations) - .action(chain(activeWsAction, discardInspOblStash, inspectionObligationsV2Action)) - .event(SsnEvent.REPEAT); - } - } - private void sourceFormingPaymentInstruction(StateMachineTransitionConfigurer transitions) throws Exception { transitions //если не создалось paymentInstruction'ов