diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java index 68971038e..3c3d3f8e6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/FormingPaymentInstructionAssetsAction.java @@ -424,7 +424,7 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction Registry rgs = pair.getSecond(); Account account = accountImdg.getSingleObjectByID(paymentInstruction.getCreditLeg_accountId()); Security security = securityImdg.getSingleObjectByID(paymentInstruction.getCreditLeg_securityId()); - if (SessionType.CURR.equals(sessionType) || (rgs != null + if (SessionType.CURR.equals(sessionType) || SessionType.PAYM.equals(sessionType) || (rgs != null && RegistryInstrumentType.M.equalsByKey(rgs.getRegistryInstrumentType()) && !CurrencyCode.isRub(rgs.getSecuritySymbol()))) { boolean madeStatements = statementsWereMade(paymentInstruction, rgs); 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 f466b421d..e3feb8c7b 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 @@ -164,7 +164,7 @@ public class InclusionToPoolAction extends AbstractSessionActionForOkErrorHandli switch (ssnTpe) { case MEDM, FINL, XDEP -> execImdg = (Imdg) executionDepositImdg; case IPO0, IPOB, TRDT, IPOT -> execImdg = (Imdg) executionFondImdg; - case CURR -> execImdg = (Imdg) executionCurrImdg; + case CURR, PAYM -> execImdg = (Imdg) executionCurrImdg; default -> { //кейс для "общих" сессий (напр. UNIT) в которых сочетаются разные сделки //смотрим на секцию регистра.