From 8c1cf38aa32f1909af476c79b2a1166dbc43414c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 20 Feb 2020 13:00:35 +0100 Subject: [PATCH 1/3] Fix updateDataFineCollo --- .../consumers/ColliMagazzinoRESTConsumer.java | 2 +- .../viewmodel/PickingLiberoViewModel.java | 23 +------------------ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index b951468d..1acac50c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -595,7 +595,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { MtbColt cloneMtbColt = (MtbColt) mtbColt.clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance()); - + cloneMtbColt.setMtbColr(new ObservableArrayList<>()); ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> { onComplete.run(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 632f0404..f07da8b7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -657,7 +657,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); if(thereIsAnyRowInUL.get()) { - updateDataFine(progress, () -> { + ColliMagazzinoRESTConsumer.updateDataFine(mContext, progress, this.mtbColt.get(), () -> { progress.dismiss(); setULToCurrentContext(null); }); //() -> distribuisciCollo(progress, () -> printCollo(progress))); @@ -668,27 +668,6 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } } - private void updateDataFine(Dialog progress, Runnable onComplete) { - - MtbColt cloneMtbColt = (MtbColt) this.mtbColt.get().clone(); - cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); - cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance()); - - - ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { - @Override - public void onSuccess(MtbColt value) { - if(onComplete != null) onComplete.run(); - } - - @Override - public void onFailed(Exception ex) { - UtilityExceptions.defaultException(mContext, ex, progress); - } - }); - - } - private void deleteCollo(Dialog progress) { //La delete è stata commentata poichè visto che nel WMS vengono sempre presi i RESIDUI, From f28d042bf0403e1a85e38d2633a7282d4cc588b9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 3 Mar 2020 12:13:17 +0100 Subject: [PATCH 2/3] Fix su altezza dialog Basket LU. Fix su update data fine pickingLibero --- .../viewmodel/PickingLiberoViewModel.java | 2 +- .../pages/page1/DialogBasketLU_Page1_ViewModel.java | 5 +++++ app/src/main/res/layout/dialog_basket_lu__page1.xml | 13 +++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index f07da8b7..54b376bb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -660,7 +660,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { ColliMagazzinoRESTConsumer.updateDataFine(mContext, progress, this.mtbColt.get(), () -> { progress.dismiss(); setULToCurrentContext(null); - }); //() -> distribuisciCollo(progress, () -> printCollo(progress))); + }, null); } else { deleteCollo(progress); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java index 9cc6d8ed..50196c74 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java @@ -14,6 +14,7 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.databinding.DialogBasketLuBinding; import it.integry.integrywmsnative.databinding.DialogBasketLuPage1Binding; import it.integry.integrywmsnative.view.dialogs.basket_lu.interfaces.DialogBasketLU_BaseViewModel; @@ -44,6 +45,10 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel @Override public void onShow() { + + + mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75)); + ColliMagazzinoRESTConsumer.retrieveBasketColli(mtbColts -> { availableMtbColts = mtbColts; if(mtbColts != null && mtbColts.size() > 0) initRecyclerView(availableMtbColts); diff --git a/app/src/main/res/layout/dialog_basket_lu__page1.xml b/app/src/main/res/layout/dialog_basket_lu__page1.xml index f02bb45a..4d435f2d 100644 --- a/app/src/main/res/layout/dialog_basket_lu__page1.xml +++ b/app/src/main/res/layout/dialog_basket_lu__page1.xml @@ -1,14 +1,19 @@ - + android:layout_height="wrap_content"> + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> @@ -68,5 +73,5 @@ - + \ No newline at end of file From 9bdfe5d9c952f4a9e82327e17382781a53b78ce5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 3 Mar 2020 12:14:57 +0100 Subject: [PATCH 3/3] -> 1.12.4 (133) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1961869c..bdba4f18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 132 - def appVersionName = '1.12.3' + def appVersionCode = 133 + def appVersionName = '1.12.4' signingConfigs { release {