diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java index 90249ff86..3396848dc 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java @@ -117,7 +117,7 @@ public class SDFProcessService { newSdf.setGenerationTime(now); newSdf.setGenerationId(sdf52.getGenerationId()); newSdf.setMessageId(String.valueOf(sdf52.getGenerationId())); - newSdf.setParentId(sdf52.getMessageId()); + newSdf.setParentId(sdf52.getMessageId() != null ? sdf52.getMessageId().replaceAll("-", "") : null); if (!Objects.equals(newGenerationId, newSdf.getGenerationId())) { // never log.warn("Different GenerationId={} for sdf53[{}] and GenerationId={} for group of sdf52", newSdf.getGenerationId(), newSdf.getId(), newGenerationId diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java index 742aabd83..f71dd386d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java @@ -302,7 +302,7 @@ public class Sdf01Executor extends AbstractExecutor { sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationTime(Instant.now()); sDf02.setMessageId(String.valueOf(sdf01.getGenerationId())); - sDf02.setParentId(sdf01.getMessageId()); + sDf02.setParentId(sdf01.getMessageId() != null ? sdf01.getMessageId().replaceAll("-", "") : null); return sDf02; } @@ -325,7 +325,7 @@ public class Sdf01Executor extends AbstractExecutor { sDf02.setGenerationTime(Instant.now()); sDf02.setResult(SdfResult.OK.getKey()); sDf02.setMessageId(String.valueOf(sdf01.getGenerationId())); - sDf02.setParentId(sdf01.getMessageId()); + sDf02.setParentId(sdf01.getMessageId() != null ? sdf01.getMessageId().replaceAll("-", "") : null); return sDf02; } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java index f7ec08834..8e86ffdf9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java @@ -358,7 +358,7 @@ public class Sdf06Executor { sDf07.setDoc_num(sdf06.getDoc_num()); sDf07.setPay_val(sdf06.getPay_val()); sDf07.setMessageId(String.valueOf(sdf06.getGenerationId())); - sDf07.setParentId(sdf06.getMessageId()); + sDf07.setParentId(sdf06.getMessageId() != null ? sdf06.getParentId().replaceAll("-", "") : null); return sDf07; }