From 3c87d166a2f4f29edde867df25c1bba910377c4a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 3 Apr 2019 13:24:04 +0200 Subject: [PATCH] Aggiunto controllo su cod_mar tin vendita. Bugfix su DialogChooseArtsFromList. --- .../core/class_router/ClassRouter.java | 3 +- .../interfaces/ICustomConfiguration.java | 7 ++ .../viewmodel/PickingLiberoViewModel.java | 58 +++++++------- .../core/VenditaOrdineInevasoHelper.java | 12 ++- .../DialogChooseArtsFromListaArts.java | 21 ++--- ...log_choose_arts_from_lista_arts_layout.xml | 80 ++++++++++--------- .../dynamic_customization/DynamicContext.java | 2 + .../extensions/CustomConfiguration.java | 11 +++ .../dynamic_customization/DynamicContext.java | 2 + .../extensions/CustomConfiguration.java | 10 +++ 10 files changed, 128 insertions(+), 78 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java create mode 100644 dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java create mode 100644 dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java index a999c52d..604f1231 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java @@ -12,7 +12,8 @@ public class ClassRouter { public enum PATH { FILTRO_ORDINI_VENDITA, - ORDINI_VENDITA + ORDINI_VENDITA, + CUSTOM_CONFIGURATION } private static Context context; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java new file mode 100644 index 00000000..4446e468 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java @@ -0,0 +1,7 @@ +package it.integry.integrywmsnative.core.class_router.interfaces; + +public interface ICustomConfiguration { + + boolean shoudShowCodFornInVendita(); + +} 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 8b993da3..12fc5761 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 @@ -320,43 +320,47 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { List destNewMtbColr = new ArrayList<>(); - askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { + if(pickedAarts.size() > 0) { + askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { - if(destNewMtbColr != null && destNewMtbColr.size() > 0){ - MtbColt clonedTestata = (MtbColt) destMtbColt.clone(); - ObservableArrayList mtbColrObservableField = new ObservableArrayList<>(); + if (destNewMtbColr != null && destNewMtbColr.size() > 0) { + MtbColt clonedTestata = (MtbColt) destMtbColt.clone(); + ObservableArrayList mtbColrObservableField = new ObservableArrayList<>(); - for(int i = 0; i < destNewMtbColr.size(); i++) { - MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone(); + for (int i = 0; i < destNewMtbColr.size(); i++) { + MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone(); - cloneMtbColr - .setGestioneRif(cloneMtbColr.getGestione()) - .setGestione(null); + cloneMtbColr + .setGestioneRif(cloneMtbColr.getGestione()) + .setGestione(null); - cloneMtbColr - .setSerColloRif(cloneMtbColr.getSerCollo()) - .setSerCollo(null); + cloneMtbColr + .setSerColloRif(cloneMtbColr.getSerCollo()) + .setSerCollo(null); - cloneMtbColr - .setNumColloRif(cloneMtbColr.getNumCollo()) - .setNumCollo(null); + cloneMtbColr + .setNumColloRif(cloneMtbColr.getNumCollo()) + .setNumCollo(null); - cloneMtbColr - .setDataColloRif(cloneMtbColr.getDataColloS()) - .setDataCollo(null); + cloneMtbColr + .setDataColloRif(cloneMtbColr.getDataColloS()) + .setDataCollo(null); - mtbColrObservableField.add(cloneMtbColr); + mtbColrObservableField.add(cloneMtbColr); + } + + clonedTestata.setMtbColr(mtbColrObservableField); + + saveLU(clonedTestata); } - clonedTestata.setMtbColr(mtbColrObservableField); - - saveLU(clonedTestata); - } - - }, () -> { - progressDialog.dismiss(); + }, () -> { + progressDialog.dismiss(); + BarcodeManager.enable(); + }); + } else { BarcodeManager.enable(); - }); + } }, () -> { progressDialog.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index c0b237a0..9275cb06 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -11,6 +11,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.class_router.ClassRouter; +import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; @@ -80,6 +82,8 @@ public class VenditaOrdineInevasoHelper { public List getListViewModelPerPosizione(List> groupedRighe, List mtbColrs) { + ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + List listModel = new ArrayList<>(); for(int i = 0; i < groupedRighe.size(); i++) { @@ -98,8 +102,12 @@ public class VenditaOrdineInevasoHelper { String badge1 = ""; - badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : ""; - badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart()); + if(customConfiguration.shoudShowCodFornInVendita()) { + badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : ""; + badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart()); + } else { + badge1 += currentItem.getCodMart(); + } rowModel.setBadge1(badge1); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index bc246264..cc29db5b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; +import android.content.DialogInterface; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; @@ -55,23 +56,23 @@ public class DialogChooseArtsFromListaArts { binding.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE); - - mDialog = new Dialog(context); - mDialog.setContentView(binding.getRoot()); - mDialog.setCanceledOnTouchOutside(false); - mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - - binding.positiveButton.setOnClickListener(v -> { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setPositiveButton(context.getResources().getText(R.string.confirm), (dialog, which) -> { mDialog.dismiss(); onPositiveClick(); }); - - binding.negativeButton.setOnClickListener(v -> { + builder.setNegativeButton(context.getResources().getText(R.string.abort), (dialog, which) -> { mDialog.dismiss(); onNegativeClick(); }); + builder.setView(binding.getRoot()); + + mDialog = builder.create(); + mDialog.setCanceledOnTouchOutside(false); + mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + initRecyclerView(binding, listaMtbColr); } diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml index 01167f17..5bb247f7 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml @@ -9,7 +9,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - app:cardCornerRadius="12dp" app:cardElevation="0dp"> + android:paddingTop="24dp" + android:paddingBottom="24dp" + android:paddingStart="8dp" + android:paddingEnd="8dp"> + @@ -83,48 +86,49 @@ - + + + + + - + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java index e82d1e92..a1ebb716 100644 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java @@ -5,6 +5,7 @@ import android.util.Log; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; @@ -16,6 +17,7 @@ public class DynamicContext { try { ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); + ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); } catch (Exception ex) { UtilityExceptions.defaultException(context, ex); } diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java new file mode 100644 index 00000000..589de722 --- /dev/null +++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java @@ -0,0 +1,11 @@ +package it.integry.wms.dynamic_customization.extensions; + +import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; + +public class CustomConfiguration implements ICustomConfiguration { + + @Override + public boolean shoudShowCodFornInVendita() { + return true; + } +} diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java index 8fdc1a32..55507696 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java @@ -5,6 +5,7 @@ import android.util.Log; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; @@ -16,6 +17,7 @@ public class DynamicContext { try { ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); + ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); } catch (Exception ex) { UtilityExceptions.defaultException(context, ex); } diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java new file mode 100644 index 00000000..85f3e67b --- /dev/null +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java @@ -0,0 +1,10 @@ +package it.integry.wms.dynamic_customization.extensions; + +import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; + +public class CustomConfiguration implements ICustomConfiguration { + @Override + public boolean shoudShowCodFornInVendita() { + return false; + } +}