From 23b86e68cc474c21c1f76bac0f0f95baae205993 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 4 May 2021 17:34:00 +0200 Subject: [PATCH 1/2] Fix su scansione barcode ean13 in dialog input quantity --- .../viewmodel/ProdVersamentoMaterialViewModel.java | 7 ++++--- .../input_quantity_v2/DialogInputQuantityV2ViewModel.java | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index a01639a8..b522b1b1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -128,7 +128,7 @@ public class ProdVersamentoMaterialViewModel { DialogSimpleMessageView .makeWarningDialog(new SpannableString(Html.fromHtml("Il collo selezionato non presenta articoli versabili sulla linea.")), null, this::openLU) - .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); + .show(mContext.getSupportFragmentManager(), "tag"); return; } else if (mtbColt.get().getMtbColr().size() > 1) { @@ -137,10 +137,11 @@ public class ProdVersamentoMaterialViewModel { null, () -> { cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione); }) - .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); + .show(mContext.getSupportFragmentManager(), "tag"); return; } + MesRESTConsumer.getOrdiniLavorazioneMateriale( mtbDepoPosizione.getPosizione(), getIdMaterialeFromCollo(mtbColt.get()), @@ -148,7 +149,7 @@ public class ProdVersamentoMaterialViewModel { e -> DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(e.getMessage())), null, this::openLU) - .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag")); + .show(mContext.getSupportFragmentManager(), "tag")); } } else { DialogSimpleMessageView 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 ad1c9972..d65f4722 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 @@ -185,6 +185,8 @@ public class DialogInputQuantityV2ViewModel { this.mListener.onError(ex); onComplete.run(); }); + } else { + onComplete.run(); } } From ef6cdc6a862371d5c4f6ee95909f5027588a92b8 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 4 May 2021 17:34:30 +0200 Subject: [PATCH 2/2] -> v1.16.32 (214) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c169c3e2..cdb56bf2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 213 - def appVersionName = '1.16.31' + def appVersionCode = 214 + def appVersionName = '1.16.32' signingConfigs { release {