diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 8d6b9da3..3bfac6e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -482,7 +482,7 @@ public class AccettazionePickingViewModel { if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) { - numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf()); + numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf()); if (!mtbAart.isFlagQtaCnfFissaBoolean()) { if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO)) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index b490ade5..1009b6d3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -117,6 +117,13 @@ public class DialogInputQuantityV2ViewModel { this.mtbAart.get().getBarCode() != null && (ean13PesoModel.getPrecode().contains(this.mtbAart.get().getBarCode()) || this.mtbAart.get().getBarCode().contains(ean13PesoModel.getPrecode()))) { this.setQtaTot(BigDecimal.valueOf(ean13PesoModel.getPeso())); + this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf())); + + if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) { + if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO)) + this.setNumCnf(BigDecimal.ONE); + this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf())); + } } onComplete.run(); @@ -146,6 +153,13 @@ public class DialogInputQuantityV2ViewModel { this.setNumCnf(BigDecimal.valueOf(ean128Model.Count)); } else if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) { this.setQtaTot(BigDecimal.valueOf(ean128Model.NetWeightKg)); + this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf())); + + if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) { + if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO)) + this.setNumCnf(BigDecimal.ONE); + this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf())); + } } this.mListener.onDataChanged();