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

Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Fabio Narracci
2025-07-17 12:20:53 +02:00
parent edcc08c9da 3d9bf7ebde
commit 305c79a558
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
View File

@@ -989,6 +989,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
BigDecimal rapConv = row.getRapConv(); BigDecimal rapConv = row.getRapConv();
BigDecimal pesoLordoRow = row.getPesoLordo(); BigDecimal pesoLordoRow = row.getPesoLordo();
BigDecimal qtaCnf = row.getQtaCnf(); BigDecimal qtaCnf = row.getQtaCnf();
BigDecimal qtaDoc = qta;
BigDecimal pesoKgTot = UtilityBigDecimal.isNull(datiTrasp.getPesoKg(), BigDecimal.ZERO); BigDecimal pesoKgTot = UtilityBigDecimal.isNull(datiTrasp.getPesoKg(), BigDecimal.ZERO);
BigDecimal colliTot = UtilityBigDecimal.isNull(datiTrasp.getColli(), BigDecimal.ZERO); BigDecimal colliTot = UtilityBigDecimal.isNull(datiTrasp.getColli(), BigDecimal.ZERO);
@@ -1027,13 +1028,13 @@ public class DocOrdCalTotaliRules extends QueryRules {
} else { } else {
qtaCnfInt = qtaCnf.setScale(0, RoundingMode.DOWN); qtaCnfInt = qtaCnf.setScale(0, RoundingMode.DOWN);
if (qtaCnf.subtract(qtaCnfInt).compareTo(BigDecimal.ZERO) > 0) { 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); colliRiga = colliRiga.setScale(0, RoundingMode.DOWN);
sfusoRiga = BigDecimal.ZERO; sfusoRiga = BigDecimal.ZERO;
} else { } else {
colliRiga = qta.divide(qtaCnf, RoundingMode.HALF_UP); colliRiga = qtaDoc.divide(qtaCnf, RoundingMode.HALF_UP);
colliRiga = colliRiga.setScale(0, RoundingMode.DOWN); 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); sfusoRiga = IntegerUtility.round(sfusoRiga, 0);
} }
} }