From 158a9db90c66de01d7457c74adcff9a50e882cf2 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 27 Jul 2023 12:12:35 +0300 Subject: [PATCH] =?UTF-8?q?SDF57=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BF=D0=B8=D1=88=D0=B5=D1=82=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B5=D1=81=D0=BB=D0=B8=20DM*?= =?UTF-8?q?*=20=D1=81=D0=BE=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE?= =?UTF-8?q?=D0=BC=20OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/service/executors/Sdf57Executor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index 3da76df1d..405fff0a8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -264,7 +264,7 @@ public class Sdf57Executor extends AbstractExecutor { .status() .find(); } - if (dm__Found.isPresent()) { + if (dm__Found.isPresent() && !RegistryStatus.OK.equalsByKey(dm__Found.get().getRegistryStatus())) { Registry dm__ = dm__Found.get(); dm__.setBalance(safeBD(dm__.getBalance()).add(safeBD(stmt.getAmount()))); dm__.setUpdated(Instant.now()); @@ -273,6 +273,8 @@ public class Sdf57Executor extends AbstractExecutor { stmt.getId(), sdf57.getSpecif(), dm__.getId()); + } else if (dm__Found.isPresent() && RegistryStatus.OK.equalsByKey(dm__Found.get().getRegistryStatus())) { + log.warn(messageResolver.resolve(new EnumMessage(ClearingError.ObligationsAlreadyCalculated))); } else if (om_tFound.isPresent()) { Registry om_t = om_tFound.get(); Registry registryD = copyRegD(om_t, stmt, RegistryUnit.T);