From f90365a191e4c439d271658a412d4a9fd16c09b2 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 30 Jun 2023 16:44:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=84=D0=B8=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=9C=D0=9A=D0=A0=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B8:=201.=20=D1=88=D0=B0=D0=B3=205=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=20MNG=20->=20FAIL=201.=20=D1=88=D0=B0=D0=B3=207=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=83?=
 =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=20=D0=BD=D0=B0=20valueDate?=
 =?UTF-8?q?<settlementDate=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D1=81=D0=B5?=
 =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=BE=20DM*X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stage/impl/FormingPaymentInstructionReturnMkr.java      | 6 ++++++
 .../stage/impl/InspectionObligationsDepositReturn.java      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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<Registry> 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);
     }