From 37a741e866d06ff790952794ecd7eada40b7e73e Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 16 Nov 2023 16:14:30 +0300 Subject: [PATCH] =?UTF-8?q?D**I=20fix=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20o?= =?UTF-8?q?pen=5Fbalance/close=5Fbalance/plan=5Fbalance/created=5Fat(new)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/service/executors/Sdf10Executor.java | 4 ++++ .../ru/spcex/clearing/service/registry/DmiService.java | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java index 3858ad2ec..e97e41968 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java @@ -225,6 +225,10 @@ public class Sdf10Executor { rgsD.setDiffBalance(BigDecimal.ZERO); rgsD.setCheckBalance(BigDecimal.ZERO); rgsD.setRegistryStatus(RegistryStatus.PROC.getKey()); + rgsD.setOpenBalance(BigDecimal.ZERO); + rgsD.setCloseBalance(BigDecimal.ZERO); + rgsD.setPlanBalance(BigDecimal.ZERO); + rgsD.setCreated(Instant.now()); rgsD.setContract(outDocument); registryImdg.insert(rgsD); log.debug("created DS*I.id={}", rgsD.getId()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/DmiService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/DmiService.java index 41e93d7ec..58195d03d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/DmiService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/DmiService.java @@ -156,15 +156,14 @@ public class DmiService { return Optional.empty(); } Registry rgsD = am_t.clone(); + RegistryManager.zeroState(rgsD); + rgsD.setOpenBalance(BigDecimal.ZERO); + rgsD.setCloseBalance(BigDecimal.ZERO); rgsD.setRegistryDesignation(RegistryDesignation.D.getKey()); rgsD.setRegistryUnit(RegistryUnit.I.getKey()); rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD)); rgsD.setBalance(summ); - rgsD.setDebit(BigDecimal.ZERO); - rgsD.setCredit(BigDecimal.ZERO); - rgsD.setDiffBalance(BigDecimal.ZERO); - rgsD.setCheckBalance(BigDecimal.ZERO); rgsD.setRegistryStatus(RegistryStatus.PROC.getKey()); return Optional.of(rgsD); }