From 28d07fcd3d32894eb28fe3cbc87e4c02942762bc Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 1 Aug 2025 17:23:07 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20PaymentInstruction,=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D0=B2:=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=81=D1=83=D0=BC=D0=BC=D1=8B=20=D0=B2=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=82=D0=BE=D0=B2=20=D0=B2=20PaymentInstruct?=
 =?UTF-8?q?ion=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B8=20DM*X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...FormingPaymentInstructionAssetsAction.java | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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 481fe0d79..66cc687c4 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
@@ -191,17 +191,19 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction
             BigDecimal amount;
             Collection<Registry> oAndT = loadLiabilitiesAndClaims(registry, sessionId);
             Optional<Registry> dmx = searchDmx(registry, oAndT);
+            BigDecimal adjustByReturns;
             if (dmx.isPresent()) {
-                log.debug("{}.id={} found {}.id={}, skipping PaymentInstruction creation",
+                log.debug("{}.id={} found {}.id={}, adjusted sum by deposit return = 0",
                     registry.getRegistryCode(), registry.getId(),
                     dmx.get().getRegistryCode(), dmx.get().getId());
-                continue;
+                adjustByReturns = BigDecimal.ZERO;
+            } else {
+                adjustByReturns = adjustAmountByReturns(oAndT);
+                log.debug("{}.id={} adjust by returns value {}",
+                    registry.getRegistryCode(),
+                    registry.getId(),
+                    adjustByReturns);
             }
-            BigDecimal adjustByReturns = adjustAmountByReturns(oAndT);
-            log.debug("{}.id={} adjust by returns value {}",
-                registry.getRegistryCode(),
-                registry.getId(),
-                adjustByReturns);
             amount = safeBD(registry.getBalance()).add(adjustByReturns);
             boolean isPositiveBalance = amount.compareTo(BigDecimal.ZERO) > 0;
             if (amount.compareTo(BigDecimal.ZERO) == 0) {
@@ -374,8 +376,10 @@ public class FormingPaymentInstructionAssetsAction extends AbstractSessionAction
         }
         ImdgPredicate dmxPrdct = pb.and(
             pb.sql(RegistryCodeSqlBuilder.getInstance(DM_X).build()),
-            pb.equals("companyId", tOrO.getCounterPartyId()),
-            pb.equals("contract", tOrO.getContract()),
+            pb.or(
+                pb.equals("companyId", tOrO.getCounterPartyId()),
+                pb.equals("contract", tOrO.getContract())
+            ),
             pb.equals("registryStatus", RegistryStatus.OK.getKey())
         );
         log.debug("{}.id={}, searching DM*X by {}", asset.getRegistryCode(), asset.getId(), dmxPrdct);