From bb41b889eea4f2e097418ce18ef12054e0d8088e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 1 Aug 2019 12:53:07 +0200 Subject: [PATCH] =?UTF-8?q?Aggiunta=20la=20possibilit=C3=A0=20di=20poter?= =?UTF-8?q?=20aggiungere=20merce=20extre=20in=20un=20picking=20di=20Spediz?= =?UTF-8?q?ione=20(subordinato=20ad=20una=20configurazione=20nella=20setup?= =?UTF-8?q?=5Fgest).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/settings/DBSettingsModel.java | 10 ++++++++++ .../core/settings/SettingsManager.java | 9 ++++++++- .../viewmodel/VenditaOrdineInevasoViewModel.java | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) 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 b5b13054..e7020a28 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 @@ -25,6 +25,7 @@ public class DBSettingsModel { private boolean flagCanAddExtraItemSpedizione; private boolean flagCanAutoOpenNewULAccettazione; + private boolean flagCanAddExtraQuantitySpedizione; public List getAvailableProfiles() { return availableProfiles; @@ -130,4 +131,13 @@ public class DBSettingsModel { this.flagCanAutoOpenNewULAccettazione = flagCanAutoOpenNewULAccettazione; return this; } + + public boolean isFlagCanAddExtraQuantitySpedizione() { + return flagCanAddExtraQuantitySpedizione; + } + + public DBSettingsModel setFlagCanAddExtraQuantitySpedizione(boolean flagCanAddExtraQuantitySpedizione) { + this.flagCanAddExtraQuantitySpedizione = flagCanAddExtraQuantitySpedizione; + 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 61a0902f..f5525c3e 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 @@ -198,7 +198,14 @@ public class SettingsManager { GestSetupRESTConsumer.getBooleanValue("PICKING", "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", valueCanAutoOpenNewUL -> { dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(valueCanAutoOpenNewUL); - if(onComplete != null) onComplete.run(); + GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", valueCanAddExtraQuantitySpedizione -> { + dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(valueCanAddExtraQuantitySpedizione); + + if(onComplete != null) onComplete.run(); + + }, ex -> { + if(onFailed != null) onFailed.run(ex); + }); }, ex -> { if(onFailed != null) onFailed.run(ex); 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 343337dc..e02644f1 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 @@ -1188,7 +1188,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - DialogInputQuantity.makeBase(mActivity, dto, false, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show(); + boolean canOverflowQuantity = SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione(); + DialogInputQuantity.makeBase(mActivity, dto, canOverflowQuantity, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show(); } }