From 03e2f4390bdc1ee8b5123a94ed0115e9782ef531 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 3 Oct 2024 16:41:40 +0200 Subject: [PATCH 1/4] Cambiato oggetto email log --- .../integrywmsnative/gest/settings/MainSettingsFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 03c4044b..5590dbd4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -279,8 +279,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT var mailRequest = new MailRequestDTO() .setTo("developer@integry.it") - .setMsgText("Questo è una mail che contiene il log del WMS") - .setSubject("U vuemmeess") + .setMsgText("Questa è una mail contenente il log del WMS") + .setSubject("Internal WMS log") .setAttachments(attachmentDTOList); From 7c14688ef35f886804af3263576015c29362569a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 3 Oct 2024 16:44:57 +0200 Subject: [PATCH 2/4] -> v1.41.01 (449) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e33d4d7..197a06ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 448 - def appVersionName = '1.41.00' + def appVersionCode = 449 + def appVersionName = '1.41.01' signingConfigs { release { From f5a0bf67c8c940a823775e828e20bae80433959f Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 8 Oct 2024 14:40:16 +0200 Subject: [PATCH 3/4] In rettifica giacenze aggiunta setup per la richiesta della modifica posizione --- .../core/settings/DBSettingsModel.java | 10 ++++++++++ .../core/settings/SettingsManager.java | 6 ++++++ .../rettifica_giacenze/RettificaGiacenzeViewModel.java | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) 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 aaec3140..d0e0c679 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 @@ -81,6 +81,7 @@ public class DBSettingsModel { private boolean flagPickingLiberoEnableScanArt = false; private boolean flagAskDuplicateUDSSpedizione = false; private boolean suggestDataScad = false; + private boolean flagPositionChangeRequest = false; private String docInterniRequestNumDoc; public boolean isFlagSpedizioneEnableFakeGiacenza() { @@ -703,4 +704,13 @@ public class DBSettingsModel { this.docInterniRequestNumDoc = docInterniRequestNumDoc; return this; } + + public boolean isFlagPositionChangeRequest() { + return flagPositionChangeRequest; + } + + public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) { + this.flagPositionChangeRequest = flagPositionChangeRequest; + 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 af8b9d70..6350c3da 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 @@ -540,6 +540,12 @@ public class SettingsManager { .setKeySection("ENABLE_SCAN_ART") .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt) .setDefaultValue(true)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("SETUP") + .setKeySection("ENABLE_POSITION_CHANGE_REQUEST") + .setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest) + .setDefaultValue(true)); stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class) .setGestName("PICKING") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index b8266759..3f2a77b6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -29,6 +29,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; @@ -435,7 +436,7 @@ public class RettificaGiacenzeViewModel { private void askPostionChange(MtbColt mtbColt, Runnable onComplete) { - if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1) { + if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1 || !SettingsManager.iDB().isFlagPositionChangeRequest()) { onComplete.run(); return; } From b40781db84ac8b88afb28b2e19b4127b571d17ec Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 8 Oct 2024 14:42:57 +0200 Subject: [PATCH 4/4] -> v1.41.02 (450) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 197a06ff..abb785f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 449 - def appVersionName = '1.41.01' + def appVersionCode = 450 + def appVersionName = '1.41.02' signingConfigs { release {