diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml index 3f4b56c1..9aa69d84 100644 --- a/.idea/dbnavigator.xml +++ b/.idea/dbnavigator.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java index 0f41a363..4ead3ea1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java @@ -12,7 +12,7 @@ public class StbGestSetup extends EntityBase{ private String flagSync; private String queryDefault; private String flagUserView; - private Date dataModifica; + private String dataModifica; private String modificatoDa; private String flagSetupDepo; private String flagSetupUserWeb; @@ -93,11 +93,11 @@ public class StbGestSetup extends EntityBase{ return this; } - public Date getDataModifica() { + public String getDataModifica() { return dataModifica; } - public StbGestSetup setDataModifica(Date dataModifica) { + public StbGestSetup setDataModifica(String dataModifica) { this.dataModifica = dataModifica; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java index 041f18c0..a36929e9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java @@ -85,4 +85,10 @@ public class UtilityNumber { return floatValue; } + public static float truncateToDecimal(float v, int i) { + int delta = 10*i; + + return ((int)v*delta)/delta; + + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index dfe096ca..87406539 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -346,7 +346,7 @@ public class DialogInputQuantity { } if(quantityDTO.numCnf.get(false) == null) { - float numCnf = (float) Math.ceil(quantityDTO.qtaTot.get() / quantityDTO.qtaCnf.get()); + float numCnf = (float) Math.ceil(UtilityNumber.truncateToDecimal(quantityDTO.qtaTot.get() / quantityDTO.qtaCnf.get(),3)); if(numCnf < 1) numCnf = 1; quantityDTO.numCnf.set(numCnf); }