From 0133a9232f5907bcb2b3f925b5bfc9e0c2b0e8f0 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 3 Mar 2021 10:00:12 +0100 Subject: [PATCH] Fix salvataggio id riga collo in Picking Libero --- .../picking_libero/PickingLiberoFragment.java | 23 +++---------------- .../PickingLiberoViewModel.java | 2 +- .../picking_resi/PickingResiViewModel.java | 2 +- build_azienda.bat | 10 ++++---- 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index 1e8c5749..bf6c709b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.picking_libero; -import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.text.SpannableString; @@ -32,6 +31,7 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; +import it.integry.integrywmsnative.core.expansion.BaseFragment; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgss; @@ -45,7 +45,6 @@ import it.integry.integrywmsnative.core.model.VtbDest; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter; @@ -58,13 +57,13 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; -import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; /** * A simple {@link Fragment} subclass. */ -public class PickingLiberoFragment extends Fragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener { +public class PickingLiberoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener { private FragmentPickingLiberoBinding mBindings; @@ -84,8 +83,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, private int barcodeScannerIstanceID = -1; - private Dialog mCurrentProgress; - private GestioneEnum mCurrentGestione; public PickingLiberoFragment() { @@ -216,20 +213,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, this.mViewModel.closeLU(null); } - - private void openProgress() { - if (this.mCurrentProgress == null) { - this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity()); - } - } - - private void closeProgress() { - if (mCurrentProgress != null) { - mCurrentProgress.dismiss(); - mCurrentProgress = null; - } - } - @Override public void onDestroy() { for (Runnable onPreDestroy : mOnPreDestroyList) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index b4eb4c77..59a9461a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -512,7 +512,7 @@ public class PickingLiberoViewModel { .setNumCollo(value.getNumCollo()) .setGestione(value.getGestione()) .setSerCollo(value.getSerCollo()) - .setRiga(value.getMtbColr().get(0).getRiga()) + .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga()) .setUntMis(pickingObjectDTO.getMtbAart().getUntMis()) .setMtbAart(pickingObjectDTO.getMtbAart()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java index 81d93859..84cd3e22 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java @@ -378,7 +378,7 @@ public class PickingResiViewModel { .setNumCollo(value.getNumCollo()) .setGestione(value.getGestione()) .setSerCollo(value.getSerCollo()) - .setRiga(value.getMtbColr().get(0).getRiga()) + .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga()) .setUntMis(withdrawableDtbDocr.getMtbAart().getUntMis()) .setMtbAart(withdrawableDtbDocr.getMtbAart()); diff --git a/build_azienda.bat b/build_azienda.bat index 120f9778..d8df36b1 100644 --- a/build_azienda.bat +++ b/build_azienda.bat @@ -26,11 +26,11 @@ rem rename %OUTTEXTFILE% %INTEXTFILE% rem cd .. -RMDIR app\build\generated /S /Q -RMDIR app\build\intermediates /S /Q -RMDIR app\build\reports /S /Q -RMDIR app\build\test-results /S /Q -RMDIR app\build\tmp /S /Q +rem RMDIR app\build\generated /S /Q +rem RMDIR app\build\intermediates /S /Q +rem RMDIR app\build\reports /S /Q +rem RMDIR app\build\test-results /S /Q +rem RMDIR app\build\tmp /S /Q XCOPY dynamic_%nome_azienda%\src\main\java\it\integry app\src\main\java\it\integry\ /E /Y CALL gradlew app:build --stacktrace