From 14252f0f4bc8722585a4082abc0bcc04edafaf4a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 11 Nov 2021 13:40:11 +0100 Subject: [PATCH] Fix su gestione in accettazione da ordine di lavorazione --- .../class_router/BaseCustomConfiguration.java | 5 +- .../MainAccettazioneFragment.java | 5 +- .../AccettazionePickingViewModel.java | 5 +- .../gest/main/MainActivity.java | 3 +- .../extensions/CustomConfiguration.java | 1 - .../extensions/MenuConfigurationVG.java | 70 ------------------- 6 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java index 2e91f73f..77b5ef00 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.class_router; import java.util.HashMap; -import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration; import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.utility.UtilityHashMap; @@ -10,14 +9,12 @@ public class BaseCustomConfiguration implements ICustomConfiguration { public static class Keys { - public static int MENU_CONFIGURATION = 0; public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1; public static int CUSTOM_DYNAMIC_VERSION_PATH = 2; public static int FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC = 3; } - protected HashMap configurations = new HashMap() {{ - put(Keys.MENU_CONFIGURATION, new MenuConfiguration()); + protected HashMap configurations = new HashMap<>() {{ put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true); put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, false); }}; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index f13a4ce3..1c4be179 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -65,10 +65,7 @@ public class MainAccettazioneFragment extends BaseFragment implements ISearcable } public static MainAccettazioneFragment newInstance() { - MainAccettazioneFragment fragment = new MainAccettazioneFragment(); - Bundle args = new Bundle(); - fragment.setArguments(args); - return fragment; + return new MainAccettazioneFragment(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 91161c00..cc6e5df7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -786,9 +786,12 @@ public class AccettazionePickingViewModel { } private void printCollo(Runnable onComplete) { + MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone(); + cloneMtbColt.setGestione(cloneMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE ? GestioneEnum.PRODUZIONE : cloneMtbColt.getGestioneEnum()); + this.mPrinterRESTConsumer.printCollo( PrinterRESTConsumer.Type.SECONDARIA, - mCurrentMtbColt, + cloneMtbColt, () -> { this.sendLUSuccessfullyPrinted(); onComplete.run(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java index 3d92232a..d95f8cf0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java @@ -27,7 +27,6 @@ import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration; @@ -242,7 +241,7 @@ public class MainActivity extends BaseActivity private MenuConfiguration.MenuItem getMenuItem(@IdRes int menuId) { ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); - BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); + BaseMenuConfiguration menuConfiguration = new MenuConfiguration(); List menuGroups = menuConfiguration.getGroups(); BaseMenuConfiguration.MenuItem menuItemToReturn = null; 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 index 29714c86..a345ec30 100644 --- 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 @@ -7,7 +7,6 @@ public class CustomConfiguration extends BaseCustomConfiguration implements ICus public CustomConfiguration() { configurations.put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, false); - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationVG()); configurations.put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, true); } diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java deleted file mode 100644 index e3d09d39..00000000 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java +++ /dev/null @@ -1,70 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment; -import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; -import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; -import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; - -public class MenuConfigurationVG extends BaseMenuConfiguration { - - public MenuConfigurationVG() { - - this - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.purchase) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_acquisto) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_accettazione) - .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download) - .setFragmentFactory(MainAccettazioneFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_spedizione) - .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) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) - - .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) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) - ) - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .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) - .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) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ); - - } - -} \ No newline at end of file