diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java index 3ff8ad990..fc05ffab4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java @@ -195,7 +195,7 @@ public class Sdf20Executor { Long securityId) { Statement stmt = new Statement(); stmt.setAddresseeId(companyId); - stmt.setSenderId(Sender.Prc.getId()); + stmt.setSenderId(Sender.Rdc.getId()); stmt.setStatementType(StatementType.incr.getKey()); //fixme stmt.setComment(sdf10.()); stmt.setAccountId(account.getId()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java index fbb1f0dfb..a9bbf4731 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java @@ -260,7 +260,7 @@ public class Sdf21Executor extends AbstractExecutor { private Statement create(SDf21 sdf21, Company cmp, Account acc) { Statement statement = new Statement(); statement.setAddresseeId(cmp.getId()); - statement.setSenderId(Sender.Prc.getId()); + statement.setSenderId(Sender.Rdc.getId()); statement.setStatementType(StatementType.incr.getKey()); //fixme statement.setComment(sdf21.()); statement.setAccountId(acc.getId()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf20ValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf20ValidationRule.java index 7afdccd49..2552d0afe 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf20ValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf20ValidationRule.java @@ -12,9 +12,7 @@ import ru.spcex.clearing.error.ClearingError; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.service.AssetTrio; import ru.spcex.clearing.service.registry.RegistryManager; -import ru.spcex.platform.enumeration.AccountType; -import ru.spcex.platform.enumeration.NoRef; -import ru.spcex.platform.enumeration.OperationCode; +import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; @@ -67,6 +65,12 @@ public enum Sdf20ValidationRule implements IValidationRule