http://jira.mfd.msk:8088/browse/CLS-753

2024-09-09 12:28:21 +03:00 · 2024-09-09 12:28:21 +03:00 · b408fd5375
commit b408fd5375
parent 8d3aff8a83
5 changed files with 22 additions and 22 deletions
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
@ -247,7 +247,7 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                    }
                }
                BigDecimal value;
-                value = omtBalance.subtract(tmtBalance);
+                value = tmtBalance.subtract(omtBalance);
                ksRepCashNettoReport.setLotCurrency(registry.getSecuritySymbol());
                if (withValue) {
                    KSRepCashNettoReport withoutValueClone = ksRepCashNettoReport.cloneWithoutValues();
@ -262,7 +262,7 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                }
                if (withCurrencyNetto) {
                    KSRepCashNettoReport withoutValueClone = ksRepCashNettoReport.cloneWithoutValues();
-                    withoutValueClone.setCurrencyNetto(omtCurrencyNetto.subtract(tmtCurrencyNetto));
+                    withoutValueClone.setCurrencyNetto(tmtCurrencyNetto.subtract(omtCurrencyNetto));
                    withoutValueClone.setTrExecDate(LocalDate.now());
                    rows.add(withoutValueClone);
                }
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java
@ -222,7 +222,7 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
                        })
                        .map(Registry::getBalance)
                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                ksRepCashRegistersReport.setChangeBalance(omtBalanceSum.subtract(tmtBalanceSum).subtract(dmxBalanceSum));
+                ksRepCashRegistersReport.setChangeBalance(tmtBalanceSum.subtract(omtBalanceSum).subtract(dmxBalanceSum));


                registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DM_I).buildPredicate(pb);
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv
@ -1,3 +1,3 @@
 "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE","LOT_CURRENCY","CURRENCY_NETTO","TR_EXECDATE"
-"TRADING_CODE","146","20.01.1970T02:49:58","ACCOUNT","TKR","22.22","06.08.2024",,,,,
-"TRADING_CODE","146","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR",,"06.08.2024","22.22","44.44",,,
+"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT","TKR","-22.22","09.09.2024",,,,,
+"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR",,"09.09.2024","22.22","44.44",,,
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv
@ -1,16 +1,16 @@
 "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE","LOT_CURRENCY","CURRENCY_NETTO","TR_EXECDATE"
-"95","2","20.01.1970T02:49:58","30411810300000002049","0095CAT00001",,"27.06.2024",,,"UZS","-10000","27.06.2024"
-"8","2","20.01.1970T02:49:58","3,04118607E+019","0008MAT00001",,"27.06.2024",,,"UZS","10000","27.06.2024"
-"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001","9743.90","27.06.2024",,,"RUB",,
-"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001",,"27.06.2024","0.00","7000000000.00","RUB",,
-"8","2","20.01.1970T02:49:58","3,04118102E+019","0008MAT00001",,"27.06.2024",,,"RUB","-69.75","27.06.2024"
-"472","2","20.01.1970T02:49:58","3,04118605E+019","0472CAT00001",,"27.06.2024",,,"UZS","-10000000","27.06.2024"
-"302","2","20.01.1970T02:49:58","3,04118107E+019","0302MAT00001",,"27.06.2024","10000000000.00","0.00","RUB",,
-"472","2","20.01.1970T02:49:58","3,04111569E+019","0472CAT00001",,"27.06.2024",,,"CNY","10","27.06.2024"
-"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001","-9743.90","27.06.2024",,,"RUB",,
-"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001",,"27.06.2024",,,"RUB","69627.92","27.06.2024"
-"45","2","20.01.1970T02:49:58","3,04118103E+019","0045CAT00001",,"27.06.2024","0.00","3000000000.00","RUB",,
-"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"RUB","-69627.92","27.06.2024"
-"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"UZS","10000000","27.06.2024"
-"95","2","20.01.1970T02:49:58","30411810300000002094","0095CAT00001",,"27.06.2024",,,"RUB","69.75","27.06.2024"
-"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"CNY","-10","27.06.2024"
+"95","2","20.01.1970T02:49:58","30411810300000002049","0095CAT00001",,"09.09.2024",,,"UZS","10000","09.09.2024"
+"8","2","20.01.1970T02:49:58","3,04118607E+019","0008MAT00001",,"09.09.2024",,,"UZS","-10000","09.09.2024"
+"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001","-9743.90","09.09.2024",,,"RUB",,
+"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001",,"09.09.2024","0.00","7000000000.00","RUB",,
+"8","2","20.01.1970T02:49:58","3,04118102E+019","0008MAT00001",,"09.09.2024",,,"RUB","69.75","09.09.2024"
+"472","2","20.01.1970T02:49:58","3,04118605E+019","0472CAT00001",,"09.09.2024",,,"UZS","10000000","09.09.2024"
+"302","2","20.01.1970T02:49:58","3,04118107E+019","0302MAT00001",,"09.09.2024","10000000000.00","0.00","RUB",,
+"472","2","20.01.1970T02:49:58","3,04111569E+019","0472CAT00001",,"09.09.2024",,,"CNY","-10","09.09.2024"
+"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001","9743.90","09.09.2024",,,"RUB",,
+"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001",,"09.09.2024",,,"RUB","-69627.92","09.09.2024"
+"45","2","20.01.1970T02:49:58","3,04118103E+019","0045CAT00001",,"09.09.2024","0.00","3000000000.00","RUB",,
+"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"RUB","69627.92","09.09.2024"
+"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"UZS","-10000000","09.09.2024"
+"95","2","20.01.1970T02:49:58","30411810300000002094","0095CAT00001",,"09.09.2024",,,"RUB","-69.75","09.09.2024"
+"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"CNY","10","09.09.2024"
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_REGISTERS_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_REGISTERS_expected.csv
@ -1,3 +1,3 @@
 "FIRMID","ACCOUNT","TKR","DATE","REGISTER_CODE","REGISTER_NAME","OPEN_BALANCE","CHANGE_BALANCE","ADD_WITHDRAW","CLOSE_BALANCE","REMARKS","TRADE_NUM","CURRENCY"
-"TRADING_CODE","ACCOUNT_FROM_ACCOUNT","TRADING_CLEARING_REGISTRY","06.08.2024","AM_T","AM_T_NAME","77.78","189.00","111.00","377.78",,,
-"TRADING_CODE","ACCOUNT","TRADING_CLEARING_REGISTRY","06.08.2024","AM_T","AM_T_NAME","77.78","189.00","111.00","377.78",,,
+"TRADING_CODE","ACCOUNT_FROM_ACCOUNT","TRADING_CLEARING_REGISTRY","09.09.2024","AM_T","AM_T_NAME","77.78","-211.00","111.00","-22.22",,,
+"TRADING_CODE","ACCOUNT","TRADING_CLEARING_REGISTRY","09.09.2024","AM_T","AM_T_NAME","77.78","-211.00","111.00","-22.22",,,