From 891e2641fabd4c634ef3bb5cbb9ea6701fdd46bb Mon Sep 17 00:00:00 2001 From: MarcoE Date: Mon, 28 Apr 2025 17:08:30 +0200 Subject: [PATCH] =?UTF-8?q?Aggiunta=20possibilit=C3=A0=20di=20rendere=20no?= =?UTF-8?q?n=20editabile=20qtaTot=20in=20accettazione=20bolla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/settings/DBSettingsModel.java | 9 +++++++++ .../core/settings/SettingsManager.java | 6 ++++++ .../AccettazioneBollaPickingActivity.java | 1 + .../input_quantity_v2/DialogInputQuantityV2DTO.java | 10 ++++++++++ .../input_quantity_v2/DialogInputQuantityV2View.java | 6 +++--- 5 files changed, 29 insertions(+), 3 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 39c89a26..7b48b338 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 @@ -97,6 +97,7 @@ public class DBSettingsModel { private List allowedCodMgrpForArtCreation; private boolean flagAccettazioneGroupListForn = false; private boolean flagSpedizioneEnableFastPicking = false; + private boolean flagAccettazioneBollaEditableQtaTot = true; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; @@ -815,4 +816,12 @@ public class DBSettingsModel { public void setFlagSpedizioneEnableFastPicking(boolean flagSpedizioneEnableFastPicking) { this.flagSpedizioneEnableFastPicking = flagSpedizioneEnableFastPicking; } + + public boolean isFlagAccettazioneBollaEditableQtaTot() { + return flagAccettazioneBollaEditableQtaTot; + } + + public void setFlagAccettazioneBollaEditableQtaTot(boolean flagAccettazioneBollaEditableQtaTot) { + this.flagAccettazioneBollaEditableQtaTot = flagAccettazioneBollaEditableQtaTot; + } } 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 2a707d8f..8cd2c5ab 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 @@ -564,6 +564,12 @@ public class SettingsManager { .setKeySection("ENABLE_FAST_PICKING") .setSetter(dbSettingsModelIstance::setFlagSpedizioneEnableFastPicking) .setDefaultValue(false)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("ACCETTAZIONE_BOLLA") + .setKeySection("FLAG_QTA_TOT_EDITABLE") + .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaEditableQtaTot) + .setDefaultValue(true)); stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class) .setGestName("PICKING") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 4d618d3e..8ce4c81d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -620,6 +620,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac .setDataScad(dataScad) .setCanPartitaMagBeChanged(canPartitaMagBeChanged) .setCanLUBeClosed(true) + .setQtaTotEditable(SettingsManager.iDB().isFlagAccettazioneBollaEditableQtaTot()) .setCanOverflowOrderQuantity(canOverflowQuantity) .setDisableTracciabilitaCheck(SettingsManager.iDB().isFlagAccettazioneBollaDisableMandatoryTracciabilita()); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java index fb0c386b..26b3e399 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java @@ -41,6 +41,7 @@ public class DialogInputQuantityV2DTO { private boolean isNotesAllowed = false; private boolean isNotesMandatory = false; private boolean isNumCnfEditable = true; + private boolean isQtaTotEditable = true; private boolean isFocusOnStart = true; private boolean canLUBeClosed; private boolean saveOnImeDone = false; @@ -323,6 +324,15 @@ public class DialogInputQuantityV2DTO { return this; } + public boolean isQtaTotEditable() { + return isQtaTotEditable; + } + + public DialogInputQuantityV2DTO setQtaTotEditable(boolean qtaTotEditable) { + this.isQtaTotEditable = qtaTotEditable; + return this; + } + public RunnableArgsWithReturn getSuggestPartitaMag() { return suggestPartitaMag; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 922223cb..ddeaa3a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -397,7 +397,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia toggleTextInputLayoutError(textColorsNumCnf, this.mBindings.inputNumCnfLayout, value); if (this.mViewModel.mtbAart.get().isFlagQtaCnfFissaBoolean()) { - this.enabledQtaTot.set(!value); + this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable() && !value); } else { if (value) { if (this.mViewModel.blockedQtaCnf.get()) { @@ -407,7 +407,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } } else { if (!this.enabledQtaTot.get()) { - this.enabledQtaTot.set(true); + this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable()); } else if (!this.enabledQtaCnf.get()) { this.enabledQtaCnf.set(true); } @@ -426,7 +426,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } } else { if (!this.enabledQtaTot.get()) { - this.enabledQtaTot.set(true); + this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable()); } else if (!this.enabledNumCnf.get()) { this.enabledNumCnf.set(this.mDialogInputQuantityV2DTO.isNumCnfEditable()); }