Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -333,9 +333,9 @@ public class PackagesRules extends QueryRules {
|
||||
|
||||
public static HashMap<String, Object> calcPeso(Connection conn, MtbColr entity) throws Exception {
|
||||
String sql = "select cifre_dec from mtb_unt_mis where flag_unita_kg = 'S'";
|
||||
Integer cifreDec = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
|
||||
BigDecimal cifreDec = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
|
||||
|
||||
if ( cifreDec == null ) { cifreDec = 5; }
|
||||
if ( cifreDec == null ) { cifreDec = BigDecimal.valueOf(5); }
|
||||
|
||||
sql =
|
||||
"SELECT mtb_aart.unt_mis, " +
|
||||
@@ -375,9 +375,9 @@ public class PackagesRules extends QueryRules {
|
||||
} else {
|
||||
pesoNetto = entity.getQtaCol();
|
||||
}
|
||||
pesoNetto = pesoNetto.multiply(pesoKg).setScale(cifreDec, RoundingMode.HALF_UP);
|
||||
pesoNetto = pesoNetto.multiply(pesoKg).setScale(cifreDec.intValue(), RoundingMode.HALF_UP);
|
||||
}
|
||||
pesoLordo = pesoNetto.add(taraKg.multiply(entity.getNumCnf()).setScale(cifreDec, RoundingMode.HALF_UP));
|
||||
pesoLordo = pesoNetto.add(taraKg.multiply(entity.getNumCnf()).setScale(cifreDec.intValue(), RoundingMode.HALF_UP));
|
||||
}
|
||||
|
||||
HashMap<String, Object> pesi = new HashMap<String, Object>();
|
||||
|
||||
Reference in New Issue
Block a user