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

Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-08-04 12:41:04 +02:00
parent 122e56bfe7 ab7aa9e0bf
commit 7a97a55df1
4 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,6 +764,17 @@ public class AccountingRules extends QueryRules {
return campi; return campi;
} }
public static void setImportoMov(CtbMovt ctbMovt) throws Exception {
if ( UtilityBigDecimal.isNullOrZero(ctbMovt.getImporto() )) {
ctbMovt.getCtbMovr()
.stream()
.filter(x->x.getOperation() != OperationType.DELETE).forEach(x->{
BigDecimal impDare = x.getImpDare() == null ? BigDecimal.ZERO : x.getImpDare();
ctbMovt.setImporto(ctbMovt.getImporto().add(impDare));
});
}
}
public static Boolean chkMovimentoBilanciato(CtbMovt ctbMovt) throws Exception { public static Boolean chkMovimentoBilanciato(CtbMovt ctbMovt) throws Exception {
BigDecimal totDare = BigDecimal.ZERO, totAvere = BigDecimal.ZERO; BigDecimal totDare = BigDecimal.ZERO, totAvere = BigDecimal.ZERO;

17
ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
View File

@@ -527,23 +527,6 @@ public class DocumentRules extends QueryRules {
return costoUnt; return costoUnt;
} }
public static HashMap<String, Object> completeDatiDocVal(Connection conn, DtbDoct entity) {
HashMap<String, Object> campi = new HashMap<String, Object>();
String previstaFat = entity.getPrevistaFat();
if ("N".equals(previstaFat)) {
campi.put("codDtipVal", entity.getCodDtip());
campi.put("dataDocVal", entity.getDataDoc());
campi.put("serDocVal", entity.getSerDoc());
campi.put("numDocVal", entity.getNumDoc());
} else {
campi.put("codDtipVal", EmsRestConstants.NULL);
campi.put("dataDocVal", EmsRestConstants.DATE_NULL);
campi.put("serDocVal", EmsRestConstants.NULL);
campi.put("numDocVal", EmsRestConstants.INTEGER_NULL);
}
return campi;
}
public static MtbPartitaMag insertPartitaMag(Connection conn, DtbDocr entity) throws Exception { public static MtbPartitaMag insertPartitaMag(Connection conn, DtbDocr entity) throws Exception {
String sql = String sql =
Query.format( Query.format(

1
ems-core/src/main/resources/rules/post_calc.drl
View File

@@ -198,6 +198,7 @@ then
CommonRules.reloadRow(conn, $entity); CommonRules.reloadRow(conn, $entity);
/*Sulla ctb_movr abbiamo 2 campi riga da valorizzare*/ /*Sulla ctb_movr abbiamo 2 campi riga da valorizzare*/
CommonRules.completeRigaCtbMovr( $entity); CommonRules.completeRigaCtbMovr( $entity);
AccountingRules.setImportoMov( $ctbMovt );
AccountingRules.chkMovimentoBilanciato($ctbMovt); AccountingRules.chkMovimentoBilanciato($ctbMovt);
end end

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

@@ -302,13 +302,13 @@ public class ContabilImportService {
desAgg.toUpperCase(); desAgg.toUpperCase();
CtbMovr movr = CtbMovr movr =
new CtbMovr() new CtbMovr()
.setCodCcon(mov.getCodCcon()) .setCodCcon(mov.getCodCcon())
.setImpDare(mov.getDareCalc()) .setImpDare(mov.getDareCalc())
.setImpAvere(mov.getAvereCalc()) .setImpAvere(mov.getAvereCalc())
.setCodJfas(mov.getCodJfas()) .setCodJfas(mov.getCodJfas())
.setDesAgg(desAgg) .setDesAgg(desAgg)
.setIdFlav(mov.getSel_2()); .setIdFlav(mov.getSel_2());
if (mov.isCostoCC()) { if (mov.isCostoCC()) {
movr.setDataInizCompRisc(dataIniz); movr.setDataInizCompRisc(dataIniz);
movr.setDataFineCompRisc(dataReg); movr.setDataFineCompRisc(dataReg);
@@ -318,11 +318,11 @@ public class ContabilImportService {
ctbMovrList.add(movr); ctbMovrList.add(movr);
if (!UtilityString.isNullOrEmpty(mov.getCodCconCp())) { if (!UtilityString.isNullOrEmpty(mov.getCodCconCp())) {
CtbMovr movr_cp = CtbMovr movr_cp =
new CtbMovr() new CtbMovr()
.setCodCcon(mov.getCodCconCp()) .setCodCcon(mov.getCodCconCp())
.setImpDare(mov.getAvereCalc()) .setImpDare(mov.getAvereCalc())
.setImpAvere(mov.getDareCalc()) .setImpAvere(mov.getDareCalc())
.setCodJfas(mov.getCodJfas()); .setCodJfas(mov.getCodJfas());
movr_cp.setDesAgg(desAgg); movr_cp.setDesAgg(desAgg);
if (mov.isCostoCP()) { if (mov.isCostoCP()) {
@@ -603,6 +603,7 @@ public class ContabilImportService {
List<CtbMovt> ctbMovtList = new ArrayList<>(); List<CtbMovt> ctbMovtList = new ArrayList<>();
for (CtbMovt ctbMovt : movimenti.keySet()) { for (CtbMovt ctbMovt : movimenti.keySet()) {
String codCcau = ctbMovt.getCodCcau(); String codCcau = ctbMovt.getCodCcau();
sql = Query.format("SELECT CAST(COUNT(*) AS BIT) FROM ctb_caus WHERE cod_ccau = %s", codCcau); sql = Query.format("SELECT CAST(COUNT(*) AS BIT) FROM ctb_caus WHERE cod_ccau = %s", codCcau);
boolean codCcauExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql); boolean codCcauExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
@@ -661,7 +662,7 @@ public class ContabilImportService {
"FROM ctb_scad\n" + "FROM ctb_scad\n" +
"WHERE (intercode = %s\n" + "WHERE (intercode = %s\n" +
" OR dbo.f_getChiaveCogeDocFinace(anno_part, ser_doc, num_doc, id_riga, tipo_anag) = %s)" + " OR dbo.f_getChiaveCogeDocFinace(anno_part, ser_doc, num_doc, id_riga, tipo_anag) = %s)" +
" AND cod_anag = %s AND tipo_anag = %s" " AND cod_anag = %s AND tipo_anag = %s AND data_pag IS NULL"
, chiaveCoge, chiaveCoge, codAnag, tipoAnag , chiaveCoge, chiaveCoge, codAnag, tipoAnag
); );
List<CtbScad> ctbScadList = UtilityDB.executeSimpleQueryDTO(conn, sql, CtbScad.class); List<CtbScad> ctbScadList = UtilityDB.executeSimpleQueryDTO(conn, sql, CtbScad.class);
@@ -675,9 +676,9 @@ public class ContabilImportService {
.setSerDoc(ctbScadList.get(0).getSerDoc()) .setSerDoc(ctbScadList.get(0).getSerDoc())
.setNumDoc(ctbScadList.get(0).getNumDoc()); .setNumDoc(ctbScadList.get(0).getNumDoc());
if (!UtilityBigDecimal.isNullOrZero(residuo)){ if (!UtilityBigDecimal.equalsOrLowerThan(residuo, BigDecimal.ZERO)) {
AnomalieDTO anomalia = AnomalieDTO.warning(String.format("Importo del movimento superiore rispetto all'importo della partita %s/%s del %s %s ", 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)); ctbMovr.getSerDoc(), ctbMovr.getNumDoc(), ctbMovr.getAnnoPart(), codAnag));
listAnomalie.add(anomalia); listAnomalie.add(anomalia);
} }