diff --git a/app/build.gradle b/app/build.gradle index 9156ab11..2f662b11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 230 - def appVersionName = '1.18.0' + def appVersionCode = 231 + def appVersionName = '1.18.1' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java index 3a606701..c1b418d5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java @@ -3,6 +3,8 @@ package it.integry.integrywmsnative.core.utility; import java.math.BigDecimal; import java.math.RoundingMode; +import it.integry.integrywmsnative.core.CommonConst; + public class UtilityBigDecimal { public static boolean greaterThan(BigDecimal input, BigDecimal toCompareWith) { @@ -76,7 +78,13 @@ public class UtilityBigDecimal { } public static BigDecimal multiply(BigDecimal input1, BigDecimal multiplier) { + if (input1 == null || multiplier == null) return null; return input1.multiply(multiplier); } + public static BigDecimal round(BigDecimal input) { + if (input == null) return null; + return input.setScale(CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS, RoundingMode.HALF_EVEN); + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java index f6de4bc8..f32066af 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; public class DialogInputQuantityV2DTO { @@ -43,7 +44,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getInitialNumCnf() { - return initialNumCnf; + return UtilityBigDecimal.round(initialNumCnf); } public DialogInputQuantityV2DTO setInitialNumCnf(BigDecimal initialNumCnf) { @@ -52,7 +53,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getInitialQtaCnf() { - return initialQtaCnf; + return UtilityBigDecimal.round(initialQtaCnf); } public DialogInputQuantityV2DTO setInitialQtaCnf(BigDecimal initialQtaCnf) { @@ -61,7 +62,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getInitialQtaTot() { - return initialQtaTot; + return UtilityBigDecimal.round(initialQtaTot); } public DialogInputQuantityV2DTO setInitialQtaTot(BigDecimal initialQtaTot) { @@ -70,7 +71,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalQtaOrd() { - return totalQtaOrd; + return UtilityBigDecimal.round(totalQtaOrd); } public DialogInputQuantityV2DTO setTotalQtaOrd(BigDecimal totalQtaOrd) { @@ -79,7 +80,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalNumCnfOrd() { - return totalNumCnfOrd; + return UtilityBigDecimal.round(totalNumCnfOrd); } public DialogInputQuantityV2DTO setTotalNumCnfOrd(BigDecimal totalNumCnfOrd) { @@ -88,7 +89,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getQtaCnfOrd() { - return qtaCnfOrd; + return UtilityBigDecimal.round(qtaCnfOrd); } public DialogInputQuantityV2DTO setQtaCnfOrd(BigDecimal qtaCnfOrd) { @@ -97,7 +98,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalQtaToBeTaken() { - return totalQtaToBeTaken; + return UtilityBigDecimal.round(totalQtaToBeTaken); } public DialogInputQuantityV2DTO setTotalQtaToBeTaken(BigDecimal totalQtaToBeTaken) { @@ -106,7 +107,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalNumCnfToBeTaken() { - return totalNumCnfToBeTaken; + return UtilityBigDecimal.round(totalNumCnfToBeTaken); } public DialogInputQuantityV2DTO setTotalNumCnfToBeTaken(BigDecimal totalNumCnfToBeTaken) { @@ -115,7 +116,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getQtaCnfToBeTaken() { - return qtaCnfToBeTaken; + return UtilityBigDecimal.round(qtaCnfToBeTaken); } public DialogInputQuantityV2DTO setQtaCnfToBeTaken(BigDecimal qtaCnfToBeTaken) { @@ -124,7 +125,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalQtaAvailable() { - return totalQtaAvailable; + return UtilityBigDecimal.round(totalQtaAvailable); } public DialogInputQuantityV2DTO setTotalQtaAvailable(BigDecimal totalQtaAvailable) { @@ -133,7 +134,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getTotalNumCnfAvailable() { - return totalNumCnfAvailable; + return UtilityBigDecimal.round(totalNumCnfAvailable); } public DialogInputQuantityV2DTO setTotalNumCnfAvailable(BigDecimal totalNumCnfAvailable) { @@ -142,7 +143,7 @@ public class DialogInputQuantityV2DTO { } public BigDecimal getQtaCnfAvailable() { - return qtaCnfAvailable; + return UtilityBigDecimal.round(qtaCnfAvailable); } public DialogInputQuantityV2DTO setQtaCnfAvailable(BigDecimal qtaCnfAvailable) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java index dc52a7f7..da167cb4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java @@ -50,7 +50,7 @@ public class DialogScanArtViewModel { //Cerco l'UL presente all'interno della posizione // this.executeEtichettaPosizione(barcodeScanDTO.getStringValue(), onComplete); - } else if(UtilityBarcode.isEtichetta128(barcodeScanDTO) && !mForceOnlyUL) { + } else if(UtilityBarcode.isEtichetta128(barcodeScanDTO)) { this.executeEtichettaEan128(barcodeScanDTO, onComplete); } else if(UtilityBarcode.isEanPeso(barcodeScanDTO) && !mForceOnlyUL){ this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);