diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 09006753..31d0c050 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -1147,14 +1147,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO boolean useQtaDaEvadere = false; if(tmpPickData.getQtaTot() != null) { - useQtaDaEvadere = isTakenFromUL || (qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa()); - if (useQtaDaEvadere) { + useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa(); + if (useQtaDaEvadere && !isTakenFromUL) { dto.setQtaTot(qtaDaEvadere); dto.setMaxQta(qtaDaEvadere); - if(isTakenFromUL) { - dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue()); - } +// if(isTakenFromUL) { +// dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue()); +// } } else { dto.setQtaTot(tmpPickData.getQtaTot());