From fcefb27c9617a0741d686fc8f71ef4d3ce7b16a7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 13 Dec 2019 19:06:32 +0100 Subject: [PATCH 1/2] Sistemato controllo qta --- .../viewmodel/VenditaOrdineInevasoViewModel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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()); From 05fef23b2078bd90659665bc1f194b1b33c1167f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 13 Dec 2019 19:07:17 +0100 Subject: [PATCH 2/2] -> v1.10.7 (110) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 80c3ff9f..240e3a34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 109 - def appVersionName = '1.10.6' + def appVersionCode = 110 + def appVersionName = '1.10.7' signingConfigs { release {