diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index a06f4063..a3359934 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -31,6 +31,7 @@ public class DBSettingsModel { private boolean flagAskPesoColloSpedizione; private boolean flagForceAllToColli; private boolean flagSpedizioneEnableManualPick; + private String produzioneDefaultCodAnag; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; @@ -211,4 +212,13 @@ public class DBSettingsModel { this.flagSpedizioneEnableManualPick = flagSpedizioneEnableManualPick; return this; } + + public String getProduzioneDefaultCodAnag() { + return produzioneDefaultCodAnag; + } + + public DBSettingsModel setProduzioneDefaultCodAnag(String produzioneDefaultCodAnag) { + this.produzioneDefaultCodAnag = produzioneDefaultCodAnag; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e573fe69..e77fe151 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.core.settings; import android.content.Context; -import android.util.Log; import com.annimon.stream.Stream; import com.google.firebase.perf.metrics.Trace; @@ -11,13 +10,13 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.StbGestSetup; import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityFirebase; public class SettingsManager { @@ -235,6 +234,10 @@ public class SettingsManager { .setGestName("PICKING") .setSection("PRODUZIONE") .setKeySection("FLAG_VERSAMENTO_DIRETTO")); + stbGestSetupList.add(new StbGestSetup() + .setGestName("PICKING") + .setSection("PRODUZIONE") + .setKeySection("DEFAULT_COD_ANAG")); stbGestSetupList.add(new StbGestSetup() .setGestName("PICKING") .setSection("SPEDIZIONE") @@ -246,22 +249,23 @@ public class SettingsManager { GestSetupRESTConsumer.getValues(stbGestSetupList, list -> { - dbSettingsModelIstance.setDefaultCausaleRettificaGiacenze(getValueFromList(list, "DEFAULT_CAUSALE_RETTIFICA_GIACENZE", String.class)); - dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(getValueFromList(list, "ENABLE_CHECK_PARTITA_MAG_PICKING_V", Boolean.class)); - dbSettingsModelIstance.setFlagMultiClienteOrdV(getValueFromList(list, "FLAG_MULTI_CLIENTE_ORD_VENDITA", Boolean.class)); - dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "COD_ANAG_DEFAULT", String.class)); - dbSettingsModelIstance.setDefaultCriterioDistribuzione(getValueFromList(list, "DEFAULT_CRITERIO_DISTRIBUZIONE", String.class)); - dbSettingsModelIstance.setFlagAskClienteInPickingLibero(getValueFromList(list, "FLAG_ASK_CLIENTE", Boolean.class)); - dbSettingsModelIstance.setFlagCanAddExtraItemSpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_ITEMS", Boolean.class)); - dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "FLAG_AUTO_OPEN_NEW_UL", Boolean.class)); - dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class)); - dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class)); - dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "FLAG_FORCE_ALL_TO_COLLI", Boolean.class)); - dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class)); - dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "FLAG_USE_NEW_PICKING_LIST", Boolean.class)); - dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "FLAG_VERSAMENTO_DIRETTO", Boolean.class)); - dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "ENABLE_MANUAL_PICK", Boolean.class)); - dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "ENABLE_FAKE_GIACENZA", Boolean.class)); + dbSettingsModelIstance.setDefaultCausaleRettificaGiacenze(getValueFromList(list, "SETUP", "DEFAULT_CAUSALE_RETTIFICA_GIACENZE", String.class)); + dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(getValueFromList(list, "SETUP","ENABLE_CHECK_PARTITA_MAG_PICKING_V", Boolean.class)); + dbSettingsModelIstance.setFlagMultiClienteOrdV(getValueFromList(list, "SETUP","FLAG_MULTI_CLIENTE_ORD_VENDITA", Boolean.class)); + dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "SETUP","COD_ANAG_DEFAULT", String.class)); + dbSettingsModelIstance.setDefaultCriterioDistribuzione(getValueFromList(list, "SETUP","DEFAULT_CRITERIO_DISTRIBUZIONE", String.class)); + dbSettingsModelIstance.setFlagAskClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ASK_CLIENTE", Boolean.class)); + dbSettingsModelIstance.setFlagCanAddExtraItemSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_ITEMS", Boolean.class)); + dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", Boolean.class)); + dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class)); + dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list,"SPEDIZIONE", "ENABLE_CHECK_DEPOSITO", Boolean.class)); + dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "SETUP", "FLAG_FORCE_ALL_TO_COLLI", Boolean.class)); + dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "SETUP", "FLAG_ASK_PESO_COLLO", Boolean.class)); + dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_NEW_PICKING_LIST", Boolean.class)); + dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO", Boolean.class)); + dbSettingsModelIstance.setProduzioneDefaultCodAnag(getValueFromList(list, "PRODUZIONE", "DEFAULT_COD_ANAG", String.class)); + dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class)); + dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class)); if(onComplete != null) onComplete.run(); }, onFailed); @@ -269,10 +273,10 @@ public class SettingsManager { } - public static T getValueFromList(List stbGestSetupList, String keySectionName, Class clazz) { + public static T getValueFromList(List stbGestSetupList, String section, String keySectionName, Class clazz) { StbGestSetup value = Stream.of(stbGestSetupList) - .filter(x -> x.getKeySection().equalsIgnoreCase(keySectionName)) + .filter(x -> x.getSection().equalsIgnoreCase(section) && x.getKeySection().equalsIgnoreCase(keySectionName)) .findFirst().get(); if(clazz == String.class) { 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 b4fdc1d1..fda8cf1d 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 @@ -193,7 +193,8 @@ public class PickingLiberoViewModel { MtbColt mtbColt = new MtbColt(); mtbColt.initDefaultFields(); mtbColt.setGestione(mDefaultGestione) - .setPosizione(SettingsManager.i().userSession.depo.getCodMdep()) + .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null) + .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag()) .setSegno(-1) .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java index f1193fde..9874672a 100644 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java +++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java @@ -28,21 +28,21 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentClass(MainVenditaFragment.newInstance())) + .setFragmentFactory(MainVenditaFragment::newInstance)) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking) .setTitleText(it.integry.integrywmsnative.R.string.free_picking) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentClass(PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) + .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentClass(UltimeConsegneClienteFragment.newInstance())) + .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) ) .addGroup(new MenuGroup() @@ -55,28 +55,28 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentClass(ProdOrdineProduzioneElencoFragment.newInstance())) + .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentClass(ProdOrdineLavorazioneElencoFragment.newInstance())) + .setFragmentFactory(ProdOrdineLavorazioneElencoFragment::newInstance)) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale) .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentClass(ProdVersamentoMaterialeFragment.newInstance())) + .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance)) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale) .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentClass(ProdRecuperoMaterialeFragment.newInstance())) + .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance)) ).addGroup( new MenuGroup() .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) @@ -87,14 +87,14 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentClass(VersamentoMerceFragment.newInstance())) + .setFragmentFactory(VersamentoMerceFragment::newInstance)) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box) - .setFragmentClass(RettificaGiacenzeFragment.newInstance())) + .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) );