diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java index 0d3803c77..270b886f6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java @@ -315,7 +315,7 @@ public class FormingPaymentInstruction implements ISessionStage { } } for (SDf12 sDf12 : sDf12Created) { - sDf12.setGenerationId(sdf03GroupId); + sDf12.setGenerationId(sdf12GroupId); sDf12.setTransactionNumber(maxTxNumber.toString()); sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size())); sDf12Imdg.insert(sDf12); @@ -324,6 +324,7 @@ public class FormingPaymentInstruction implements ISessionStage { if (sdf12GroupId != null) { SwtExporterRequest swtExporterRequest = new SwtExporterRequest(); swtExporterRequest.setType("SDF_12"); + swtExporterRequest.setGroupId(sdf12GroupId); kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java index 54a9aaa4a..77985d7b9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java @@ -350,7 +350,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage { } } for (SDf12 sDf12 : sDf12Created) { - sDf12.setGenerationId(sdf03GroupId); + sDf12.setGenerationId(sdf12GroupId); sDf12.setTransactionNumber(maxTxNumber.toString()); sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size())); sDf12Imdg.insert(sDf12); @@ -359,6 +359,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage { if (sdf12GroupId != null) { SwtExporterRequest swtExporterRequest = new SwtExporterRequest(); swtExporterRequest.setType("SDF_12"); + swtExporterRequest.setGroupId(sdf12GroupId); kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest); } if (sdf03GroupId != null) sentSdfs.add(SdfTable.SDF_03); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java index 24f37bb22..065e2581b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java @@ -274,7 +274,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { } } for (SDf12 sDf12 : sDf12Created) { - sDf12.setGenerationId(sdf03GroupId); + sDf12.setGenerationId(sdf12GroupId); sDf12.setTransactionNumber(maxTxNumber.toString()); sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size())); sDf12Imdg.insert(sDf12); @@ -283,6 +283,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { if (sdf12GroupId != null) { SwtExporterRequest swtExporterRequest = new SwtExporterRequest(); swtExporterRequest.setType("SDF_12"); + swtExporterRequest.setGroupId(sdf12GroupId); kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java index a1d9c24ba..2331be2fd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionReturnMkr.java @@ -260,7 +260,7 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage { } } for (SDf12 sDf12 : sDf12Created) { - sDf12.setGenerationId(sdf03GroupId); + sDf12.setGenerationId(sdf12GroupId); sDf12.setTransactionNumber(maxTxNumber.toString()); sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size())); sDf12Imdg.insert(sDf12); @@ -269,6 +269,7 @@ public class FormingPaymentInstructionReturnMkr implements ISessionStage { if (sdf12GroupId != null) { SwtExporterRequest swtExporterRequest = new SwtExporterRequest(); swtExporterRequest.setType("SDF_12"); + swtExporterRequest.setGroupId(sdf12GroupId); kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecondaryT0.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecondaryT0.java index f6cf35a8f..0f0b6c448 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecondaryT0.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecondaryT0.java @@ -269,7 +269,7 @@ public class FormingPaymentInstructionSecondaryT0 implements ISessionStage { } } for (SDf12 sDf12 : sDf12Created) { - sDf12.setGenerationId(sdf03GroupId); + sDf12.setGenerationId(sdf12GroupId); sDf12.setTransactionNumber(maxTxNumber.toString()); sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size())); sDf12Imdg.insert(sDf12); @@ -278,6 +278,7 @@ public class FormingPaymentInstructionSecondaryT0 implements ISessionStage { if (sdf12GroupId != null) { SwtExporterRequest swtExporterRequest = new SwtExporterRequest(); swtExporterRequest.setType("SDF_12"); + swtExporterRequest.setGroupId(sdf12GroupId); kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest); } }