Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Fabio Narracci
2025-07-11 18:52:53 +02:00
parent 831b0fc7c3 038245c883
commit e12c484190
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java
View File

@@ -596,17 +596,30 @@ public class AccountingRules extends QueryRules {
BigDecimal impDare = BigDecimal.ZERO; BigDecimal impDare = BigDecimal.ZERO;
BigDecimal impAvere = BigDecimal.ZERO; BigDecimal impAvere = BigDecimal.ZERO;
if (UtilityBigDecimal.greaterThan(ctbMovr.getImpDare(), BigDecimal.ZERO)) { // if (UtilityBigDecimal.greaterThan(ctbMovr.getImpDare(), BigDecimal.ZERO)) {
// if (ctbScad.getImpDare() == null)
// impDare = ctbMovr.getImpDare();
// else
// impDare = ctbScad.getImpDare().divide(cambioScad, 5, RoundingMode.HALF_UP);
// }
// if (UtilityBigDecimal.greaterThan(ctbMovr.getImpAvere(), BigDecimal.ZERO)) {
// if (ctbScad.getImpAvere() == null)
// impAvere = ctbMovr.getImpAvere();
// else
// impAvere = ctbScad.getImpAvere().divide(cambioScad).setScale(5, RoundingMode.HALF_UP);
// }
Boolean riperta = ctbScad.getRiaperta()==null?false:ctbScad.getRiaperta();
if ( tipoPartita == 0 || (riperta && tipoPartita == 1)){
if (ctbScad.getImpDare() == null) if (ctbScad.getImpDare() == null)
impDare = ctbMovr.getImpDare(); impDare = ctbMovr.getImpDare();
else else
impDare = ctbScad.getImpDare().divide(cambioScad, 5, RoundingMode.HALF_UP); impDare = ctbScad.getImpDare().divide(cambioScad, 5, RoundingMode.HALF_UP);
} } else {
if (UtilityBigDecimal.greaterThan(ctbMovr.getImpAvere(), BigDecimal.ZERO)) {
if (ctbScad.getImpAvere() == null) if (ctbScad.getImpAvere() == null)
impAvere = ctbMovr.getImpAvere(); impAvere = ctbMovr.getImpAvere();
else else
impAvere = ctbScad.getImpAvere().divide(cambioScad).setScale(5, RoundingMode.HALF_UP); impAvere = ctbScad.getImpAvere().divide(cambioScad, 5, RoundingMode.HALF_UP);
} }
ctbParr = ctbParr =

13
ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ContabilImportService.java
View File

@@ -616,13 +616,13 @@ public class ContabilImportService {
for (MovimentiContabiliDocfinanceDTO mov : movimenti.get(ctbMovt)) { for (MovimentiContabiliDocfinanceDTO mov : movimenti.get(ctbMovt)) {
String diacod = mov.getPianoDeiConti(); String diacod = mov.getPianoDeiConti();
sql = Query.format( sql = Query.format(
"SELECT gtb_anag.cod_anag, ctb_anag.cod_ccon, IIF(vtb_clie.cod_anag IS NOT NULL, 'C', 'F') AS tipo_anag\n" + "SELECT gtb_anag.cod_anag, ctb_anag.cod_ccon, IIF(vtb_clie.cod_anag IS NOT NULL, 'C', 'F') AS tipo_anag, gtb_anag.rag_soc\n" +
"FROM gtb_anag\n" + "FROM gtb_anag\n" +
" INNER JOIN ctb_anag ON gtb_anag.cod_anag = ctb_anag.cod_anag\n" + " INNER JOIN ctb_anag ON gtb_anag.cod_anag = ctb_anag.cod_anag\n" +
" LEFT OUTER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag\n" + " LEFT OUTER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag\n" +
"WHERE gtb_anag.diacod = %s\n" + "WHERE gtb_anag.diacod = %s\n" +
"UNION\n" + "UNION\n" +
"SELECT NULL, ctb_cont.cod_ccon, NULL\n" + "SELECT NULL, ctb_cont.cod_ccon, NULL, ctb_cont.descrizione\n" +
"FROM ctb_cont\n" + "FROM ctb_cont\n" +
"WHERE diacod = %s", "WHERE diacod = %s",
diacod, diacod diacod, diacod
@@ -668,12 +668,19 @@ public class ContabilImportService {
if (ctbScadList == null || ctbScadList.isEmpty()) { if (ctbScadList == null || ctbScadList.isEmpty()) {
listAnomalie.add(AnomalieDTO.warning(String.format("Chiave coge non trovato: %s", chiaveCoge))); listAnomalie.add(AnomalieDTO.warning(String.format("Chiave coge non trovato: %s", chiaveCoge)));
} else { } else {
AccountingBusinessLogic.pagaScadenze(mov.getDataOperazione(), controvalore, ctbScadList); BigDecimal residuo = AccountingBusinessLogic.pagaScadenze(mov.getDataOperazione(), controvalore, ctbScadList);
ctbMovr.setCtbScad(ctbScadList); ctbMovr.setCtbScad(ctbScadList);
ctbMovr.setAnnoPart(ctbScadList.get(0).getAnnoPart()) ctbMovr.setAnnoPart(ctbScadList.get(0).getAnnoPart())
.setSerDoc(ctbScadList.get(0).getSerDoc()) .setSerDoc(ctbScadList.get(0).getSerDoc())
.setNumDoc(ctbScadList.get(0).getNumDoc()); .setNumDoc(ctbScadList.get(0).getNumDoc());
if (!UtilityBigDecimal.isNullOrZero(residuo)){
AnomalieDTO anomalia = AnomalieDTO.warning(String.format("Importo del movimento superiore rispetto all'importo della partita %s/%s del %s %s ",
ctbMovr.getSerDoc(), ctbMovr.getNumDoc(), ctbMovr.getAnnoPart(), codAnag));
listAnomalie.add(anomalia);
}
} }
} }