Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
jenkins
2025-05-23 16:36:33 +02:00

View File

@@ -646,9 +646,10 @@ public class DocOrdCalTotaliRules extends QueryRules {
calcPesoColli(row, qta, datiTrasp);
}
//Assegna costo
boolean flagValCosto = ((DtbDoct) testata).getDtbTipi().getFlagCosto().equalsIgnoreCase("S");
if (row instanceof DtbDocr && (((DtbDocr) row).getCostoUnt() == null || ((DtbDocr) row).getCostoUnt().compareTo(BigDecimal.ZERO) == 0)) {
BigDecimal costo = BigDecimal.ZERO;
if ("A".equals(gestione)) {
if ("A".equals(gestione) || flagValCosto) {
costo = DocumentRules.completeCostoUntDocA(conn, ((DtbDocr) row));
} else if ("L".equals(gestione)) {
costo = DocumentRules.completeCostoUntDocL(conn, ((DtbDocr) row));