From 518756425055ba3ec73f6207b59b9c4fc7e661aa Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 5 Mar 2024 16:22:59 +0100 Subject: [PATCH] Aggiunta setup per dialog info situazione articolo in picking da ordine di lavorazione --- .../core/class_router/configs/MenuConfiguration.java | 2 +- .../core/rest/consumers/PrinterRESTConsumer.java | 4 ++++ .../core/settings/DBSettingsModel.java | 10 ++++++++++ .../core/settings/SettingsManager.java | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index f8f01b4c..14b40704 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -116,7 +116,7 @@ public class MenuConfiguration extends BaseMenuConfiguration { .setTitleText(R.string.prod_ordine_lavorazione_title_fragment) .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione) .setDrawerIcon(R.drawable.ic_black_external) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, SettingsManager.iDB().isFlagShowInfo() ? DialogInfoSituazioneArticoloView.class : null))) .addItem(new MenuItem() .setID(R.id.nav_free_lav_picking) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java index dcb88f14..b7822bf8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java @@ -157,6 +157,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer { } public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs onFailed) { + if (BuildConfig.DEBUG) { + onComplete.run(); + return; + } PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240); Call> callable = printerService.printClosedOrders(codMdep, dto); 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 0de59f8e..8d1626f9 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 @@ -74,6 +74,7 @@ public class DBSettingsModel { private String viewPosizioni; private boolean flagDeleteRowOnClose = false; private boolean flagAllowBarcodeFornitore = false; + private boolean flagShowInfo = false; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; @@ -606,4 +607,13 @@ public class DBSettingsModel { this.flagAllowBarcodeFornitore = flagAllowBarcodeFornitore; return this; } + + public boolean isFlagShowInfo() { + return flagShowInfo; + } + + public DBSettingsModel setFlagShowInfo(boolean flagShowInfo) { + this.flagShowInfo = flagShowInfo; + 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 11193892..b9485ddd 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 @@ -283,6 +283,12 @@ public class SettingsManager { .setKeySection("FLAG_GROUP_BY_GRP_MERC") .setSetter(dbSettingsModelIstance::setGroupPoductionByCommodityGroup) .setDefaultValue(false)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("PRODUZIONE") + .setKeySection("FLAG_SHOW_INFO") + .setSetter(dbSettingsModelIstance::setFlagShowInfo) + .setDefaultValue(false)); stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class) .setGestName("PICKING") .setSection("PRODUZIONE")