From 446572c2ee91b9234596c6f2639ae34b1b9bbd0c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 24 Jan 2019 15:39:45 +0100 Subject: [PATCH] Risolto bug di session ID nel caso si recupera un collo --- .../integrywmsnative/core/settings/SettingsManager.java | 2 +- .../viewmodel/RettificaGiacenzeViewModel.java | 3 +-- .../integrywmsnative/gest/vendita/MainVenditaFragment.java | 2 +- .../viewmodel/VenditaOrdineInevasoViewModel.java | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) 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 2fa70fe4..8f060b99 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 @@ -179,7 +179,7 @@ public class SettingsManager { dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(valueEnableCheckPartitaMag); GestSetupRESTConsumer.getBooleanValue("PICKING", "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", valueFlagMultiClienteOrdVendita -> { - dbSettingsModelIstance.setFlagMultiClienteOrdV(valueFlagMultiClienteOrdVendita); + dbSettingsModelIstance.setFlagMultiClienteOrdV(valueFlagMultiClienteOrdVendita); GestSetupRESTConsumer.getValue("PICKING", "SETUP", "COD_ANAG_DEFAULT", valueCodAnagDefault -> { dbSettingsModelIstance.setDefaultCodAnag(valueCodAnagDefault.value); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index f82491ce..efbebe94 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -402,8 +402,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked if(thereIsAnOpenedUL()) { - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); if (thereIsAnyRowInUL()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 55e982f6..46ba31ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -54,7 +54,7 @@ import it.integry.plugins.waterfalltoolbar.WaterfallToolbar; public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment { - private static WaterfallToolbar mWaterfallToolbar; + private WaterfallToolbar mWaterfallToolbar; private VenditaHelper mHelper; private FragmentMainVenditaBinding mBinding = null; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 3dcdc995..022c8118 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -296,7 +296,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - + mtbColtSessionID = ColliDataRecover.startNewSession(recoveredMtbColt); setULToCurrentContext(recoveredMtbColt); refreshOrderBy(false); } @@ -710,7 +710,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO if(thereIsAnyRowInUL()) { updateDataFine(progress, () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress, generatedMtbColts))); } else { - ColliDataRecover.closeSession(mtbColtSessionID); + if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID); deleteCollo(progress); } @@ -745,7 +745,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), mtbColts -> { - ColliDataRecover.closeSession(mtbColtSessionID); + if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID); onComplete.run(mtbColts); }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress));