From 9a0c342c4d85700cd34e8f23d925ab46207ed0d6 Mon Sep 17 00:00:00 2001 From: FabioN Date: Thu, 17 Jul 2025 12:08:29 +0200 Subject: [PATCH] Modifica calcolo num_colli --- .../integry/ems/rules/completing/DocOrdCalTotaliRules.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java index 5d396e3bce..9962f19978 100644 --- a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java @@ -989,6 +989,7 @@ public class DocOrdCalTotaliRules extends QueryRules { BigDecimal rapConv = row.getRapConv(); BigDecimal pesoLordoRow = row.getPesoLordo(); BigDecimal qtaCnf = row.getQtaCnf(); + BigDecimal qtaDoc = qta; BigDecimal pesoKgTot = UtilityBigDecimal.isNull(datiTrasp.getPesoKg(), BigDecimal.ZERO); BigDecimal colliTot = UtilityBigDecimal.isNull(datiTrasp.getColli(), BigDecimal.ZERO); @@ -1027,13 +1028,13 @@ public class DocOrdCalTotaliRules extends QueryRules { } else { qtaCnfInt = qtaCnf.setScale(0, RoundingMode.DOWN); if (qtaCnf.subtract(qtaCnfInt).compareTo(BigDecimal.ZERO) > 0) { - colliRiga = IntegerUtility.round(qta.divide(qtaCnf, RoundingMode.HALF_UP), 0); + colliRiga = IntegerUtility.round(qtaDoc.divide(qtaCnf, RoundingMode.HALF_UP), 0); colliRiga = colliRiga.setScale(0, RoundingMode.DOWN); sfusoRiga = BigDecimal.ZERO; } else { - colliRiga = qta.divide(qtaCnf, RoundingMode.HALF_UP); + colliRiga = qtaDoc.divide(qtaCnf, RoundingMode.HALF_UP); colliRiga = colliRiga.setScale(0, RoundingMode.DOWN); - sfusoRiga = new BigDecimal(qta.doubleValue() % qtaCnf.doubleValue()); + sfusoRiga = new BigDecimal(qtaDoc.doubleValue() % qtaCnf.doubleValue()); sfusoRiga = IntegerUtility.round(sfusoRiga, 0); } }