From 8c1cf38aa32f1909af476c79b2a1166dbc43414c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 20 Feb 2020 13:00:35 +0100 Subject: [PATCH] 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,