diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java index 7a28cf4ea..b12c6c828 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java @@ -150,6 +150,12 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage { .stream() .filter(registry -> RegistryDesignation.L.equalsByKey(registry.getRegistryDesignation())) .filter(obligation -> { + //если valueDate < settlement date + if (!(obligation.getValueDate() != null + && obligation.getSettlementDate() != null + && obligation.getValueDate().isBefore(obligation.getSettlementDate()))) { + return true; + } Optional dmx = searchDmx(obligation); if (dmx.isPresent()) { log.debug("LM*T#id={}, DM*X#id={} found, no action needed for group {}, skipping liability", diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index 409bb7b11..0bf221178 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -169,7 +169,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { continue; } log.info("OM*T.id={} -> no DM*X/DM*T(INFO/CLRN) registry found. setting MNG status to group", omtRgs.getId()); - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.MNG)); + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); } return new StageResult<>(null, true); }