Finish v1.50.04(553)

Fix separatore virgola nel dialog input quantity.

.gitignore

@@ -149,3 +149,6 @@ crashlytics.properties
 crashlytics-build.properties
 ### AndroidStudio Patch ###
 !/gradle/wrapper/gradle-wrapper.jar
+
+copilot.*.xml
+/.idea/dataSources.xml

.idea/codeStyles/Project.xml

@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-03-06T12:39:02.626545300Z">
+        <DropdownSelection timestamp="2025-10-02T11:26:10.944286600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=7da0808" />
             </handle>
           </Target>
         </DropdownSelection>

.idea/runConfigurations/app.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS.app" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -8,14 +9,17 @@
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
     <option name="CLEAR_APP_STORAGE" value="false" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
@@ -59,6 +63,7 @@
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>
     <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
     <option name="ACTIVITY_CLASS" value="" />
     <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
     <option name="SKIP_ACTIVITY_VALIDATION" value="false" />

Jenkinsfile.groovy

@@ -0,0 +1,72 @@
+pipeline {
+    agent {
+        label 'master'
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10'))
+        disableConcurrentBuilds()
+    }
+
+    environment {
+        // ANDROID_HOME = "/usr/local/android/sdk" // Cambia in base al tuo sistema
+        JAVA_HOME = tool 'JDK 17.0.6 x64'          // Nome dello strumento configurato in Jenkins
+        PATH = "${env.JAVA_HOME}\\bin;${env.PATH}"
+    }
+
+    stages {
+
+        stage('Preparing') {
+            when {
+                expression {
+                    return env.GIT_BRANCH == "master-beta"
+                }
+            }
+            steps {
+                bat "./gradlew addBetaSuffix"
+            }
+        }
+
+        stage('Build') {
+            steps {
+                bat "./gradlew assembleRelease"
+                archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true
+            }
+        }
+
+        stage('Publish') {
+            steps {
+                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*.apk,app/build/outputs/apk/release/*.txt', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
+            }
+        }
+    }
+
+    post {
+        success {
+            script {
+                bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
+                bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
+                bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
+                bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
+                }
+            }
+        }
+        unstable {
+            script {
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
+                }
+            }
+        }
+        failure {
+            script {
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
+                }
+            }
+        }
+    }
+
+}

app/build.gradle

@@ -8,10 +8,11 @@ apply plugin: 'com.google.firebase.crashlytics'
 //apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
+
 android {
 
-    def appVersionCode = 482
-    def appVersionName = '1.45.00'
+    def appVersionCode = 553
+    def appVersionName = '1.50.04'
 
     signingConfigs {
         release {
@@ -34,7 +35,7 @@ android {
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdk 36
         versionCode appVersionCode
         versionName appVersionName
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,17 +52,26 @@ android {
     buildTypes {
         debug {
             ext.enableCrashlytics = false
+//            minifyEnabled true // Abilita la minimizzazione del codice
+//            shrinkResources true // Rimuove risorse non utilizzate
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
-            minifyEnabled false
+//            minifyEnabled true // Abilita la minimizzazione del codice
+//            shrinkResources true // Rimuove risorse non utilizzate
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
+            firebaseCrashlytics {
+                mappingFileUploadEnabled true
+            }
         }
     }
 
     android.buildFeatures.dataBinding true
     android.buildFeatures.buildConfig true
 
+    android.dataBinding.enabledForTests true
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -72,12 +82,7 @@ android {
     }
 
 
-    build {
-        doLast {
-            delete "$projectDir/build/outputs/apk/release/version.txt"
-            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true'
-        }
-    }
+
 
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile.class).tap {
@@ -90,7 +95,7 @@ android {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-    compileSdk 35
+    compileSdk 36
 }
 
 configurations {
@@ -99,35 +104,33 @@ configurations {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
 //    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
     implementation 'com.github.lupaulus:logger:2.3.2'
 
-    //Firebase
-
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:33.8.0')
+    implementation platform('com.google.firebase:firebase-bom:33.16.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.5.0'
+    implementation 'com.google.android.gms:play-services-basement:18.7.1'
 
     //JJWT
-    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
-    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
 
-
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     implementation('androidx.preference:preference-ktx:1.2.1') {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
@@ -135,20 +138,18 @@ dependencies {
     }
 
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:3.0.0'
+    implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
-//    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.9.3'
+    implementation 'org.apache.commons:commons-text:1.14.0'
 
     //MVVM
-    def dagger2_version = '2.55'
-    api "com.google.dagger:dagger:$dagger2_version"
+    def dagger2_version = '2.57.1'
+    implementation "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
-    api "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    implementation "com.google.dagger:dagger-android:$dagger2_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger2_version"
     // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"
 
@@ -160,7 +161,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.6.1"
+    def room_version = "2.7.2"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -186,14 +187,13 @@ dependencies {
     implementation 'com.github.harry1453:android-bluetooth-serial:v1.1.2'
 
     // RxJava is also required.
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-
-    implementation 'org.greenrobot:eventbus:3.3.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     //Barcode generator
-//    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+
+    implementation("org.javatuples:javatuples:1.2")
 }
 
 repositories {
@@ -201,3 +201,49 @@ repositories {
     google()
     maven { url 'https://jitpack.io' }
 }
+
+tasks.register('addBetaSuffix') {
+    doLast {
+        def gradleFile = file("build.gradle")
+        def content = gradleFile.text
+
+        // Modifica appVersionName
+        content = content.replaceAll(/appVersionName\s*=\s*'(.*?)'/) { fullMatch, version ->
+            "appVersionName = '${version}-beta'"
+        }
+
+        // Modifica outputFileName
+        content = content.replaceAll(/output\.outputFileName\s*=\s*"(.*?)"/) { fullMatch, filename ->
+            "output.outputFileName = \"${filename.replace('.apk', '-beta.apk')}\""
+        }
+
+        // Modifica direttamente la riga che crea 'version.txt' in 'version-beta.txt'
+        content = content.replace(
+                "def versionFile = new File(outputDir, \"version.txt\")",
+                "def versionFile = new File(outputDir, \"version-beta.txt\")"
+        )
+
+        // Sovrascrivi il file
+        gradleFile.write(content)
+    }
+}
+
+tasks.register('createVersionFile') {
+    doLast {
+        def outputDir = file("${projectDir}/build/outputs/apk/release")
+        def versionFile = new File(outputDir, "version.txt")
+
+        // Cancella il file se esiste
+        if (versionFile.exists()) {
+            versionFile.delete()
+        }
+
+        // Crea il file con i contenuti desiderati
+        versionFile.write("${android.defaultConfig.versionCode}\n${android.defaultConfig.versionName}\nforced=true")
+    }
+}
+
+
+afterEvaluate {
+    tasks.assembleRelease.finalizedBy createVersionFile
+}

app/proguard-rules.pro

@@ -23,3 +23,26 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+# Prevent R8 from leaving Data object members always null
+-keepclasseswithmembers class * {
+    <init>(...);
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Per JJWT
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+-keep class it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; }
+-keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; }

app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java

@@ -132,6 +132,8 @@ import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUComponen
 import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUModule;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageComponent;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageModule;
+import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListComponent;
@@ -140,6 +142,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeComponent;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeModule;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
@@ -248,7 +252,9 @@ import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAva
         DialogAskLivelloPosizioneModule.class,
         VerificaGiacenzeModule.class,
         DialogExtraInfoModule.class,
-        DialogAskDepositoModule.class
+        DialogAskDepositoModule.class,
+        DialogChooseArtFromListaArtsModule.class,
+        DialogDeviceEndOfLifeModule.class
 })
 public interface MainApplicationComponent {
 
@@ -417,6 +423,10 @@ public interface MainApplicationComponent {
 
     DialogAskDepositoComponent.Factory dialogAskDepositoComponent();
 
+    DialogChooseArtFromListaArtsComponent.Factory dialogChooseArtFromListaArtsComponent();
+
+    DialogDeviceEndOfLifeComponent.Factory dialogDeviceEndOfLifeComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -49,13 +49,13 @@ import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsum
 import it.integry.integrywmsnative.core.rest.consumers.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.VettoriRESTConsumer;
+import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.sound.SoundAlertService;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
-import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
@@ -100,8 +100,14 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
-        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, systemRESTConsumer, authenticationRESTConsumer);
+    ServerStatusChecker providesServerStatusChecker(Handler handler) {
+        return new ServerStatusChecker(handler);
+    }
+
+    @Provides
+    @Singleton
+    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase, AuthenticationRESTConsumer authenticationRESTConsumer, ExecutorService executorService, Handler handler, ServerStatusChecker serverStatusChecker) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, authenticationRESTConsumer, executorService, handler, serverStatusChecker);
     }
 
     @Provides
@@ -151,8 +157,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new OrdiniRESTConsumer(restBuilder, systemRESTConsumer, entityRESTConsumer);
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new OrdiniRESTConsumer(restBuilder, executorService, systemRESTConsumer, entityRESTConsumer);
     }
 
     @Provides
@@ -169,14 +175,14 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    CommessaRESTConsumer provideCommessaRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new CommessaRESTConsumer(systemRESTConsumer);
+    CommessaRESTConsumer provideCommessaRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new CommessaRESTConsumer(executorService, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    DepositoRESTConsumer provideDepositoRESTConsumer(EntityRESTConsumer entityRESTConsumer, SystemRESTConsumer systemRESTConsumer) {
-        return new DepositoRESTConsumer(entityRESTConsumer, systemRESTConsumer);
+    DepositoRESTConsumer provideDepositoRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new DepositoRESTConsumer(executorService, systemRESTConsumer);
     }
 
     @Provides
@@ -199,18 +205,19 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    EntityRESTConsumer provideEntityRESTConsumer(RESTBuilder restBuilder) {
-        return new EntityRESTConsumer(restBuilder);
+    EntityRESTConsumer provideEntityRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new EntityRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(RESTBuilder restBuilder,
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ExecutorService executorService,
+                                                                 RESTBuilder restBuilder,
                                                                  SystemRESTConsumer systemRESTConsumer,
                                                                  ArticoloRESTConsumer articoloRESTConsumer,
                                                                  EntityRESTConsumer entityRESTConsumer,
                                                                  SettingsManager settingsManager) {
-        return new ColliMagazzinoRESTConsumer(restBuilder, systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
+        return new ColliMagazzinoRESTConsumer(executorService, restBuilder, systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
     }
 
     @Provides
@@ -251,14 +258,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    PosizioniRESTConsumer providesPosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
-        return new PosizioniRESTConsumer(restBuilder, systemRESTConsumer);
-    }
-
-    @Provides
-    @Singleton
-    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
-        return new ProdFabbisognoLineeProdRESTConsumer(restBuilder, systemRESTConsumer);
+    PosizioniRESTConsumer providesPosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, ExecutorService executorService) {
+        return new PosizioniRESTConsumer(restBuilder, systemRESTConsumer, executorService);
     }
 
     @Provides
@@ -275,8 +276,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    GiacenzaPvRESTConsumer provideGiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
-        return new GiacenzaPvRESTConsumer(restBuilder, executorService);
+    GiacenzaPvRESTConsumer provideGiacenzaPvRESTConsumer(RESTBuilder restBuilder) {
+        return new GiacenzaPvRESTConsumer(restBuilder);
     }
 
     @Provides
@@ -305,8 +306,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) {
-        return new DocumentRESTConsumer(restBuilder);
+    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new DocumentRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
@@ -317,20 +318,20 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer(RESTBuilder restBuilder) {
-        return new ColliSpedizioneRESTConsumer(restBuilder);
+    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new ColliSpedizioneRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
     @Singleton
-    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(RESTBuilder restBuilder, SettingsManager settingsManager) {
-        return new ColliLavorazioneRESTConsumer(restBuilder, settingsManager);
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SettingsManager settingsManager) {
+        return new ColliLavorazioneRESTConsumer(restBuilder, executorService, settingsManager);
     }
 
     @Provides
     @Singleton
-    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer(RESTBuilder restBuilder) {
-        return new MagazzinoAutomaticoRESTConsumer(restBuilder);
+    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder) {
+        return new MagazzinoAutomaticoRESTConsumer(executorService, restBuilder);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/SplashActivity.java

@@ -4,15 +4,19 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
@@ -26,6 +30,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainActivity;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeView;
 
 public class SplashActivity extends BaseActivity implements MainContext.Listener {
 
@@ -37,6 +42,9 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
     @Inject
     MainContext mainContext;
 
+    @Inject
+    Handler handler;
+
     private RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult;
 
     public static void startActivity(Context context) {
@@ -61,9 +69,24 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
         UtilityContext.initMainActivity(this);
 
+        LocalDate endSupportDate = LocalDate.of(2026, 1, 31);
 
-        initAppVersion();
-        initPermissions(this::init);
+        boolean isOldAndroid = Build.VERSION.SDK_INT < Build.VERSION_CODES.O;
+
+        executorService.execute(() -> {
+
+            if (isOldAndroid)
+                showDeviceEndOfLifeMessage();
+
+            handler.post(() -> {
+                if (LocalDate.now().isBefore(endSupportDate) || !isOldAndroid) {
+                    initAppVersion();
+                    initPermissions(this::init);
+                } else {
+                    this.finish();
+                }
+            });
+        });
     }
 
     private void initAppVersion() {
@@ -101,14 +124,29 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
         }
     }
 
+
+    private void showDeviceEndOfLifeMessage() {
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        DialogDeviceEndOfLifeView.newInstance(latch::countDown)
+                .show(this.getSupportFragmentManager(), "dialog_device_end_of_life");
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public void onDBDataLoading(String item) {
-        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
+        handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
     }
 
     @Override
     public void onMenuLoading() {
-        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento menù"));
+        handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento menù"));
     }
 
     @Override
@@ -151,11 +189,13 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
     @Override
     public void onError(Spanned message) {
+        handler.post(() -> {
+            DialogSimpleMessageView.makeErrorDialog(
+                            message, null, this::finish, R.string.logout, () -> {
+                                this.mainContext.logout(MainApplication::exit);
+                            })
+                    .show(this.getSupportFragmentManager(), "tag");
 
-        DialogSimpleMessageView.makeErrorDialog(
-                message, null, this::finish, R.string.logout, () -> {
-                    this.mainContext.logout(MainApplication::exit);
-                })
-                .show(this.getSupportFragmentManager(), "tag");
+        });
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java

@@ -24,19 +24,4 @@ public class CommonConst {
         public static String RECOVER_COLLO_FILE = "recover_ul.json";
     }
 
-    public static class Mail {
-
-        public static String[] forErrorsDebug = {
-                "g.scorrano@integry.it",
-                "v.castellana@integry.it"
-        };
-
-        public static String[] forErrors = {
-//                "syslogs@integry.it",
-                "g.scorrano@integry.it",
-                "v.castellana@integry.it"
-        };
-
-    }
-
 }

app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java

@@ -11,11 +11,11 @@ public class JwtUtils {
     private final static String SIGNING_KEY = "gICy3bjD56i/YFnBZZKe5ibiz3Snsp08nybGGziCV4ZcvyXBbyqWUnJ2wTrRXhOuf/xdljPXX0yBaqdAgvKthQ==";
 
     public static Claims parseJwt(String token) {
-        Jws<Claims> jws = Jwts.parserBuilder()
-                .setSigningKey(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY)))
+        Jws<Claims> jws = Jwts.parser()
+                .verifyWith(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY)))
                 .build()
-                .parseClaimsJws(token);
+                .parseSignedClaims(token);
 
-        return jws.getBody();
+        return jws.getPayload();
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java

@@ -7,6 +7,7 @@ public class BarcodeCallbackDTO {
 
     private int ID = -1;
 
+    private boolean enabled = true;
     private RunnableArgs<BarcodeScanDTO> onScanSuccessfull;
     private RunnableArgs<Exception> onScanFailed;
 
@@ -19,6 +20,15 @@ public class BarcodeCallbackDTO {
         return this;
     }
 
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public BarcodeCallbackDTO setEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
     public RunnableArgs<BarcodeScanDTO> getOnScanSuccessfull() {
         return onScanSuccessfull;
     }

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java

@@ -24,10 +24,15 @@ public class BarcodeManager {
     private static BarcodeReaderInterface mCurrentBarcodeInterface;
     private static final List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();
 
-    private static boolean mEnabled = true;
+//    private static boolean mEnabled = true;
 
 
-    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{PointMobileBarcodeReader.class, ZebraBarcodeReader.class, HoneyWellBarcodeReader.class, KeyboardEmulatorBarcodeReader.class};
+    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
+            PointMobileBarcodeReader.class,
+            ZebraBarcodeReader.class,
+            HoneyWellBarcodeReader.class,
+            KeyboardEmulatorBarcodeReader.class
+    };
 
 
     public static void init(Context applicationContext) throws Exception {
@@ -56,12 +61,12 @@ public class BarcodeManager {
 
                 mCurrentBarcodeInterface.register(data -> {
                     BarcodeCallbackDTO callback = getValidCallback();
-                    if (callback != null && mEnabled) {
+                    if (callback != null && callback.isEnabled()) {
                         callback.getOnScanSuccessfull().run(data);
                     }
                 }, ex -> {
                     BarcodeCallbackDTO callback = getValidCallback();
-                    if (callback != null && mEnabled) {
+                    if (callback != null && callback.isEnabled()) {
                         callback.getOnScanFailed().run(ex);
                     }
                 });
@@ -103,7 +108,6 @@ public class BarcodeManager {
     }
 
     public static int addCallback(BarcodeCallbackDTO barcodeCallbackDTO) {
-
         int newID = -1;
 
         if (!mBarcodeCallbacksStacktrace.isEmpty()) {
@@ -133,18 +137,39 @@ public class BarcodeManager {
     }
 
 
-    public static void disable() {
-        mEnabled = false;
-//        UtilityLogger.info("Barcode reader disabled");
+    public static void disable(int instanceId) {
+        mBarcodeCallbacksStacktrace.stream().filter(x -> x.getID() == instanceId)
+                .findFirst().ifPresent(x -> x.setEnabled(false));
     }
 
-    public static void enable() {
-        mEnabled = true;
-//        UtilityLogger.info("Barcode reader enabled");
+    public static void disableLastCallback() {
+        BarcodeCallbackDTO validCallback = getValidCallback();
+        if (validCallback != null) {
+            validCallback.setEnabled(false);
+        }
     }
 
-    public static boolean isEnabled() {
-        return mEnabled;
+    public static void enable(int instanceId) {
+        mBarcodeCallbacksStacktrace.stream().filter(x -> x.getID() == instanceId)
+                .findFirst().ifPresent(x -> x.setEnabled(true));
+    }
+
+    public static void enableLastCallback() {
+        BarcodeCallbackDTO validCallback = getValidCallback();
+        if (validCallback != null) {
+            validCallback.setEnabled(true);
+        }
+    }
+
+    public static boolean isEnabled(int instanceId) {
+        return mBarcodeCallbacksStacktrace.stream().filter(x -> x.getID() == instanceId)
+                .findFirst()
+                .map(BarcodeCallbackDTO::isEnabled)
+                .orElse(false);
+    }
+
+    public static boolean isLastCallbackEnabled() {
+        return getValidCallback() != null && getValidCallback().isEnabled();
     }
 
     public static void changeSettings(List<Pair<String, Object>> settings) {

app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java

@@ -89,11 +89,25 @@ public class AppContext {
     private void initLogger() {
         Logger.addLogAdapter(new AndroidLogAdapter());
 
-        logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
-        int maxBytesSize = 5 * 1024 * 1024;
-        Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
+        File dataDir = mApplicationContext.getExternalFilesDir(null);
+
+        logsFolder = new File(dataDir, "logs");
+
+        if (!logsFolder.exists())
+            logsFolder.mkdirs();
+
+        //Temporary clean
+        File[] wrongFilesToBeDeleted = dataDir.listFiles((file, s) -> s.startsWith("logs_"));
+
+        if (wrongFilesToBeDeleted != null)
+            for (File fileToDelete : wrongFilesToBeDeleted) {
+                fileToDelete.delete();
+            }
 
         removeOldLogs(logsFolder);
+
+        int maxBytesSize = 5 * 1024 * 1024;
+        Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
     }
 
     private void removeOldLogs(File logsFolder) {

app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.context;
 
 import android.content.Context;
+import android.os.Handler;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -9,16 +10,15 @@ import android.text.SpannedString;
 import com.google.firebase.installations.FirebaseInstallations;
 
 import java.net.ConnectException;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.menu.MenuService;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
 
 @Singleton
@@ -27,17 +27,21 @@ public class MainContext {
     private final Context applicationContext;
     private final MenuService menuService;
     private final AppDatabase appDatabase;
-    private final SystemRESTConsumer systemRESTConsumer;
     private final AuthenticationRESTConsumer authenticationRESTConsumer;
+    private final ExecutorService executorService;
+    private final Handler handler;
+    private final ServerStatusChecker serverStatusChecker;
 
     private Listener mListener;
 
-    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, AuthenticationRESTConsumer authenticationRESTConsumer, ExecutorService executorService, Handler handler, ServerStatusChecker serverStatusChecker) {
         this.applicationContext = applicationContext;
         this.menuService = menuService;
         this.appDatabase = appDatabase;
-        this.systemRESTConsumer = systemRESTConsumer;
         this.authenticationRESTConsumer = authenticationRESTConsumer;
+        this.executorService = executorService;
+        this.handler = handler;
+        this.serverStatusChecker = serverStatusChecker;
     }
 
     public void init() {
@@ -48,34 +52,31 @@ public class MainContext {
         }
 
 
-        //this.initAuthSession(() -> {
-//        this.initDeviceId(() -> {
-            this.initDBData(() -> {
-                this.initMenu(() -> {
+        executorService.execute(() -> {
 
-                    if (mListener != null) mListener.onContextInitialized();
-                });
-            });
-//        });
-        //});
+            try {
+                this.initDBData();
+                this.initMenu();
+                serverStatusChecker.init();
 
+                if (mListener != null) mListener.onContextInitialized();
 
-        this.initServerStatusChecker();
+            } catch (Exception ex) {
+                Spanned message = null;
 
-//        EventBus.getDefault().register(this);
+                if (ex.getCause() != null && ex.getCause() instanceof ConnectException) {
+                    message = Html.fromHtml("Impossibile collegarsi all'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
+                } else if (ex.getMessage().startsWith("Status 404:")) {
+                    message = Html.fromHtml("Errore 404. Non è stato possibile soddisfare la richiesta sull'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
+                } else {
+                    message = new SpannableString(ex.getMessage());
+                }
+
+                if (mListener != null) mListener.onError(message);
+            }
+        });
     }
 
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void onSessionExpired(SessionExpiredEvent event) {
-//        DialogSimpleMessageView.makeErrorDialog(
-//                        new SpannedString("La sessione è scaduta. Effettua nuovamente la login"),
-//                        null,
-//                        () -> {
-//                            logout(MainApplication::exit);
-//                        })
-//                .show(activity.getSupportFragmentManager(), "expired-session-error");
-//    }
-
 
     private void initAuthSession(Runnable onComplete) {
         this.authenticationRESTConsumer.me(obj -> {
@@ -105,50 +106,28 @@ public class MainContext {
 
     public void logout(Runnable onLoggedOut) {
         menuService.invalidateCache();
-        UtilityThread.executeParallel(() -> {
+        executorService.execute(() -> {
             SettingsManager.i().setUser(null);
             SettingsManager.i().setUserSession(null);
             SettingsManager.update();
             appDatabase.clearAllTables();
 
-            onLoggedOut.run();
-        }, true);
+            handler.post(() -> {
+                onLoggedOut.run();
+            });
+        });
     }
 
-    private void initServerStatusChecker() {
-        ServerStatusChecker.init();
-    }
-
-    private void initDBData(Runnable onComplete) {
-
+    private void initDBData() throws Exception {
 
         SettingsManager.loadDBVariables(item -> {
-                    if (mListener != null) mListener.onDBDataLoading(item);
-                },
-                onComplete,
-                ex -> {
-
-                    Spanned message = null;
-
-                    if (ex.getCause() != null && ex.getCause() instanceof ConnectException) {
-                        message = Html.fromHtml("Impossibile collegarsi all'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
-                    } else if (ex.getMessage().startsWith("Status 404:")) {
-                        message = Html.fromHtml("Errore 404. Non è stato possibile soddisfare la richiesta sull'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
-                    } else {
-                        message = new SpannableString(ex.getMessage());
-                    }
-
-                    if (mListener != null) mListener.onError(message);
-
-                }
-        );
+            if (mListener != null) mListener.onDBDataLoading(item);
+        });
     }
 
-    private void initMenu(Runnable onComplete) {
+    private void initMenu() throws Exception {
         if (mListener != null) mListener.onMenuLoading();
-        this.menuService.init(onComplete, ex -> {
-            if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
-        });
+        this.menuService.init();
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.data_recover;
 
+import java.time.LocalDate;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -10,7 +11,7 @@ public class ColliDataRecoverDTO {
     private int id;
     private int numCollo;
     private String serCollo;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String gestioneCollo;
     private String filtro;
 
@@ -43,11 +44,11 @@ public class ColliDataRecoverDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public ColliDataRecoverDTO setDataCollo(String dataCollo) {
+    public ColliDataRecoverDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.data_recover;
 
 import android.content.Context;
 
-import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.IOUtils;
 import com.google.gson.Gson;
@@ -14,6 +13,7 @@ import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 
 import javax.inject.Inject;
@@ -65,9 +65,9 @@ public class ColliDataRecoverService {
     }
 
     private ColliDataRecoverDTO getIfExists(int id) {
-        Optional<ColliDataRecoverDTO> recoverDTOOptional = Stream.of(mtbColtsSessions)
+        Optional<ColliDataRecoverDTO> recoverDTOOptional = mtbColtsSessions.stream()
                 .filter(x -> x.getId() == id)
-                .findSingle();
+                .findFirst();
 
 
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
@@ -85,7 +85,7 @@ public class ColliDataRecoverService {
 
         ColliDataRecoverDTO recoverDTO = new ColliDataRecoverDTO()
                 .setId(newId)
-                .setDataCollo(mtbColtSession.getDataColloS())
+                .setDataCollo(mtbColtSession.getDataColloLD())
                 .setNumCollo(mtbColtSession.getNumCollo())
                 .setSerCollo(mtbColtSession.getSerCollo())
                 .setGestioneCollo(mtbColtSession.getGestione())

app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java

@@ -4,9 +4,6 @@ import androidx.databinding.BaseObservable;
 
 import java.math.BigDecimal;
 
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.utility.UtilityNumber;
-
 public class BindableFloat extends BaseObservable {
     private Float value;
 
@@ -15,10 +12,6 @@ public class BindableFloat extends BaseObservable {
     }
 
     public BigDecimal getBigDecimal() {
-        int numberOfDigits = UtilityNumber.countNumberOfDecimalDigits(get());
-
-        if(numberOfDigits > CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS) numberOfDigits = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
-
         return BigDecimal.valueOf(get());
     }
 

app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java

@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
@@ -24,6 +25,10 @@ import androidx.databinding.BindingAdapter;
 import androidx.databinding.BindingConversion;
 import androidx.databinding.Observable;
 import androidx.databinding.ObservableField;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewTreeLifecycleOwner;
 
 import com.google.android.material.datepicker.MaterialDatePicker;
 import com.google.android.material.textfield.TextInputEditText;
@@ -33,6 +38,8 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -41,6 +48,7 @@ import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
@@ -257,7 +265,7 @@ public class Converters {
                     BigDecimal value = null;
 
                     if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                        value = UtilityNumber.parseBigDecimal(s.toString(), Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -267,7 +275,7 @@ public class Converters {
         }
 
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -288,7 +296,7 @@ public class Converters {
                     String newValueString = s.toString().trim();
 
                     if (!UtilityString.isNullOrEmpty(newValueString))
-                        value = new BigDecimal(newValueString);
+                        value = UtilityNumber.parseBigDecimal(newValueString, Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -297,7 +305,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -318,7 +326,7 @@ public class Converters {
                     String newValueString = s.toString().trim();
 
                     if (!UtilityString.isNullOrEmpty(newValueString))
-                        value = new BigDecimal(newValueString);
+                        value = UtilityNumber.parseBigDecimal(newValueString, Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -327,7 +335,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -346,7 +354,8 @@ public class Converters {
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
                     if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                        value = UtilityNumber.parseBigDecimal(s.toString(), Locale.getDefault());
+
                     bindableBigDecimal.set(value);
                 }
             };
@@ -354,7 +363,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = bindableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -820,11 +829,11 @@ public class Converters {
 
 
     @BindingAdapter("visibilityWhenNotNull")
-    public static void bindViewVisibilityWhenNotNull(View view, ObservableField<?> bindableObject) {
+    public static void bindViewVisibilityObservableFieldWhenNotNull(View view, ObservableField<?> bindableObject) {
         if(bindableObject == null) return;
 
-        if (view.getTag(R.id.bound_observable) != bindableObject) {
-            view.setTag(R.id.bound_observable, bindableObject);
+        if (view.getTag(R.id.bound_observable_visibility) != bindableObject) {
+            view.setTag(R.id.bound_observable_visibility, bindableObject);
         }
 
         bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
@@ -838,6 +847,36 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityLiveDataWhenNotNull(View view, LiveData<?> liveData) {
+        // Se il LiveData è null, nascondi la view e esci
+        if (liveData == null) {
+            view.setVisibility(View.GONE);
+            return;
+        }
+
+        // Ottieni il LifecycleOwner dalla view
+        LifecycleOwner lifecycleOwner = ViewTreeLifecycleOwner.get(view);
+        if (lifecycleOwner == null) return;
+
+        // Rimuovi eventuali observer precedenti
+        Observer<Object> oldObserver = (Observer<Object>) view.getTag(R.id.bound_observable_visibility);
+        if (oldObserver != null) {
+            liveData.removeObserver(oldObserver);
+        }
+
+        // Crea e registra il nuovo observer
+        Observer<Object> newObserver = value ->
+                view.setVisibility(value == null ? View.GONE : View.VISIBLE);
+
+        liveData.observe(lifecycleOwner, newObserver);
+        view.setTag(R.id.bound_observable_visibility, newObserver);
+
+        // Imposta lo stato iniziale
+        view.setVisibility(liveData.getValue() == null ? View.GONE : View.VISIBLE);
+    }
+
+
     @BindingAdapter("visibilityWhenNotNull")
     public static void bindViewVisibilityWhenNotNull(View view, Object genericObject) {
         view.setVisibility(genericObject == null ? View.GONE : View.VISIBLE);
@@ -845,7 +884,7 @@ public class Converters {
 
 
     @BindingAdapter("visibilityWhenNull")
-    public static void bindViewVisibilityWhenNull(View view, ObservableField<?> bindableObject) {
+    public static void bindViewVisibilityObservableFieldWhenNull(View view, ObservableField<?> bindableObject) {
 
         if (view.getTag(R.id.bound_observable_visibility) != bindableObject) {
             view.setTag(R.id.bound_observable_visibility, bindableObject);
@@ -864,6 +903,36 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNull")
+    public static void bindViewVisibilityLiveDataWhenNull(View view, LiveData<?> liveData) {
+        // Se il LiveData è null, nascondi la view e esci
+        if (liveData == null) {
+            view.setVisibility(View.VISIBLE);
+            return;
+        }
+
+        // Ottieni il LifecycleOwner dalla view
+        LifecycleOwner lifecycleOwner = ViewTreeLifecycleOwner.get(view);
+        if (lifecycleOwner == null) return;
+
+        // Rimuovi eventuali observer precedenti
+        Observer<Object> oldObserver = (Observer<Object>) view.getTag(R.id.bound_observable_visibility);
+        if (oldObserver != null) {
+            liveData.removeObserver(oldObserver);
+        }
+
+        // Crea e registra il nuovo observer
+        Observer<Object> newObserver = value ->
+                view.setVisibility(value == null ? View.VISIBLE : View.GONE);
+
+        liveData.observe(lifecycleOwner, newObserver);
+        view.setTag(R.id.bound_observable_visibility, newObserver);
+
+        // Imposta lo stato iniziale
+        view.setVisibility(liveData.getValue() == null ? View.VISIBLE : View.GONE);
+    }
+
+
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) {
@@ -910,4 +979,64 @@ public class Converters {
         view.setLayoutParams(layoutParams);
     }
 
-}
+    /**
+     * BindingAdapter per bindare una LocalDate diretta su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateText="@{myLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDate date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    @BindingAdapter(value = {"localDateTimeText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDateTime date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy hh:mm";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter per bindare una ObservableField<LocalDate> su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateObservableText="@{myObservableLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateObservableText", "dateFormat"}, requireAll = false)
+    public static void bindObservableLocalDateText(TextView view, ObservableField<LocalDate> observableDate, String dateFormat) {
+        if (observableDate == null) {
+            view.setText("");
+            return;
+        }
+        LocalDate date = observableDate.get();
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter che applica automaticamente il KeyListener localizzato
+     * ai campi con inputType numberDecimal, permettendo l'uso della virgola
+     * come separatore decimale in base al locale del dispositivo.
+     */
+    @BindingAdapter("useLocaleDecimalInput")
+    public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) {
+        if (useLocaleInput) {
+            view.setKeyListener(LocaleDecimalKeyListener.getInstance());
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java

@@ -66,9 +66,6 @@ public class Ean128Service {
 
                     switch (aiModel.AI) {
                         case SSCC -> {
-                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
-                                aiValue = new StringBuilder(aiValue.substring(1));
-                            }
                             model.Sscc = aiValue.toString();
                         }
                         case GTIN -> {

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java

@@ -3,6 +3,6 @@ package it.integry.integrywmsnative.core.exception;
 public class InvalidCodMdepBarcodeException extends RuntimeException {
 
     public InvalidCodMdepBarcodeException(String message) {
-        super(message);
+        super("Il deposito scansionato non è valido: " + message);
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java

@@ -3,13 +3,13 @@ package it.integry.integrywmsnative.core.exception;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 
-public final class InvalidCodMdepLUException extends Exception {
+public final class InvalidCodMdepException extends Exception {
 
-    public InvalidCodMdepLUException() {
+    public InvalidCodMdepException() {
         super(UtilityResources.getString(R.string.invalid_codmdep_error_message));
     }
 
-    public InvalidCodMdepLUException(String codMdep) {
+    public InvalidCodMdepException(String codMdep) {
         super(UtilityResources.getString(R.string.invalid_codmdep_error_message) + "(" + codMdep + ")");
     }
 

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java

@@ -34,7 +34,6 @@ public class BaseActivity extends AppCompatActivity {
     }
 
     public void onLoadingStarted() {
-        BarcodeManager.disable();
         this.openProgress();
     }
 
@@ -52,14 +51,14 @@ public class BaseActivity extends AppCompatActivity {
 
 
     private void openProgress() {
-        BarcodeManager.disable();
+        BarcodeManager.disableLastCallback();
 //        executorService.execute(() -> {
             this.mCurrentProgress.show(getSupportFragmentManager());
 //        });
     }
 
     private void closeProgress() {
-        BarcodeManager.enable();
+        BarcodeManager.enableLastCallback();
 //        executorService.execute(() -> {
             mCurrentProgress.dismiss();
 //        });
@@ -67,7 +66,7 @@ public class BaseActivity extends AppCompatActivity {
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) {
+        if (BarcodeManager.isLastCallbackEnabled() && BarcodeManager.isKeyboardEmulator()) {
             if (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE && !isControlKey(event)) {
                 return BarcodeManager.onKeyDown(event.getKeyCode(), event);
             }

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java

@@ -14,7 +14,7 @@ public class BaseDialog extends Dialog {
 
     public BaseDialog(@NonNull Context context) {
         super(context);
-        if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) {
+        if (BarcodeManager.isLastCallbackEnabled() && BarcodeManager.isKeyboardEmulator()) {
             setOnKeyListener((dialog, keyCode, event) -> {
                 if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) {
                     return BarcodeManager.onKeyDown(event.getKeyCode(), event);

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java

@@ -65,25 +65,23 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
     }
 
     public void onLoadingStarted() {
-        BarcodeManager.disable();
         this.openProgress();
     }
 
     public void onLoadingEnded() {
         this.closeProgress();
-        BarcodeManager.enable();
     }
 
 
     private void openProgress() {
-        BarcodeManager.disable();
+        BarcodeManager.disableLastCallback();
 //        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
 //        });
     }
 
     private void closeProgress() {
-        BarcodeManager.enable();
+        BarcodeManager.enableLastCallback();
 //        executorService.execute(() -> {
             mCurrentProgress.dismiss();
 //        });
@@ -91,9 +89,8 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
 
     public void onError(Exception ex) {
-        this.onLoadingEnded();
-
         requireActivity().runOnUiThread(() -> {
+            this.onLoadingEnded();
             UtilityExceptions.defaultException(requireActivity(), ex);
         });
     }
@@ -130,7 +127,7 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
                 .create()
                 .inject(this);
 
-        if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator() && getDialog() != null) {
+        if (BarcodeManager.isLastCallbackEnabled() && BarcodeManager.isKeyboardEmulator() && getDialog() != null) {
             getDialog().setOnKeyListener((dialog, keyCode, event) -> {
                 if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) {
                     return BarcodeManager.onKeyDown(event.getKeyCode(), event);

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java

@@ -69,14 +69,14 @@ public abstract class BaseFragment extends Fragment {
     }
 
     private void openProgress() {
-        BarcodeManager.disable();
+        BarcodeManager.disableLastCallback();
 //        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
 //        });
     }
 
     private void closeProgress() {
-        BarcodeManager.enable();
+        BarcodeManager.enableLastCallback();
 //        executorService.execute(() -> {
             mCurrentProgress.dismiss();
 //        });
@@ -86,7 +86,6 @@ public abstract class BaseFragment extends Fragment {
         handler.post(() -> {
             this.closeProgress();
             UtilityExceptions.defaultException(getActivity(), ex);
-            BarcodeManager.enable();
         });
     }
 

app/src/main/java/it/integry/integrywmsnative/core/expansion/view/ExtendedSectionedRecyclerViewNew.java

@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.expansion.view;
+
+import android.view.View;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+
+public abstract class ExtendedSectionedRecyclerViewNew<T, SH extends RecyclerView.ViewHolder, VH extends RecyclerView.ViewHolder>
+        extends SectionedRecyclerViewAdapter<SH, VH> {
+
+    private View mEmptyView;
+
+    public ExtendedSectionedRecyclerViewNew(ObservableArrayList<T> myDataset) {
+        super();
+
+        myDataset.addOnListChangedCallback(new OnListGeneralChangedCallback<T>() {
+            @Override
+            public void onChanged(ObservableList<T> sender) {
+                checkIfEmpty();
+            }
+        });
+
+        checkIfEmpty();
+    }
+
+    public ExtendedSectionedRecyclerViewNew<T, SH, VH> setEmptyView(View emptyView) {
+        this.mEmptyView = emptyView;
+        this.checkIfEmpty();
+        return this;
+    }
+
+
+
+    private void checkIfEmpty() {
+        if (mEmptyView != null) {
+            final boolean emptyViewVisible = getItemCount() == 0;
+            mEmptyView.setVisibility(emptyViewVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/expansion/view/RecyclerViewProfiler.java

@@ -0,0 +1,218 @@
+package it.integry.integrywmsnative.core.expansion.view;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.util.SparseArray;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayDeque;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class RecyclerViewProfiler {
+    private static final String TAG = "RVProfiler";
+    private final SparseArray<Long> bindingTimes;
+    private final SparseArray<Long> creationTimes;
+    private final Handler mainHandler;
+    private WeakReference<RecyclerView> recyclerViewRef;
+    private boolean isProfilingEnabled = true;
+
+    // Metriche di performance
+    private long totalBindingTime = 0;
+    private long totalCreationTime = 0;
+    private int bindCount = 0;
+    private int createCount = 0;
+    private long firstBindTime = 0;
+    private final ArrayDeque<Long> recentBindTimes;
+    private static final int MAX_RECENT_TIMES = 50;
+
+    public RecyclerViewProfiler(RecyclerView recyclerView) {
+        this.recyclerViewRef = new WeakReference<>(recyclerView);
+        this.bindingTimes = new SparseArray<>();
+        this.creationTimes = new SparseArray<>();
+        this.mainHandler = new Handler(Looper.getMainLooper());
+        this.recentBindTimes = new ArrayDeque<>();
+
+        setupRecyclerViewCallbacks();
+    }
+
+    private void setupRecyclerViewCallbacks() {
+        RecyclerView recyclerView = recyclerViewRef.get();
+        if (recyclerView == null) return;
+
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    logPerformanceMetrics();
+                }
+            }
+        });
+
+        // Monitora il pre-layout
+        recyclerView.addOnLayoutChangeListener((v, left, top, right, bottom,
+                                                oldLeft, oldTop, oldRight, oldBottom) -> {
+            if (firstBindTime == 0) {
+                mainHandler.postDelayed(this::checkInitialPerformance, 500);
+            }
+        });
+    }
+
+    public void onPreBind(int position) {
+        if (!isProfilingEnabled) return;
+        bindingTimes.put(position, System.nanoTime());
+    }
+
+    public void onPostBind(int position) {
+        if (!isProfilingEnabled) return;
+
+        Long startTime = bindingTimes.get(position);
+        if (startTime != null) {
+            long bindTime = System.nanoTime() - startTime;
+            bindingTimes.remove(position);
+
+            if (firstBindTime == 0) {
+                firstBindTime = bindTime;
+            }
+
+            totalBindingTime += bindTime;
+            bindCount++;
+
+            recentBindTimes.addLast(bindTime);
+            if (recentBindTimes.size() > MAX_RECENT_TIMES) {
+                recentBindTimes.removeFirst();
+            }
+
+            // Segnala binding lenti
+            if (bindTime > TimeUnit.MILLISECONDS.toNanos(16)) { // 1 frame
+                Log.w(TAG, String.format("Slow binding at position %d: %.2fms",
+                        position, bindTime / 1_000_000.0));
+            }
+        }
+    }
+
+    public void onPreCreate(int viewType) {
+        if (!isProfilingEnabled) return;
+        creationTimes.put(viewType, System.nanoTime());
+    }
+
+    public void onPostCreate(int viewType) {
+        if (!isProfilingEnabled) return;
+
+        Long startTime = creationTimes.get(viewType);
+        if (startTime != null) {
+            long createTime = System.nanoTime() - startTime;
+            creationTimes.remove(viewType);
+
+            totalCreationTime += createTime;
+            createCount++;
+
+            // Segnala creazioni lente
+            if (createTime > TimeUnit.MILLISECONDS.toNanos(8)) {
+                Log.w(TAG, String.format("Slow view creation for type %d: %.2fms",
+                        viewType, createTime / 1_000_000.0));
+            }
+        }
+    }
+
+    private void checkInitialPerformance() {
+        RecyclerView recyclerView = recyclerViewRef.get();
+        if (recyclerView == null) return;
+
+        // Verifica inflazione layout
+        long avgBindTime = bindCount > 0 ? totalBindingTime / bindCount : 0;
+        if (avgBindTime > TimeUnit.MILLISECONDS.toNanos(8)) {
+            Log.w(TAG, String.format("High average binding time: %.2fms. " +
+                    "Consider using AsyncLayoutInflater", avgBindTime / 1_000_000.0));
+        }
+
+        // Verifica dimensione view pool
+        RecyclerView.RecycledViewPool pool = recyclerView.getRecycledViewPool();
+        if (pool != null) {
+            int[] viewTypes = getViewTypes(recyclerView);
+            for (int type : viewTypes) {
+                if (pool.getRecycledViewCount(type) == 0) {
+                    Log.w(TAG, "ViewPool empty for type " + type +
+                            ". Consider increasing pool size");
+                }
+            }
+        }
+
+        // Verifica prefetch
+        if (recyclerView.getLayoutManager() instanceof LinearLayoutManager) {
+            LinearLayoutManager lm = (LinearLayoutManager) recyclerView.getLayoutManager();
+            if (!lm.isItemPrefetchEnabled()) {
+                Log.w(TAG, "Item prefetch is disabled. Enable it for better performance");
+            }
+        }
+    }
+
+    private void logPerformanceMetrics() {
+        if (!isProfilingEnabled || recentBindTimes.isEmpty()) return;
+
+        // Calcola la varianza dei tempi di binding recenti
+        double mean = recentBindTimes.stream()
+                .mapToLong(Long::longValue)
+                .average()
+                .orElse(0.0);
+
+        double variance = recentBindTimes.stream()
+                .mapToDouble(time -> Math.pow(time - mean, 2))
+                .average()
+                .orElse(0.0);
+
+        Log.d(TAG, String.format("Performance metrics:\n" +
+                        "Avg binding time: %.2fms\n" +
+                        "Binding time variance: %.2f\n" +
+                        "View creation rate: %.1f%%",
+                mean / 1_000_000.0,
+                variance / 1_000_000.0,
+                createCount * 100.0 / (bindCount + 1)));
+    }
+
+    private int[] getViewTypes(RecyclerView recyclerView) {
+        RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
+        if (adapter == null) return new int[0];
+
+        Set<Integer> types = new HashSet<>();
+        for (int i = 0; i < adapter.getItemCount(); i++) {
+            types.add(adapter.getItemViewType(i));
+        }
+        return types.stream().mapToInt(Integer::intValue).toArray();
+    }
+
+    public void enableProfiling(boolean enabled) {
+        isProfilingEnabled = enabled;
+        if (!enabled) {
+            bindingTimes.clear();
+            creationTimes.clear();
+            recentBindTimes.clear();
+        }
+    }
+
+    public String getProfilingStats() {
+        if (bindCount == 0) return "No data collected yet";
+
+        return String.format(Locale.US,
+                "Profiling Statistics:\n" +
+                        "Total bindings: %d\n" +
+                        "Average binding time: %.2fms\n" +
+                        "Total view creations: %d\n" +
+                        "Average creation time: %.2fms\n" +
+                        "First binding time: %.2fms\n" +
+                        "Creation/Binding ratio: %.1f%%",
+                bindCount,
+                (totalBindingTime / bindCount) / 1_000_000.0,
+                createCount,
+                (totalCreationTime / createCount) / 1_000_000.0,
+                firstBindTime / 1_000_000.0,
+                createCount * 100.0 / bindCount);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/expansion/view/SectionedRecyclerViewAdapter.java

@@ -0,0 +1,352 @@
+package it.integry.integrywmsnative.core.expansion.view;
+
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import it.integry.integrywmsnative.BuildConfig;
+
+public abstract class SectionedRecyclerViewAdapter<H extends RecyclerView.ViewHolder,
+        I extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private RecyclerViewProfiler profiler;
+
+    private static final int TYPE_HEADER = 0;
+    private static final int TYPE_ITEM = 1;
+
+    // Utilizziamo SparseArray invece di HashMap per migliori performance su Android
+    private final SparseArray<Section> sectionsByPosition;
+    private final ArrayList<Section> sections;
+
+    // Cache per le posizioni degli item per evitare ricalcoli frequenti
+    private final SparseIntArray positionCache;
+    private int lastCacheUpdateCount;
+
+    // Pool di View per riutilizzo
+    private final RecyclerView.RecycledViewPool sharedPool;
+
+    // Dimensione massima della cache delle posizioni
+    private static final int MAX_POSITION_CACHE_SIZE = 2000;
+
+    public SectionedRecyclerViewAdapter() {
+        this.sections = new ArrayList<>();
+        this.sectionsByPosition = new SparseArray<>();
+        this.positionCache = new SparseIntArray(MAX_POSITION_CACHE_SIZE);
+        this.sharedPool = new RecyclerView.RecycledViewPool();
+
+        // Aumentiamo il pool di ViewHolder per tipo
+        sharedPool.setMaxRecycledViews(TYPE_HEADER, 500);
+        sharedPool.setMaxRecycledViews(TYPE_ITEM, 2000);
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        profiler = new RecyclerViewProfiler(recyclerView);
+        profiler.enableProfiling(BuildConfig.DEBUG);
+
+        recyclerView.setRecycledViewPool(sharedPool);
+
+        // Ottimizziamo il layout manager per le prestazioni
+        if (recyclerView.getLayoutManager() instanceof LinearLayoutManager) {
+            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+            layoutManager.setItemPrefetchEnabled(true);
+//            layoutManager.setInitialPrefetchItemCount(20);
+        }
+
+//        recyclerView.postDelayed(() -> {
+            // Precarica alcuni ViewHolder
+//            for (int i = 0; i < 100; i++) {
+//                sharedPool.putRecycledView(
+//                        createViewHolder(recyclerView, TYPE_HEADER));
+//            }
+//            for (int i = 0; i < 100; i++) {
+//                sharedPool.putRecycledView(
+//                        createViewHolder(recyclerView, TYPE_ITEM));
+//            }
+//        }, 50);
+    }
+
+    protected static class Section {
+        private final Object headerData;
+        private final ArrayList<Object> itemsData;
+        private int globalStartPosition; // Posizione globale di inizio sezione
+
+        public Section(Object headerData, int initialCapacity) {
+            this.headerData = headerData;
+            this.itemsData = new ArrayList<>(initialCapacity);
+            this.globalStartPosition = 0;
+        }
+
+        public Object getHeaderData() {
+            return headerData;
+        }
+
+        public List<Object> getItemsData() {
+            return itemsData;
+        }
+
+        public void addItem(Object item) {
+            itemsData.add(item);
+        }
+
+        public int getItemCount() {
+            return itemsData.size();
+        }
+
+        public void setGlobalStartPosition(int position) {
+            this.globalStartPosition = position;
+        }
+
+        public int getGlobalStartPosition() {
+            return globalStartPosition;
+        }
+    }
+
+    // ViewHolder pooling e caching
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        super.onViewRecycled(holder);
+        // Pulizia custom del ViewHolder se necessario
+        if (holder instanceof OnRecycleListener) {
+            ((OnRecycleListener) holder).onRecycle();
+        }
+    }
+
+    // Interfaccia per gestire la pulizia custom dei ViewHolder
+    public interface OnRecycleListener {
+        void onRecycle();
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        profiler.onPreCreate(viewType);
+        RecyclerView.ViewHolder holder;
+        if (viewType == TYPE_HEADER) {
+            holder = onCreateHeaderViewHolder(parent);
+        } else {
+            holder = onCreateItemViewHolder(parent);
+        }
+
+        // Applichiamo ViewHolder pooling
+        if (holder.itemView.getLayoutParams() == null) {
+            holder.itemView.setLayoutParams(
+                    new ViewGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+            );
+        }
+
+        profiler.onPostCreate(viewType);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        profiler.onPreBind(position);
+        PositionInfo posInfo = getItemPositionInfo(position);
+
+        if (getItemViewType(position) == TYPE_HEADER) {
+            onBindHeaderViewHolder((H) holder,
+                    sections.get(posInfo.sectionPosition).getHeaderData(),
+                    posInfo.sectionPosition);
+        } else {
+            Section section = sections.get(posInfo.sectionPosition);
+            onBindItemViewHolder((I) holder,
+                    section.getItemsData().get(posInfo.itemPosition),
+                    posInfo.sectionPosition,
+                    posInfo.itemPosition);
+        }
+        profiler.onPostBind(position);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (payloads.isEmpty()) {
+            super.onBindViewHolder(holder, position, payloads);
+            return;
+        }
+
+        // Supporto per aggiornamenti parziali
+        if (getItemViewType(position) == TYPE_HEADER) {
+            onBindHeaderViewHolderPartial((H) holder, position, payloads);
+        } else {
+            onBindItemViewHolderPartial((I) holder, position, payloads);
+        }
+    }
+
+    // Metodi per gestire aggiornamenti parziali
+    protected void onBindHeaderViewHolderPartial(H holder, int position, List<Object> payloads) {
+        onBindViewHolder(holder, position);
+    }
+
+    protected void onBindItemViewHolderPartial(I holder, int position, List<Object> payloads) {
+        onBindViewHolder(holder, position);
+    }
+
+    @Override
+    public int getItemCount() {
+        int count = 0;
+        for (Section section : sections) {
+            count += section.getItemCount() + 1;
+        }
+        return count;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return isHeader(position) ? TYPE_HEADER : TYPE_ITEM;
+    }
+
+    // Metodi ottimizzati per la gestione delle sezioni
+    public <T> void addSection(T headerData, int expectedItems) {
+        sections.add(new Section(headerData, expectedItems));
+        updatePositionCache();
+        notifyDataSetChanged();
+    }
+
+    public void addItem(int sectionPosition, Object item) {
+        if (sectionPosition >= 0 && sectionPosition < sections.size()) {
+            sections.get(sectionPosition).addItem(item);
+            updatePositionCache();
+            // Notifichiamo solo l'inserimento invece di un refresh completo
+            notifyItemInserted(getGlobalPositionForItem(sectionPosition,
+                    sections.get(sectionPosition).getItemCount() - 1));
+        }
+    }
+
+    public <T extends Object, S extends Object> void setSections(List<T> headers, Map<T, List<S>> items) {
+        sections.clear();
+        sectionsByPosition.clear();
+
+        int position = 0;
+        for (T header : headers) {
+            List<S> sectionItems = items.get(header);
+            Section section = new Section(header, sectionItems != null ? sectionItems.size() : 5);
+            if (sectionItems != null) {
+                section.getItemsData().addAll(sectionItems);
+            }
+            section.setGlobalStartPosition(position);
+            sections.add(section);
+            sectionsByPosition.put(position, section);
+
+            position += section.getItemCount() + 1;
+        }
+
+        updatePositionCache();
+        notifyDataSetChanged();
+    }
+
+    // Gestione efficiente della cache delle posizioni
+    private void updatePositionCache() {
+        if (sections.size() > MAX_POSITION_CACHE_SIZE) {
+            positionCache.clear();
+            return;
+        }
+
+        int currentPosition = 0;
+        for (int i = 0; i < sections.size(); i++) {
+            Section section = sections.get(i);
+            section.setGlobalStartPosition(currentPosition);
+            sectionsByPosition.put(currentPosition, section);
+            currentPosition += section.getItemCount() + 1;
+        }
+
+        lastCacheUpdateCount = getItemCount();
+    }
+
+    private boolean isHeader(int position) {
+        Section section = sectionsByPosition.get(position);
+        if (section != null) {
+            return true;
+        }
+
+        for (int i = 0; i < sections.size(); i++) {
+            section = sections.get(i);
+            if (position == section.getGlobalStartPosition()) {
+                return true;
+            }
+            if (position < section.getGlobalStartPosition() + section.getItemCount() + 1) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private static class PositionInfo {
+        final int sectionPosition;
+        final int itemPosition;
+
+        PositionInfo(int sectionPosition, int itemPosition) {
+            this.sectionPosition = sectionPosition;
+            this.itemPosition = itemPosition;
+        }
+    }
+
+    private PositionInfo getItemPositionInfo(int position) {
+        // Controllo cache
+        int cachedSection = positionCache.get(position, -1);
+        if (cachedSection != -1 && lastCacheUpdateCount == getItemCount()) {
+            Section section = sections.get(cachedSection);
+            int relativePos = position - section.getGlobalStartPosition();
+            if (relativePos == 0) {
+                return new PositionInfo(cachedSection, -1);
+            }
+            return new PositionInfo(cachedSection, relativePos - 1);
+        }
+
+        // Ricerca ottimizzata
+        Section targetSection = sectionsByPosition.get(position);
+        if (targetSection != null) {
+            int sectionIndex = sections.indexOf(targetSection);
+            return new PositionInfo(sectionIndex, -1);
+        }
+
+        // Ricerca binaria nelle sezioni
+        int left = 0;
+        int right = sections.size() - 1;
+
+        while (left <= right) {
+            int mid = (left + right) >>> 1;
+            Section section = sections.get(mid);
+            int sectionStart = section.getGlobalStartPosition();
+            int sectionEnd = sectionStart + section.getItemCount() + 1;
+
+            if (position >= sectionStart && position < sectionEnd) {
+                int relativePos = position - sectionStart;
+                if (relativePos == 0) {
+                    return new PositionInfo(mid, -1);
+                }
+                return new PositionInfo(mid, relativePos - 1);
+            }
+
+            if (position < sectionStart) {
+                right = mid - 1;
+            } else {
+                left = mid + 1;
+            }
+        }
+
+        throw new IndexOutOfBoundsException("Position " + position + " is out of bounds");
+    }
+
+    private int getGlobalPositionForItem(int sectionPosition, int itemPosition) {
+        return sections.get(sectionPosition).getGlobalStartPosition() + itemPosition + 1;
+    }
+
+    // Metodi astratti che devono essere implementati
+    protected abstract H onCreateHeaderViewHolder(ViewGroup parent);
+    protected abstract I onCreateItemViewHolder(ViewGroup parent);
+    protected abstract void onBindHeaderViewHolder(H holder, Object headerData, int sectionPosition);
+    protected abstract void onBindItemViewHolder(I holder, Object itemData, int sectionPosition, int itemPosition);
+}

app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java

@@ -1,17 +1,10 @@
 package it.integry.integrywmsnative.core.menu;
 
-import androidx.annotation.NonNull;
-
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbMenu;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import retrofit2.Call;
-import retrofit2.Response;
 
 @Singleton
 public class MenuRESTConsumer extends _BaseRESTConsumer {
@@ -22,19 +15,12 @@ public class MenuRESTConsumer extends _BaseRESTConsumer {
         this.restBuilder = restBuilder;
     }
 
-    public void retrieveMenu(String rootCodOpz, RunnableArgs<StbMenu> onComplete, RunnableArgs<Exception> onFailed) {
+    public StbMenu retrieveMenuSynchronized(String rootCodOpz) throws Exception {
         MenuRESTConsumerService menuRESTConsumerService = restBuilder.getService(MenuRESTConsumerService.class);
-        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<StbMenu>> call, Response<ServiceRESTResponse<StbMenu>> response) {
-                analyzeAnswer(response, "retrieveMenu", onComplete, onFailed);
-            }
+        var response = menuRESTConsumerService.retrieveMenuConfig(rootCodOpz)
+                .execute();
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, @NonNull final Exception e) {
-                onFailed.run(e);
-            }
-        });
+        return analyzeAnswer(response, "retrieveMenu");
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/menu/MenuService.java

@@ -10,7 +10,6 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.menu.exception.MenuNotFoundException;
 import it.integry.integrywmsnative.core.model.StbMenu;
 
@@ -29,20 +28,18 @@ public class MenuService {
         this.menuRESTConsumer = menuRESTConsumer;
     }
 
-    public void init(Runnable onMenuInitialized, RunnableArgs<Exception> onFailed) {
-        menuRESTConsumer.retrieveMenu(MENU_COD_OPZ, menu -> {
-            if(menu != null) {
-                this.mInternalCachedMenu = menu.getStbMenuChildren();
-                this.mInternalCachedFlatMenu = new ArrayList<>();
-                flattenMenu(this.mInternalCachedMenu);
-            }
+    public void init() throws Exception {
+        var menu = menuRESTConsumer.retrieveMenuSynchronized(MENU_COD_OPZ);
 
-            onMenuInitialized.run();
-        }, onFailed);
+        if (menu != null) {
+            this.mInternalCachedMenu = menu.getStbMenuChildren();
+            this.mInternalCachedFlatMenu = new ArrayList<>();
+            flattenMenu(this.mInternalCachedMenu);
+        }
     }
 
     public List<StbMenu> getMenu() throws Exception {
-        if(mInternalCachedMenu == null) throw new MenuNotFoundException();
+        if (mInternalCachedMenu == null) throw new MenuNotFoundException();
 
         return mInternalCachedMenu;
     }
@@ -64,10 +61,10 @@ public class MenuService {
     }
 
     private void flattenMenu(List<StbMenu> menu) {
-        for(StbMenu stbMenu : menu) {
+        for (StbMenu stbMenu : menu) {
             this.mInternalCachedFlatMenu.add(stbMenu);
 
-            if(stbMenu.getStbMenuChildren() != null && !stbMenu.getStbMenuChildren().isEmpty()) {
+            if (stbMenu.getStbMenuChildren() != null && !stbMenu.getStbMenuChildren().isEmpty()) {
                 flattenMenu(stbMenu.getStbMenuChildren());
             }
         }

app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java

@@ -1,7 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 public class DtbDoct {
@@ -10,7 +10,7 @@ public class DtbDoct {
 
     private String codAnag;
     private String codDtip;
-    private Date dataDoc;
+    private LocalDate dataDoc;
     private Integer numDoc;
     private String serDoc;
     private BigDecimal acconto;
@@ -41,14 +41,14 @@ public class DtbDoct {
     private String compilatoDa;
     private String userName;
     private String controllatoDa;
-    private Date dataChkDoc;
-    private Date dataDocVal;
-    private Date dataInizTrasp;
-    private Date dataIns;
-    private Date dataOrd;
-    private Date dataReg;
-    private Date dataRifScad;
-    private Date dataUltMod;
+    private LocalDate dataChkDoc;
+    private LocalDate dataDocVal;
+    private LocalDate dataInizTrasp;
+    private LocalDate dataIns;
+    private LocalDate dataOrd;
+    private LocalDate dataReg;
+    private LocalDate dataRifScad;
+    private LocalDate dataUltMod;
     private String descrizionePaga;
     private String flagPrzScontati;
     private String gestione;
@@ -89,7 +89,7 @@ public class DtbDoct {
     private String targa;
     private Integer postiPallet;
     private BigDecimal tempMedia;
-    private Date dataCons;
+    private LocalDate dataCons;
     private BigDecimal nolo;
     private BigDecimal nolo2;
     private String conducente;
@@ -102,7 +102,7 @@ public class DtbDoct {
     private String setDataDecorrenza2DataRic;
     private BigDecimal totSpese;
     private String chkArtListino;
-    private Date dataCmov;
+    private LocalDate dataCmov;
     private String reso;
     private Integer numCmovAutofattura;
     private Object dtbTipi;
@@ -141,11 +141,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataDoc() {
+    public LocalDate getDataDoc() {
         return dataDoc;
     }
 
-    public DtbDoct setDataDoc(Date dataDoc) {
+    public DtbDoct setDataDoc(LocalDate dataDoc) {
         this.dataDoc = dataDoc;
         return this;
     }
@@ -420,74 +420,74 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataChkDoc() {
+    public LocalDate getDataChkDoc() {
         return dataChkDoc;
     }
 
-    public DtbDoct setDataChkDoc(Date dataChkDoc) {
+    public DtbDoct setDataChkDoc(LocalDate dataChkDoc) {
         this.dataChkDoc = dataChkDoc;
         return this;
     }
 
-    public Date getDataDocVal() {
+    public LocalDate getDataDocVal() {
         return dataDocVal;
     }
 
-    public DtbDoct setDataDocVal(Date dataDocVal) {
+    public DtbDoct setDataDocVal(LocalDate dataDocVal) {
         this.dataDocVal = dataDocVal;
         return this;
     }
 
-    public Date getDataInizTrasp() {
+    public LocalDate getDataInizTrasp() {
         return dataInizTrasp;
     }
 
-    public DtbDoct setDataInizTrasp(Date dataInizTrasp) {
+    public DtbDoct setDataInizTrasp(LocalDate dataInizTrasp) {
         this.dataInizTrasp = dataInizTrasp;
         return this;
     }
 
-    public Date getDataIns() {
+    public LocalDate getDataIns() {
         return dataIns;
     }
 
-    public DtbDoct setDataIns(Date dataIns) {
+    public DtbDoct setDataIns(LocalDate dataIns) {
         this.dataIns = dataIns;
         return this;
     }
 
-    public Date getDataOrd() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public DtbDoct setDataOrd(Date dataOrd) {
+    public DtbDoct setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
 
-    public Date getDataReg() {
+    public LocalDate getDataReg() {
         return dataReg;
     }
 
-    public DtbDoct setDataReg(Date dataReg) {
+    public DtbDoct setDataReg(LocalDate dataReg) {
         this.dataReg = dataReg;
         return this;
     }
 
-    public Date getDataRifScad() {
+    public LocalDate getDataRifScad() {
         return dataRifScad;
     }
 
-    public DtbDoct setDataRifScad(Date dataRifScad) {
+    public DtbDoct setDataRifScad(LocalDate dataRifScad) {
         this.dataRifScad = dataRifScad;
         return this;
     }
 
-    public Date getDataUltMod() {
+    public LocalDate getDataUltMod() {
         return dataUltMod;
     }
 
-    public DtbDoct setDataUltMod(Date dataUltMod) {
+    public DtbDoct setDataUltMod(LocalDate dataUltMod) {
         this.dataUltMod = dataUltMod;
         return this;
     }
@@ -852,11 +852,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataCons() {
+    public LocalDate getDataCons() {
         return dataCons;
     }
 
-    public DtbDoct setDataCons(Date dataCons) {
+    public DtbDoct setDataCons(LocalDate dataCons) {
         this.dataCons = dataCons;
         return this;
     }
@@ -969,11 +969,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataCmov() {
+    public LocalDate getDataCmov() {
         return dataCmov;
     }
 
-    public DtbDoct setDataCmov(Date dataCmov) {
+    public DtbDoct setDataCmov(LocalDate dataCmov) {
         this.dataCmov = dataCmov;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -96,6 +97,8 @@ public class MtbAart extends EntityBase {
 
     private List<MtbUntMis> mtbUntMis;
 
+    private List<MtbAartBarCode> mtbAartBarCode;
+
 
     public enum UntMisRifPesoEnum {
         C,
@@ -108,6 +111,104 @@ public class MtbAart extends EntityBase {
         this.type = "mtb_aart";
     }
 
+    public MtbAart(MtbAart other) {
+        this();
+
+        this.codMart = other.codMart;
+        this.descrizione = other.descrizione;
+        this.untMis = other.untMis;
+        this.barCode = other.barCode;
+        this.pesoKg = other.pesoKg; // BigDecimal è immutabile
+        this.qtaCnf = other.qtaCnf;
+        this.codAliq = other.codAliq;
+        this.codScoArt = other.codScoArt;
+        this.codTcolUi = other.codTcolUi;
+        this.codTcolUl = other.codTcolUl;
+        this.articoloComposto = other.articoloComposto;
+        this.esposizioneComp = other.esposizioneComp;
+        this.descrizioneEstesa = other.descrizioneEstesa;
+        this.codUltForn = other.codUltForn;
+        this.dataUltCar = other.dataUltCar;
+        this.valUltCar = other.valUltCar;
+        this.codUltClie = other.codUltClie;
+        this.dataUltScar = other.dataUltScar;
+        this.valUltScar = other.valUltScar;
+        this.tipoCodice = other.tipoCodice;
+        this.note = other.note;
+        this.posizione = other.posizione;
+        this.colliPedana = other.colliPedana;
+        this.untMis2 = other.untMis2;
+        this.rapConv2 = other.rapConv2;
+        this.flagInclListino = other.flagInclListino;
+        this.untMis3 = other.untMis3;
+        this.rapConv3 = other.rapConv3;
+        this.codMartStat = other.codMartStat;
+        this.codMcon = other.codMcon;
+        this.codMgrp = other.codMgrp;
+        this.codMsfa = other.codMsfa;
+        this.codMsgr = other.codMsgr;
+        this.codMstp = other.codMstp;
+        this.codMtip = other.codMtip;
+        this.descrizioneStat = other.descrizioneStat;
+        this.flagStato = other.flagStato;
+        this.cambioDiviCar = other.cambioDiviCar;
+        this.cambioDiviScar = other.cambioDiviScar;
+        this.ggScadPartita = other.ggScadPartita;
+        this.volumeMc = other.volumeMc;
+        this.flagEsponiPrz = other.flagEsponiPrz;
+        this.dataUltVar = other.dataUltVar;
+        this.percSfrido = other.percSfrido;
+        this.codBarreImb = other.codBarreImb;
+        this.flagCalcPrz = other.flagCalcPrz;
+        this.esposizioneCompAcq = other.esposizioneCompAcq;
+        this.flagCalcPrzAcq = other.flagCalcPrzAcq;
+        this.diacod = other.diacod;
+        this.plu = other.plu;
+        this.partIvaProd = other.partIvaProd;
+        this.ragSocProd = other.ragSocProd;
+        this.flagRapConvVariabile = other.flagRapConvVariabile;
+        this.flagMovArtMag = other.flagMovArtMag;
+        this.flagTracciabilita = other.flagTracciabilita;
+        this.taraKg = other.taraKg;
+        this.colliStrato = other.colliStrato;
+        this.flagQtaCnfFissa = other.flagQtaCnfFissa;
+        this.flagColliPedanaFisso = other.flagColliPedanaFisso;
+        this.codCconCosti = other.codCconCosti;
+        this.codCconRicavi = other.codCconRicavi;
+        this.codDgrpArt = other.codDgrpArt;
+        this.codDiviCar = other.codDiviCar;
+        this.codDiviScar = other.codDiviScar;
+        this.codEcrCat = other.codEcrCat;
+        this.codEcrMcat = other.codEcrMcat;
+        this.codEcrRep = other.codEcrRep;
+        this.codEcrStipo = other.codEcrStipo;
+        this.codEcrTipo = other.codEcrTipo;
+        this.codGrpBolla = other.codGrpBolla;
+        this.ingredienti = other.ingredienti;
+        this.idArtEqui = other.idArtEqui;
+        this.descrCassa = other.descrCassa;
+        this.codNcIntracee = other.codNcIntracee;
+        this.marchio = other.marchio;
+        this.sezione = other.sezione;
+        this.untMisRifPeso = other.untMisRifPeso; // Enum è immutabile
+
+        this.qtaEsistente = other.qtaEsistente;
+        this.qtaImpegnata = other.qtaImpegnata;
+        this.numCnfEsistente = other.numCnfEsistente;
+        this.numCnfImpegnata = other.numCnfImpegnata;
+
+        // Deep copy della lista
+        if (other.mtbUntMis != null) {
+            this.mtbUntMis = new ArrayList<>();
+            for (MtbUntMis untMis : other.mtbUntMis) {
+                this.mtbUntMis.add(new MtbUntMis(untMis)); // Assicurati che MtbUntMis abbia un costruttore di copia
+            }
+        }
+    }
+
+
+
+
     public boolean isFlagTracciabilitaBoolean() {
         return flagTracciabilita != null && flagTracciabilita.equalsIgnoreCase("S");
     }
@@ -866,6 +967,13 @@ public class MtbAart extends EntityBase {
         return getMtbUntMis() != null && !getMtbUntMis().isEmpty() ? getMtbUntMis().get(0) : null;
     }
 
+    public List<MtbAartBarCode> getMtbAartBarCode() {
+        return mtbAartBarCode;
+    }
+
+    public void setMtbAartBarCode(List<MtbAartBarCode> mtbAartBarCode) {
+        this.mtbAartBarCode = mtbAartBarCode;
+    }
 
     @Override
     public boolean equals(Object o) {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java

@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+
+public class MtbAartBarCode extends EntityBase {
+    private String codBarre;
+    private String codMart;
+    private BigDecimal qtaCnf;
+    private String flagPrimario;
+    private String tipoCodBarre;
+
+    public MtbAartBarCode() {
+        this.type = "mtb_aart_bar_code";
+    }
+
+    public String getCodBarre() {
+        return codBarre;
+    }
+
+    public void setCodBarre(String codBarre) {
+        this.codBarre = codBarre;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public void setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+    }
+
+    public String getFlagPrimario() {
+        return flagPrimario;
+    }
+
+    public void setFlagPrimario(String flagPrimario) {
+        this.flagPrimario = flagPrimario;
+    }
+
+    public String getTipoCodBarre() {
+        return tipoCodBarre;
+    }
+
+    public void setTipoCodBarre(String tipoCodBarre) {
+        this.tipoCodBarre = tipoCodBarre;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java

@@ -15,7 +15,7 @@ public class MtbColr extends EntityBase {
     private String gestione;
     private String serCollo;
     private Integer numCollo;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private Integer riga;
     private Integer rigaOrd;
     private String codMart;
@@ -27,7 +27,7 @@ public class MtbColr extends EntityBase {
     private String serColloRif;
     private String note;
     private LocalDate dataOrd;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private BigDecimal qtaCnf;
     private BigDecimal qtaCol;
     private Integer numOrd;
@@ -67,6 +67,58 @@ public class MtbColr extends EntityBase {
         }
     }
 
+    public MtbColr(MtbColr other) {
+        this();
+
+        this.gestione = other.gestione;
+        this.serCollo = other.serCollo;
+        this.numCollo = other.numCollo;
+        this.dataCollo = other.dataCollo;
+        this.riga = other.riga;
+        this.rigaOrd = other.rigaOrd;
+        this.codMart = other.codMart;
+        this.codBarre = other.codBarre;
+        this.codCol = other.codCol;
+        this.codTagl = other.codTagl;
+        this.partitaMag = other.partitaMag;
+        this.gestioneRif = other.gestioneRif;
+        this.serColloRif = other.serColloRif;
+        this.note = other.note;
+        this.dataOrd = other.dataOrd; // LocalDate è immutabile
+        this.dataColloRif = other.dataColloRif;
+        this.qtaCnf = other.qtaCnf; // BigDecimal è immutabile
+        this.qtaCol = other.qtaCol;
+        this.numOrd = other.numOrd;
+        this.numEtich = other.numEtich;
+        this.numColloRif = other.numColloRif;
+        this.datetimeRow = other.datetimeRow;
+        this.codJcom = other.codJcom;
+        this.numCnf = other.numCnf;
+        this.insPartitaMag = other.insPartitaMag;
+        this.mtbPartitaMag_descrizione = other.mtbPartitaMag_descrizione;
+        this.dataScadPartita = other.dataScadPartita;
+        this.descrizione = other.descrizione;
+        this.untMis = other.untMis;
+        this.causale = other.causale;
+        this.utente = other.utente;
+        this.codAnagDoc = other.codAnagDoc;
+        this.codDtipDoc = other.codDtipDoc;
+        this.dataDoc = other.dataDoc;
+        this.serDoc = other.serDoc;
+        this.numDoc = other.numDoc;
+        this.idRigaDoc = other.idRigaDoc;
+        this.pesoNettoKg = other.pesoNettoKg;
+        this.pesoLordoKg = other.pesoLordoKg;
+
+        // Deep copy degli oggetti complessi
+        this.mtbAart = other.mtbAart != null ? new MtbAart(other.mtbAart) : null;
+        this.mtbPartitaMag = other.mtbPartitaMag != null ? new MtbPartitaMag(other.mtbPartitaMag) : null;
+
+        // Non copiamo i campi transient
+        // this.id = other.id;
+        // this.refMtbColr = other.refMtbColr;
+    }
+
 
     public static class Causale {
         public static final int DEFAULT = 0;
@@ -112,21 +164,18 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
-    public String getDataColloS() {
+
+    public LocalDate getDataColloLD() {
         return dataCollo;
     }
 
-    public Date getDataColloD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
-    }
-
     public MtbColr setDataCollo(String dataCollo) {
-        this.dataCollo = dataCollo;
+        this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo);
         return this;
     }
 
-    public MtbColr setDataCollo(Date dataCollo) {
-        setDataCollo(UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
+    public MtbColr setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = dataCollo;
         return this;
     }
 
@@ -235,25 +284,24 @@ public class MtbColr extends EntityBase {
     }
 
     public String getDataColloRifS() {
-        return dataColloRif;
+        return dataColloRif != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataColloRif) : null;
     }
 
     public Date getDataColloRifD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloRifS());
     }
 
-    public MtbColr setDataColloRif(String dataColloRif) {
-        this.dataColloRif = dataColloRif;
-        return this;
+    public LocalDate getDataColloRifLD() {
+        return dataColloRif;
     }
 
-    public MtbColr setDataColloRif(Date dataColloRif) {
-        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+    public MtbColr setDataColloRif(String dataColloRif) {
+        this.dataColloRif = UtilityDate.recognizeLocalDateWithExceptionHandler(dataColloRif);
         return this;
     }
 
     public MtbColr setDataColloRif(LocalDate dataColloRif) {
-        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        this.dataColloRif = dataColloRif;
         return this;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.model;
 import android.text.TextUtils;
 
 import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
@@ -22,7 +22,6 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
 /**
@@ -31,7 +30,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class MtbColt extends EntityBase {
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String rifOrd;
@@ -66,7 +65,9 @@ public class MtbColt extends EntityBase {
     private BigDecimal altezzaCm;
     private String codJcom;
 
-    private final ObservableField<ObservableMtbTcol> mtbTCol = new ObservableField<>();
+    private String barcodeUl;
+
+    private final transient MutableLiveData<ObservableMtbTcol> mtbTCol = new MutableLiveData<>();
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -84,7 +85,7 @@ public class MtbColt extends EntityBase {
 
     public MtbColt() {
         type = "mtb_colt";
-        setDataCollo(UtilityDate.getDateInstance());
+        setDataCollo(LocalDate.now());
         setSerCollo("/");
 
         if (SettingsManager.i().isUserLoggedIn()) {
@@ -143,20 +144,13 @@ public class MtbColt extends EntityBase {
     }
 
     public String getDataColloHumanLong() {
-        Date dataColloD = null;
-        try {
-            dataColloD = getDataColloD();
-        } catch (Exception ex) {
-            UtilityLogger.error(ex);
-        }
-
-        if (dataColloD != null) {
-            return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG);
+        if (dataCollo != null) {
+            return UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_HUMAN_FORMATTER.format(dataCollo);
         } else return null;
     }
 
     public String getDataColloS() {
-        return dataCollo;
+        return dataCollo != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataCollo) : null;
     }
 
     public Date getDataColloD() {
@@ -164,21 +158,16 @@ public class MtbColt extends EntityBase {
     }
 
     public LocalDate getDataColloLD() {
-        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+        return dataCollo;
     }
 
     public MtbColt setDataCollo(String dataCollo) {
-        this.dataCollo = dataCollo;
-        return this;
-    }
-
-    public MtbColt setDataCollo(Date dataCollo) {
-        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo);
         return this;
     }
 
     public MtbColt setDataCollo(LocalDate dataCollo) {
-        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        this.dataCollo = dataCollo;
         return this;
     }
 
@@ -261,7 +250,7 @@ public class MtbColt extends EntityBase {
     public MtbColt setCodTcol(String codTcol) {
         this.codTcol = codTcol;
 
-        if(!UtilityString.isNullOrEmpty(codTcol)) {
+        if (!UtilityString.isNullOrEmpty(codTcol)) {
             var fountMtbTcolObservable = SettingsManager.iDB().getInternalImballi().stream()
                     .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol))
                     .findFirst()
@@ -544,16 +533,25 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public ObservableMtbTcol getMtbTCol() {
-        return mtbTCol.get();
+    public String getBarcodeUl() {
+        return barcodeUl;
     }
 
-    public MtbColt setMtbTCol(ObservableMtbTcol mtbTCol) {
-        this.mtbTCol.set(mtbTCol);
+    public MtbColt setBarcodeUl(String barcodeUl) {
+        this.barcodeUl = barcodeUl;
         return this;
     }
 
-    public ObservableField<ObservableMtbTcol> mtbTcolProperty() {
+    public ObservableMtbTcol getMtbTCol() {
+        return mtbTCol.getValue();
+    }
+
+    public MtbColt setMtbTCol(ObservableMtbTcol mtbTCol) {
+        this.mtbTCol.postValue(mtbTCol);
+        return this;
+    }
+
+    public MutableLiveData<ObservableMtbTcol> mtbTcolProperty() {
         return mtbTCol;
     }
 
@@ -631,8 +629,20 @@ public class MtbColt extends EntityBase {
 
     @Override
     public EntityBase clone() {
+        return clone(true);
+    }
+
+    public MtbColt clone(boolean withMtbColr) {
         MtbColt mtbColt = (MtbColt) super.clone();
-        mtbColt.setMtbColr((ObservableArrayList<MtbColr>) mtbColt.getMtbColr().clone());
+        mtbColt.setMtbColr(new ObservableArrayList<>());
+
+        if(!withMtbColr) return mtbColt;
+
+        this.getMtbColr().stream()
+                .map(MtbColr::new) //Genera un clone
+                .forEach(mtbColr -> {
+                    mtbColt.getMtbColr().add(mtbColr);
+                });
         return mtbColt;
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java

@@ -4,34 +4,60 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-public class MtbPartitaMag extends EntityBase{
-    private String codMart;    
-    
-    private String partitaMag;    
-    private String descrizione;    
+public class MtbPartitaMag extends EntityBase {
+    private String codMart;
+
+    private String partitaMag;
+    private String descrizione;
     private LocalDateTime dataIns;
     private LocalDate dataScad;
-    private Integer scelta;    
+    private Integer scelta;
     private BigDecimal costoUntUmMag;
-    private BigDecimal valUntUmMag;    
-    private BigDecimal taraCnfKg;    
-    private BigDecimal qtaCnf;    
-    private String flagImballoArendere;    
-    private String flagStato;    
-    private String codDiviCont;    
-    private BigDecimal cambioDiviCont;    
-    private String barcode;    
-    private String note;    
-    private BigDecimal rapConv2;    
-    private BigDecimal rapConv3;    
-    private String posizione;    
+    private BigDecimal valUntUmMag;
+    private BigDecimal taraCnfKg;
+    private BigDecimal qtaCnf;
+    private String flagImballoArendere;
+    private String flagStato;
+    private String codDiviCont;
+    private BigDecimal cambioDiviCont;
+    private String barcode;
+    private String note;
+    private BigDecimal rapConv2;
+    private BigDecimal rapConv3;
+    private String posizione;
     private String dataAggPrz;
-    private String partitaMagSec;    
+    private String partitaMagSec;
     private BigDecimal qtaAttesa;
 
     public MtbPartitaMag() {
         this.type = "mtb_partita_mag";
     }
+    public MtbPartitaMag(MtbPartitaMag other) {
+        this();
+
+        this.codMart = other.codMart;
+        this.partitaMag = other.partitaMag;
+        this.descrizione = other.descrizione;
+        this.dataIns = other.dataIns; // LocalDateTime è immutabile
+        this.dataScad = other.dataScad; // LocalDate è immutabile
+        this.scelta = other.scelta;
+        this.costoUntUmMag = other.costoUntUmMag; // BigDecimal è immutabile
+        this.valUntUmMag = other.valUntUmMag;
+        this.taraCnfKg = other.taraCnfKg;
+        this.qtaCnf = other.qtaCnf;
+        this.flagImballoArendere = other.flagImballoArendere;
+        this.flagStato = other.flagStato;
+        this.codDiviCont = other.codDiviCont;
+        this.cambioDiviCont = other.cambioDiviCont;
+        this.barcode = other.barcode;
+        this.note = other.note;
+        this.rapConv2 = other.rapConv2;
+        this.rapConv3 = other.rapConv3;
+        this.posizione = other.posizione;
+        this.dataAggPrz = other.dataAggPrz;
+        this.partitaMagSec = other.partitaMagSec;
+        this.qtaAttesa = other.qtaAttesa;
+    }
 
 
     public String getCodMart() {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbUntMis.java

@@ -15,6 +15,18 @@ public class MtbUntMis extends EntityBase {
         this.type = "mtb_unt_mis";
     }
 
+    // Costruttore di copia
+    public MtbUntMis(MtbUntMis other) {
+        this();
+
+        this.untMis = other.untMis;
+        this.flagDig = other.flagDig;
+        this.cifreDec = other.cifreDec; // BigDecimal è immutabile
+        this.tipoUm = other.tipoUm;
+        this.flagUnitaKg = other.flagUnitaKg;
+        this.flagAttivo = other.flagAttivo;
+    }
+
     public String getUntMis() {
         return untMis;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java

@@ -4,7 +4,6 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
@@ -306,7 +305,7 @@ public class MvwSitArtUdcDetInventario {
         return new MtbColr()
                 .setCodJcom(getCodJcom())
                 .setCodMart(getCodMart())
-                .setDataCollo(UtilityDate.toDate(getDataCollo()))
+                .setDataCollo(getDataCollo())
                 .setNumCollo(getNumCollo())
                 .setSerCollo(getSerCollo())
                 .setGestione(getGestione())

app/src/main/java/it/integry/integrywmsnative/core/model/dto/AlreadyRegisteredUlDTO.java

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.model.dto;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
 
-public class AlreadyRegisteredUDCDTO {
+public class AlreadyRegisteredUlDTO {
 
     private MtbColt mtbColt;
 
@@ -13,7 +13,7 @@ public class AlreadyRegisteredUDCDTO {
         return mtbColt;
     }
 
-    public AlreadyRegisteredUDCDTO setMtbColt(MtbColt mtbColt) {
+    public AlreadyRegisteredUlDTO setMtbColt(MtbColt mtbColt) {
         this.mtbColt = mtbColt;
         return this;
     }
@@ -22,7 +22,7 @@ public class AlreadyRegisteredUDCDTO {
         return canBeRecovered;
     }
 
-    public AlreadyRegisteredUDCDTO setCanBeRecovered(boolean canBeRecovered) {
+    public AlreadyRegisteredUlDTO setCanBeRecovered(boolean canBeRecovered) {
         this.canBeRecovered = canBeRecovered;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java

@@ -28,7 +28,7 @@ public class AuthInterceptor implements Interceptor {
     public Response intercept(@NonNull Chain chain) throws IOException {
         var originalRequest = chain.request();
 
-        if (SettingsManager.i().getUserSession() != null) {
+        if (SettingsManager.i().getUserSession() != null && SettingsManager.i().getUserSession().getAccessToken() != null) {
 
             var accessToken = SettingsManager.i().getUserSession().getAccessToken();
             var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
@@ -55,21 +55,22 @@ public class AuthInterceptor implements Interceptor {
                             .protocol(Protocol.HTTP_1_1)
                             .code(401)
                             .message("Unauthorized")
-                            .body(ResponseBody.create(new byte[0], null))
+                            .body(ResponseBody.create(okhttp3.MediaType.get("application/json"), new byte[0]))
                             .build();
                 } catch (Exception e) {
                     return chain.proceed(originalRequest);
                 }
 
+                //Retrieve the new access token after refresh
+                accessToken = SettingsManager.i().getUserSession().getAccessToken();
+            }
 
-                // Add the access token to the request header
-                var authorizedRequest = originalRequest.newBuilder()
-                        .header("Authorization", "Bearer " + SettingsManager.i().getUserSession().getAccessToken())
-                        .build();
+            // Add the access token to the request header
+            var authorizedRequest = originalRequest.newBuilder()
+                    .header("Authorization", "Bearer " + accessToken)
+                    .build();
 
-                return chain.proceed(authorizedRequest);
-            } else
-                return chain.proceed(originalRequest);
+            return chain.proceed(authorizedRequest);
         } else
             return chain.proceed(originalRequest);
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.rest;
 import java.io.IOException;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -18,30 +18,28 @@ public class HttpInterceptor implements Interceptor {
     @Override
     public Response intercept(Chain chain) throws IOException {
 
-        final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
-        final String APP_TOKEN      = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
+        final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
+        final String APP_TOKEN = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
 
-        final Request request = chain.request();
-        final HttpUrl url = request.url().newBuilder()
-                .addQueryParameter("profileDb", PROFILE_DB)
-                .build();
+        HttpUrl.Builder urlBuilder = chain.request().url().newBuilder();
 
-        Request.Builder builder = chain.request().newBuilder()
+        if (!UtilityString.isNullOrEmpty(PROFILE_DB))
+            urlBuilder
+                    .addQueryParameter("profileDb", PROFILE_DB);
+
+        HttpUrl url = urlBuilder.build();
+
+        final Request.Builder requestBuilder = chain.request().newBuilder();
+
+        Request.Builder builder = requestBuilder
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Accept", "*/*")
                 .addHeader("x-app-token", APP_TOKEN);
 
-
-        String accessToken = null;
-
-        //Nel caso in cui il token è scaduto e devo richiamare la refresh non bisogna passare il vecchio token
-        if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null &&
-                UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate())) {
-            accessToken = SettingsManager.i().getUserSession().getAccessToken();
-        }
-
-        if(accessToken != null)
-            builder.header("Authorization", "Bearer " + accessToken);
+        if (SettingsManager.i().getUserSession() != null &&
+                SettingsManager.i().getUserSession().getDepo() != null &&
+                !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getDepo().getCodMdep()))
+            builder.addHeader("codMdep", SettingsManager.i().getUserSession().getDepo().getCodMdep());
 
         var newRequest = builder
                 .url(url)

app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java

@@ -37,19 +37,19 @@ public class RESTBuilder {
     }
 
     public <T> T getService(final Class<T> service, int timeout) {
-        return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout);
+        return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, timeout);
 
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors) {
-        return getService(service, protocol, host, port, addInterceptors, true, 60);
+    public <T> T getService(final Class<T> service, String protocol, String host, int port) {
+        return getService(service, protocol, host, port, true, 60);
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi) {
-        return getService(service, protocol, host, port, addInterceptors, addEmsApi, 60);
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addEmsApi) {
+        return getService(service, protocol, host, port, addEmsApi, 60);
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addEmsApi, int timeout) {
         OkHttpClient.Builder clientBuilder = getDefaultHttpClient();
 
         timeout = 0;
@@ -62,7 +62,7 @@ public class RESTBuilder {
         clientBuilder.retryOnConnectionFailure(true);
 
         clientBuilder.addInterceptor(authInterceptor);
-        if (addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor());
+        clientBuilder.addInterceptor(new HttpInterceptor());
         if (ADD_LOGGER_INTERCEPTOR) clientBuilder.addInterceptor(new HttpLoggerInterceptor());
 
         OkHttpClient client = clientBuilder.build();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java

@@ -108,7 +108,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void findIfIsKit(MtbAart mtbAart, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed){
+    public void findIfIsKit(MtbAart mtbAart, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed) {
         ArticoloRESTConsumerService articoloRESTConsumerService = restBuilder.getService(ArticoloRESTConsumerService.class);
 
         articoloRESTConsumerService
@@ -133,7 +133,6 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toUnmodifiableList());
-
         ArticoloRESTConsumerService articoloRESTConsumer = restBuilder.getService(ArticoloRESTConsumerService.class);
         var response = articoloRESTConsumer
                 .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
@@ -198,37 +197,27 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList);
     }
 
-    public void getArtsGroups(List<String> groupsToFind, RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
-        executorService.execute(() -> {
-            try {
-                var data = getArtsGroupsSynchronized(groupsToFind);
-                if (onComplete != null) onComplete.run(data);
-            } catch (Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
-        });
-    }
 
-
-    public void getUntMisArts(List<String> inputUntMis, RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
-        List<HashMap<String, Object>> whereCondList = Stream.of(inputUntMis)
+    public List<MtbUntMis> getUntMisArtsSynchronized(List<String> inputUntMis) throws Exception {
+        List<HashMap<String, Object>> whereCondList = inputUntMis.parallelStream()
                 .distinct()
-                .withoutNulls()
+                .filter(Objects::nonNull)
                 .map(x -> {
                     HashMap<String, Object> data = new HashMap<>();
                     data.put("unt_mis", x);
                     return data;
                 })
-                .toList();
+                .collect(Collectors.toUnmodifiableList());
 
         var whereCond = whereCondList.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondList);
 
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbUntMis>>() {
         }.getType();
-        this.systemRESTConsumer.processSql("SELECT * FROM mtb_unt_mis " + whereCond, typeOfObjectsList, onComplete, onFailed);
+
+        return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM mtb_unt_mis " + whereCond, typeOfObjectsList);
     }
 
-    public void fillMtbAartsWithMtbUntMis(List<MtbAart> inputMtbAart, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbAart> fillMtbAartsWithMtbUntMisSynchronized(List<MtbAart> inputMtbAart) throws Exception {
         var inputUntMis = new ArrayList<String>();
 
         if (inputMtbAart != null && !inputMtbAart.isEmpty()) {
@@ -240,21 +229,23 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         }
 
         if (inputUntMis.isEmpty()) {
-            onComplete.run(inputMtbAart);
-            return;
+            return inputMtbAart;
         }
 
-        getUntMisArts(inputUntMis, mtbUntMiss -> {
-            for (var item : inputMtbAart) {
-                var mtbUntMis = Stream.of(mtbUntMiss).filter(x -> x.getUntMis().equalsIgnoreCase(item.getUntMis()))
-                        .findFirstOrElse(null);
+        var mtbUntMiss = getUntMisArtsSynchronized(inputUntMis);
 
-                if (mtbUntMis != null)
-                    item.setMtbUntMis(Collections.singletonList(mtbUntMis));
-            }
+        for (var item : inputMtbAart) {
+            var mtbUntMis = mtbUntMiss.stream()
+                    .filter(x -> x.getUntMis().equalsIgnoreCase(item.getUntMis()))
+                    .findFirst()
+                    .orElse(null);
+
+            if (mtbUntMis != null)
+                item.setMtbUntMis(Collections.singletonList(mtbUntMis));
+        }
+
+        return inputMtbAart;
 
-            onComplete.run(inputMtbAart);
-        }, onFailed);
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java

@@ -1,16 +1,9 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import androidx.annotation.NonNull;
-
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import retrofit2.Call;
-import retrofit2.Response;
 
 @Singleton
 public class AziendaRESTConsumer extends _BaseRESTConsumer {
@@ -21,19 +14,12 @@ public class AziendaRESTConsumer extends _BaseRESTConsumer {
         this.restBuilder = restBuilder;
     }
 
-    public void retrieveAzienda(RunnableArgs<Azienda> onComplete, RunnableArgs<Exception> onFailed) {
+    public Azienda retrieveAziendaSynchronized() throws Exception {
         AziendaRESTConsumerService aziendaRESTConsumerService = restBuilder.getService(AziendaRESTConsumerService.class);
-        aziendaRESTConsumerService.retrieveDefaultAzienda().enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<Azienda>> call, Response<ServiceRESTResponse<Azienda>> response) {
-                analyzeAnswer(response, "Retrieve default azienda", onComplete, onFailed);
-            }
+        var response = aziendaRESTConsumerService.retrieveDefaultAzienda()
+                .execute();
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<Azienda>> call, @NonNull final Exception e) {
-                onFailed.run(e);
-            }
-        });
+        return analyzeAnswer(response, "Retrieve default azienda");
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import androidx.annotation.NonNull;
 
 import java.math.BigDecimal;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -27,10 +28,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -44,10 +43,12 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
 
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
     private final SettingsManager settingsManager;
 
-    public ColliLavorazioneRESTConsumer(RESTBuilder restBuilder, SettingsManager settingsManager) {
+    public ColliLavorazioneRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SettingsManager settingsManager) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
         this.settingsManager = settingsManager;
     }
 
@@ -123,93 +124,111 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                 });
     }
 
-    public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt createUDSSynchronized(CreateUDSRequestDTO createUDSRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.createUDS(createUDSRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Response<ServiceRESTResponse<CreateUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/createUDS", data -> onComplete.run(data.getMtbColt()), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.createUDS(createUDSRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/createUDS");
+        return data.getMtbColt();
+    }
 
+    public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = createUDSSynchronized(createUDSRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public CloseUDSResponseDTO closeUDSSynchronized(CloseUDSRequestDTO closeUDSRequestDTO) throws Exception {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        var response = colliLavorazioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
+                .execute();
+
+        var data = analyzeAnswer(response, "lavorazione/closeUDS");
+        return data;
+    }
+
+    public void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = closeUDSSynchronized(closeUDSRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     @Override
-    public void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColr insertUDSRowSynchronized(InsertUDSRowRequestDTO insertUDSRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Response<ServiceRESTResponse<CloseUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/closeUDS", onComplete, onFailed);
-                    }
+        Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response = colliLavorazioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/insertUDSRow");
+        return data.getSavedMtbColr();
     }
 
+
     @Override
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = insertUDSRowSynchronized(insertUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public MtbColr editUDSRowSynchronized(EditUDSRowRequestDTO editUDSRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/insertUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/editUDSRow");
+        return data.getSavedMtbColr();
     }
 
     public void editUDSRow(EditUDSRowRequestDTO editUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
-
-        colliLavorazioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDSRowResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/editUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                var response = editUDSRowSynchronized(editUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
-    @Override
-    public void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void deleteUDSRowSynchronized(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "lavorazione/deleteUDSRow", data -> onComplete.run(), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "lavorazione/deleteUDSRow");
+    }
+
+    public void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                deleteUDSRowSynchronized(deleteUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java

@@ -11,12 +11,14 @@ import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
@@ -36,8 +38,8 @@ import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdatePosizioneULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
@@ -60,8 +62,9 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
     private final SettingsManager mSettingsManager;
+    private final ExecutorService executorService;
 
-    public ColliMagazzinoRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer,
+    public ColliMagazzinoRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer,
                                       ArticoloRESTConsumer articoloRESTConsumer,
                                       EntityRESTConsumer entityRESTConsumer,
                                       SettingsManager settingsManager) {
@@ -70,38 +73,36 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
         this.mSettingsManager = settingsManager;
+        this.executorService = executorService;
     }
 
-    public void saveCollo(MtbColt mtbColtToSave, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt saveColloSynchronized(MtbColt mtbColtToSave) throws Exception {
         MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
         mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
         mtbColtToSaveClone.setOnlyPkMaster(false);
 
-
-        mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
-
         for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) {
-            mtbColtToSaveClone.getMtbColr().add(
-                    ((MtbColr) mtbColtToSave.getMtbColr().get(i).clone())
-                            .setMtbAart(null)
-                            .setMtbPartitaMag(null));
+            mtbColtToSaveClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
         }
 
-        this.mEntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback<>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-                if (onComplete != null) onComplete.run(value);
-            }
+        return this.mEntityRESTConsumer.processEntitySynchronized(mtbColtToSaveClone, MtbColt.class);
+    }
 
-            @Override
-            public void onFailed(Exception ex) {
+    public void saveCollo(MtbColt mtbColtToSave, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var mtbColt = saveColloSynchronized(mtbColtToSave);
+                if (onComplete != null) onComplete.run(mtbColt);
+            } catch (Exception ex) {
                 if (onFailed != null) onFailed.run(ex);
             }
-        }, MtbColt.class);
+        });
 
     }
 
-    public void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbColt> saveColliSynchronized(List<MtbColt> mtbColtsToSave) throws Exception {
 
         for (MtbColt mtbColt : mtbColtsToSave) {
             for (int i = 0; i < mtbColt.getMtbColr().size(); i++) {
@@ -111,28 +112,22 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
         }
 
-        this.mEntityRESTConsumer.processEntityList(mtbColtsToSave, true, MtbColt.class, onComplete, onFailed);
-
-    }
-
-    public void createColloLavorazione(int segno, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        MtbColt mtbColtToCreate = new MtbColt()
-                .setSegno(segno);
-
-        mtbColtToCreate.initDefaultFields(GestioneEnum.LAVORAZIONE);
-
-        mtbColtToCreate
-                .setOperation(CommonModelConsts.OPERATION.INSERT);
-
-
-        saveCollo(mtbColtToCreate, value -> {
-            if (onComplete != null) onComplete.run(value);
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
-        });
+        return this.mEntityRESTConsumer.processEntityListSynchronized(mtbColtsToSave, true, MtbColt.class);
     }
 
     public void createColloScaricoDaCarico(MtbColt sourceMtbColt, MtbDepoPosizione posizione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var mtbColt = createColloScaricoDaCaricoSynchronized(sourceMtbColt, posizione);
+                if (onComplete != null) onComplete.run(mtbColt);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+
+    public MtbColt createColloScaricoDaCaricoSynchronized(MtbColt sourceMtbColt, MtbDepoPosizione posizione) throws Exception {
 
         MtbColt newMtbColt = new MtbColt()
                 .initDefaultFields(GestioneEnum.LAVORAZIONE)
@@ -166,11 +161,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
             mtbColrClone
                     .setNumCollo(null)
-                    .setDataCollo((String) null)
+                    .setDataCollo((LocalDate) null)
                     .setRiga(null)
                     .setGestione(GestioneEnum.LAVORAZIONE)
 
-                    .setDataColloRif(sourceMtbColt.getDataColloD())
+                    .setDataColloRif(sourceMtbColt.getDataColloLD())
                     .setNumColloRif(sourceMtbColt.getNumCollo())
                     .setGestioneRif(sourceMtbColt.getGestione())
                     .setSerColloRif(sourceMtbColt.getSerCollo())
@@ -181,7 +176,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
 
-        saveCollo(newMtbColt, onComplete, onFailed);
+        return saveColloSynchronized(newMtbColt);
     }
 
 
@@ -212,7 +207,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
 
-//        if (sourceMtbColt.getMtbColr().size() != 1) {
+//        if (sourceMtbColt.getMtbColr().getValue().size() != 1) {
 //            onFailed.run(new Exception());
 //            return;
 //        }
@@ -220,10 +215,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColr mtbColrClone = new MtbColr();
         mtbColrClone
                 .setNumCollo(null)
-                .setDataCollo((String) null)
+                .setDataCollo((LocalDate) null)
                 .setRiga(null)
                 .setGestione(GestioneEnum.LAVORAZIONE)
-                .setDataColloRif(sourceMtbColt.getDataColloD())
+                .setDataColloRif(sourceMtbColt.getDataColloLD())
                 .setNumColloRif(sourceMtbColt.getNumCollo())
                 .setGestioneRif(sourceMtbColt.getGestione())
                 .setSerColloRif(sourceMtbColt.getSerCollo())
@@ -288,32 +283,34 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(mtbColtToCreate, onComplete, onFailed);
     }
 
-    public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt getBySsccSynchronized(String ssccString, boolean onlyResiduo, boolean throwExcIfNull) throws Exception {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
-                analyzeAnswer(response, "GetBySSCC", mtbColt -> {
+        var colloResponse = colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull)
+                .execute();
+        var mtbColt = analyzeAnswer(colloResponse, "GetBySSCC");
 
-                    if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
-                        List<MtbColt> mtbColtList = new ArrayList<>();
-                        mtbColtList.add(mtbColt);
-                        fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
-                    } else {
-                        onComplete.run(mtbColt);
-                    }
+        if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
+            List<MtbColt> mtbColtList = new ArrayList<>();
+            mtbColtList.add(mtbColt);
+            var mtbColts = fillMtbAartsOfMtbColtsSynchronized(mtbColtList);
+            return mtbColts.get(0);
+        }
 
-                }, onFailed);
-            }
+        return mtbColt;
+    }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
-                onFailed.run(e);
+    public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var mtbColt = getBySsccSynchronized(ssccString, onlyResiduo, throwExcIfNull);
+                if (onComplete != null) onComplete.run(mtbColt);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }
 
-    public void fillMtbAartsOfMtbColrs(List<MtbColr> mtbColrs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbColr> fillMtbAartsOfMtbColrsSynchronized(List<MtbColr> mtbColrs) throws Exception {
 
         List<String> codMarts = new ArrayList<>(mtbColrs.stream()
                 .map(MtbColr::getCodMart)
@@ -321,14 +318,48 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .distinct()
                 .collect(Collectors.toUnmodifiableList()));
 
-        mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
+        var arts = mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
 
-            if (arts != null && !arts.isEmpty()) {
-                for (MtbColr mtbColr : mtbColrs) {
 
+        if (arts != null && !arts.isEmpty()) {
+            for (MtbColr mtbColr : mtbColrs) {
+                MtbAart foundMtbAart = null;
+
+                List<MtbAart> mtbAartStream = arts.stream()
+                        .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                        .collect(Collectors.toList());
+
+                if (!mtbAartStream.isEmpty()) {
+                    foundMtbAart = mtbAartStream.get(0);
+                }
+
+                mtbColr.setMtbAart(foundMtbAart);
+            }
+        }
+
+        return mtbColrs;
+    }
+
+    public List<MtbColt> fillMtbAartsOfMtbColtsSynchronized(List<MtbColt> mtbColts) throws Exception {
+        List<String> codMarts = new ArrayList<>();
+
+        for (MtbColt mtbColt : mtbColts) {
+            codMarts.addAll(mtbColt.getMtbColr().stream()
+                    .map(MtbColr::getCodMart)
+                    .filter(x -> !UtilityString.isNullOrEmpty(x))
+                    .distinct()
+                    .collect(Collectors.toList()));
+        }
+
+        List<MtbAart> mtbAarts = mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+
+        for (MtbColt mtbColt : mtbColts) {
+            for (MtbColr mtbColr : mtbColt.getMtbColr()) {
+
+                if (mtbAarts != null && !mtbAarts.isEmpty()) {
                     MtbAart foundMtbAart = null;
 
-                    List<MtbAart> mtbAartStream = arts.stream()
+                    List<MtbAart> mtbAartStream = mtbAarts.parallelStream()
                             .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
                             .collect(Collectors.toList());
 
@@ -338,52 +369,26 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
                     mtbColr.setMtbAart(foundMtbAart);
                 }
+
+                mtbColr.setGestione(mtbColt.getGestione());
+                mtbColr.setSerCollo(mtbColt.getSerCollo());
+                mtbColr.setNumCollo(mtbColt.getNumCollo());
+                mtbColr.setDataCollo(mtbColt.getDataColloLD());
             }
+        }
 
-            onComplete.run(mtbColrs);
-        }, onFailed);
-
+        return mtbColts;
     }
 
     public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-        List<String> codMarts = new ArrayList<>();
-
-        for (MtbColt mtbColt : mtbColts) {
-            codMarts.addAll(mtbColt.getMtbColr().stream()
-                    .map(MtbColr::getCodMart)
-                    .filter(Objects::nonNull)
-                    .distinct()
-                    .collect(Collectors.toUnmodifiableList()));
-        }
-
-
-        mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
-
-            if (arts != null && !arts.isEmpty()) {
-                for (MtbColt mtbColt : mtbColts) {
-                    for (MtbColr mtbColr : mtbColt.getMtbColr()) {
-
-                        MtbAart foundMtbAart = null;
-
-                        List<MtbAart> mtbAartStream = arts.stream()
-                                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
-                                .collect(Collectors.toList());
-
-                        if (!mtbAartStream.isEmpty()) {
-                            foundMtbAart = mtbAartStream.get(0);
-                        }
-
-                        mtbColr.setMtbAart(foundMtbAart);
-                        mtbColr.setGestione(mtbColt.getGestione());
-                        mtbColr.setSerCollo(mtbColt.getSerCollo());
-                        mtbColr.setNumCollo(mtbColt.getNumCollo());
-                        mtbColr.setDataCollo(mtbColt.getDataColloS());
-                    }
-                }
+        executorService.execute(() -> {
+            try {
+                List<MtbColt> returnedMtbColts = fillMtbAartsOfMtbColtsSynchronized(mtbColts);
+                if (onComplete != null) onComplete.run(returnedMtbColts);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
-
-            onComplete.run(mtbColts);
-        }, onFailed);
+        });
     }
 
     public void getMultipleByTestate(List<MtbColt> testate, boolean onlyResiduo, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -404,7 +409,17 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
     }
 
-    public void getByChiaveCollo(GestioneEnum gestione, int numCollo, String dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt getByChiaveColloSynchronized(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull) throws Exception {
+        MtbColt mtbColtToRetrieve = new MtbColt()
+                .setGestione(gestione)
+                .setNumCollo(numCollo)
+                .setDataCollo(dataCollo)
+                .setSerCollo(serCollo);
+
+        return getByTestataSynchronized(mtbColtToRetrieve, onlyResiduo, throwExcIfNull);
+    }
+
+    public void getByChiaveCollo(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToRetrieve = new MtbColt()
                 .setGestione(gestione)
                 .setNumCollo(numCollo)
@@ -414,36 +429,34 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         getByTestata(mtbColtToRetrieve, onlyResiduo, throwExcIfNull, onComplete, onFailed);
     }
 
-    public void getByTestata(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt getByTestataSynchronized(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull) throws Exception {
         testata.setMtbColr(new ObservableArrayList<>());
 
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
-                        analyzeAnswer(response, "getColloInGiac", mtbColt -> {
+        var response = colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata)
+                .execute();
+        var mtbColt = analyzeAnswer(response, "getColloInGiac");
+        if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
+            var mtbColts = fillMtbAartsOfMtbColtsSynchronized(Collections.singletonList(mtbColt));
+            return mtbColts.get(0);
+        }
 
-                            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
-                                List<MtbColt> mtbColtList = new ArrayList<>();
-                                mtbColtList.add(mtbColt);
-                                fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
-                            } else {
-                                onComplete.run(mtbColt);
-                            }
-
-                        }, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        return mtbColt;
     }
 
-    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void getByTestata(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var data = getByTestataSynchronized(testata, onlyResiduo, throwExcIfNull);
+                if (onComplete != null) onComplete.run(data);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public void spostaUlSynchronized(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically) throws Exception {
         MtbColt mtbColtToMoveClone = (MtbColt) mtbColtToMove.clone();
 
         for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
@@ -459,21 +472,23 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setCreateDocAutomatically(createDocAutomatically);
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService
+        Response<ServiceRESTResponse<Void>> response = colliMagazzinoRESTConsumerService
                 .spostaUL(spostaUlRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "spostaUL", mtbColts -> {
-                            onComplete.run();
-                        }, onFailed);
-                    }
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        if (onFailed != null) onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "spostaUL");
+    }
+
+
+    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                spostaUlSynchronized(mtbColtToMove, codMdep, posizione, createDocAutomatically);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     public void spostaUL(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
@@ -484,7 +499,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         spostaUL(mtbColtToMove, codMdep, posizioneString, true, onComplete, onFailed);
     }
 
-    public void updateTipoUL(MtbColt mtbColt, String codTcol, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void updateTipoULSynchronized(MtbColt mtbColt, String codTcol) throws Exception {
 
         MtbColt mtbColtClone = (MtbColt) mtbColt.clone();
         mtbColtClone.setMtbColr(new ObservableArrayList<>());
@@ -494,22 +509,52 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setCodTcol(codTcol);
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService
+        Response<ServiceRESTResponse<Void>> response = colliMagazzinoRESTConsumerService
                 .updateTipoUL(updateTipoULRequest)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "updateTipoUL", mtbColts -> {
-                            onComplete.run();
-                        }, onFailed);
-                    }
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        if (onFailed != null) onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "updateTipoUL");
+    }
 
+
+    public void updateTipoUL(MtbColt mtbColt, String codTcol, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                updateTipoULSynchronized(mtbColt, codTcol);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public void updatePosizioneULSynchronized(MtbColt mtbColt, String posizione) throws Exception {
+
+        MtbColt mtbColtClone = (MtbColt) mtbColt.clone();
+        mtbColtClone.setMtbColr(new ObservableArrayList<>());
+
+        UpdatePosizioneULRequestDTO updateTipoULRequest = new UpdatePosizioneULRequestDTO()
+                .setMtbColt(mtbColtClone)
+                .setPosizione(posizione);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        Response<ServiceRESTResponse<Void>> response = colliMagazzinoRESTConsumerService
+                .updatePosizioneUL(updateTipoULRequest)
+                .execute();
+
+        analyzeAnswer(response, "updatePosizioneUL");
+    }
+
+
+    public void updatePosizioneUL(MtbColt mtbColt, String posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                updatePosizioneULSynchronized(mtbColt, posizione);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
@@ -572,44 +617,45 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, boolean flagForceUseRefs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
-        new Thread(() -> {
-            MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
-            MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
+    public List<MtbColr> spostaArtsTraULSynchronized(MtbColt sourceMtbColt, MtbColt destMtbColt, boolean flagForceUseRefs) throws Exception {
+        MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
+        MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
 
-            for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
-                mtbColtToMoveClone.getMtbColr().get(i)
-                        .setMtbAart(null)
-                        .setMtbPartitaMag(null);
-            }
+        for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
+            mtbColtToMoveClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
+        }
 
-            mtbColtDestClone.setMtbColr(null);
+        mtbColtDestClone.setMtbColr(null);
 
-            SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
-                    .setSourceMtbColt(mtbColtToMoveClone)
-                    .setDestinationMtbColt(mtbColtDestClone)
-                    .setFlagForceUseRefs(flagForceUseRefs);
+        SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
+                .setSourceMtbColt(mtbColtToMoveClone)
+                .setDestinationMtbColt(mtbColtDestClone)
+                .setFlagForceUseRefs(flagForceUseRefs);
 
-            ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-            colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new ManagedErrorCallback<>() {
-                @Override
-                public void onResponse(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Response<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> response) {
-                    analyzeAnswer(response, "spostaArtsTraUL", data -> {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        var response = colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO)
+                .execute();
 
-                        fillMtbAartsOfMtbColrs(data.getGeneratedMtbColr(), onComplete, onFailed);
+        var data = analyzeAnswer(response, "spostaArtsTraUL");
+        var mtbColrs = fillMtbAartsOfMtbColrsSynchronized(data.getGeneratedMtbColr());
 
-                    }, onFailed);
-                }
-
-                @Override
-                public void onFailure(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, @NonNull final Exception e) {
-                    if (onFailed != null) onFailed.run(e);
-                }
-            });
-        }).start();
+        return mtbColrs;
     }
 
-    public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, boolean flagForceUseRefs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = spostaArtsTraULSynchronized(sourceMtbColt, destMtbColt, flagForceUseRefs);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public MtbColt assegnaLottoSuColloScaricoSynchronized(MtbColt sourceMtbColt) throws Exception {
         MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
 
         for (int i = 0; i < sourceMtbColtClone.getMtbColr().size(); i++) {
@@ -619,17 +665,20 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
-                analyzeAnswer(response, "assegnaLottoSuColloScarico", data -> {
-                    onComplete.run();
-                }, onFailed);
-            }
+        var response = colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone)
+                .execute();
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
-                if (onFailed != null) onFailed.run(e);
+        var data = analyzeAnswer(response, "assegnaLottoSuColloScarico");
+        return data;
+    }
+
+    public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = assegnaLottoSuColloScaricoSynchronized(sourceMtbColt);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }
@@ -735,42 +784,48 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void canULBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+    public Boolean canULBeDeletedSynchronized(MtbColt mtbColt) throws Exception {
         CanULBeDeletedRequestDTO canULBeDeletedRequestDTO = new CanULBeDeletedRequestDTO()
                 .setMtbColt(mtbColt);
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
 
-        colliMagazzinoRESTConsumerService.canULBeDeleted(canULBeDeletedRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
-                        analyzeAnswer(response, "generic/canULBeDeleted", onComplete, onFailed);
-                    }
+        var response = colliMagazzinoRESTConsumerService.canULBeDeleted(canULBeDeletedRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "generic/canULBeDeleted");
+        return data;
+    }
 
+    public void canULBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = canULBeDeletedSynchronized(mtbColt);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public void deleteULSynchronized(DeleteULRequestDTO deleteULRequestDTO) throws Exception {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+
+        var response = colliMagazzinoRESTConsumerService.deleteUL(deleteULRequestDTO)
+                .execute();
+
+        analyzeAnswer(response, "generic/deleteUL");
     }
 
     public void deleteUL(DeleteULRequestDTO deleteULRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-
-        colliMagazzinoRESTConsumerService.deleteUL(deleteULRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "generic/deleteUL", Void -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                deleteULSynchronized(deleteULRequestDTO);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
 
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java

@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdatePosizioneULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
@@ -37,6 +38,9 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("wms/updateTipoUL")
     Call<ServiceRESTResponse<Void>> updateTipoUL(@Body UpdateTipoULRequestDTO requestDto);
 
+    @POST("wms/updatePosizioneUL")
+    Call<ServiceRESTResponse<Void>> updatePosizioneUL(@Body UpdatePosizioneULRequestDTO requestDto);
+
     @POST("wms/spostaUL")
     Call<ServiceRESTResponse<Void>> spostaUL(@Body SpostaULRequestDTO requestDto);
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java

@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import androidx.annotation.NonNull;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -9,134 +9,152 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
-import retrofit2.Call;
 import retrofit2.Response;
 
 @Singleton
 public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements ColliScaricoRESTConsumerInterface {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
-    public ColliSpedizioneRESTConsumer(RESTBuilder restBuilder) {
+    public ColliSpedizioneRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
+    }
+
+    public MtbColt createUDSSynchronized(CreateUDSRequestDTO createUDSRequestDTO) throws Exception {
+        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+
+        var response = colliSpedizioneRESTConsumerService.createUDS(createUDSRequestDTO)
+                .execute();
+
+        var data = analyzeAnswer(response, "spedizione/createUDS");
+        return data.getMtbColt();
     }
 
     public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = createUDSSynchronized(createUDSRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public CloseUDSResponseDTO closeUDSSynchronized(CloseUDSRequestDTO closeUDSRequestDTO) throws Exception {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.createUDS(createUDSRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Response<ServiceRESTResponse<CreateUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/createUDS", data -> onComplete.run(data.getMtbColt()), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var response = colliSpedizioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
+                .execute();
 
+        var data = analyzeAnswer(response, "spedizione/closeUDS");
+        return data;
     }
 
     public void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = closeUDSSynchronized(closeUDSRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public MtbColr insertUDSRowSynchronized(InsertUDSRowRequestDTO insertUDSRowRequestDTO) throws Exception {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Response<ServiceRESTResponse<CloseUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/closeUDS", onComplete, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response = colliSpedizioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
+                .execute();
 
+        var data = analyzeAnswer(response, "spedizione/insertUDSRow");
+        return data.getSavedMtbColr();
     }
 
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = insertUDSRowSynchronized(insertUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public MtbColr editUDSRowSynchronized(EditUDSRowRequestDTO editUDSRowRequestDTO) throws Exception {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/insertUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliSpedizioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "spedizione/editUDSRow");
+        return data.getSavedMtbColr();
     }
 
     public void editUDSRow(EditUDSRowRequestDTO editUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = editUDSRowSynchronized(editUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public void deleteUDSRowSynchronized(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO) throws Exception {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDSRowResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/editUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliSpedizioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "spedizione/deleteUDSRow");
     }
 
     public void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                deleteUDSRowSynchronized(deleteUDSRowRequestDTO);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    public DuplicateUDSResponseDTO duplicateUDSSynchronized(DuplicateUDSRequestDTO duplicateUDSRequestDTO) throws Exception {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "spedizione/deleteUDSRow", data -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var response = colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
+                .execute();
 
+        var data = analyzeAnswer(response, "spedizione/duplicateUDS");
+        return data;
     }
 
     public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = restBuilder.getService(ColliSpedizioneRESTConsumerService.class);
-
-        colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(new Exception());
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                var data = duplicateUDSSynchronized(duplicateUDSRequestDTO);
+                if (onComplete != null) onComplete.run(data);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java

@@ -6,6 +6,7 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
@@ -18,34 +19,42 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 @Singleton
 public class CommessaRESTConsumer extends _BaseRESTConsumer {
 
+    private final ExecutorService executorService;
     private final SystemRESTConsumer systemRESTConsumer;
 
-    public CommessaRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    public CommessaRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        this.executorService = executorService;
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
 
-    public void getJtbComts(List<String> itemsToFind, RunnableArgs<List<JtbComt>> onComplete, RunnableArgs<Exception> onFailed) {
-        var whereCondMap = itemsToFind.stream()
+    public List<JtbComt> getJtbComtsSynchronized(List<String> itemsToFind) throws Exception {
+        List<HashMap<String, Object>> whereCondMap = itemsToFind.stream()
                 .filter(x -> !UtilityString.isNullOrEmpty(x))
-                .map(x -> {
-                    HashMap<String, Object> codJcom = new HashMap<>() {{
-                        put("cod_jcom", x);
-                    }};
-                    return codJcom;
-                })
+                .map(x -> new HashMap<String, Object>() {{
+                    put("cod_jcom", x);
+                }})
                 .collect(Collectors.toUnmodifiableList());
 
         if(whereCondMap.isEmpty()) {
-            onComplete.run(new ArrayList<>());
-            return;
+            return new ArrayList<>();
         }
 
         var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
 
         Type typeOfObjectsList = new TypeToken<ArrayList<JtbComt>>() {}.getType();
-        this.systemRESTConsumer.processSql("SELECT * FROM jtb_comt " + whereCond, typeOfObjectsList, onComplete, onFailed);
+        return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM jtb_comt " + whereCond, typeOfObjectsList);
+    }
 
+    public void getJtbComts(List<String> itemsToFind, RunnableArgs<List<JtbComt>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var data = getJtbComtsSynchronized(itemsToFind);
+                if (onComplete != null) onComplete.run(data);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java

@@ -5,26 +5,26 @@ import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 
 @Singleton
 public class DepositoRESTConsumer extends _BaseRESTConsumer {
 
-    private final EntityRESTConsumer entityRESTConsumer;
+    private final ExecutorService executorService;
     private final SystemRESTConsumer systemRESTConsumer;
 
-    public DepositoRESTConsumer(EntityRESTConsumer entityRESTConsumer, SystemRESTConsumer systemRESTConsumer) {
-        this.entityRESTConsumer = entityRESTConsumer;
+    public DepositoRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        this.executorService = executorService;
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
-    public void getAll(RunnableArgs<List<MtbDepo>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbDepo> getAllSynchronized() throws Exception {
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbDepo>>() {
         }.getType();
-        this.systemRESTConsumer.processSql("SELECT * FROM mtb_depo", typeOfObjectsList, onComplete, onFailed);
+        return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM mtb_depo", typeOfObjectsList);
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import androidx.annotation.NonNull;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -20,9 +21,11 @@ import retrofit2.Response;
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
-    public DocumentRESTConsumer(RESTBuilder restBuilder) {
+    public DocumentRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
     }
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -40,17 +43,22 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+    public DtbDoct makeSynchronousCreateDocFromColliRequest(LoadColliDTO loadColliDTO) throws Exception {
         DocumentiRESTConsumerService documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class);
-        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<DtbDoct>> call, Response<ServiceRESTResponse<DtbDoct>> response) {
-                analyzeAnswer(response, "createDocFromColli", onComplete, onFailed);
-            }
+        var response = documentiRESTConsumerService
+                .createDocFromColli(loadColliDTO)
+                .execute();
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, @NonNull final Exception e) {
-                onFailed.run(e);
+        return analyzeAnswer(response, "createDocFromColli");
+    }
+
+    public void makeCreateDocFromColliRequest(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = makeSynchronousCreateDocFromColliRequest(loadColliDTO);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java

@@ -9,6 +9,7 @@ import com.google.gson.JsonObject;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -26,100 +27,93 @@ import retrofit2.Response;
 public class EntityRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
-    public EntityRESTConsumer(RESTBuilder restBuilder) {
+    public EntityRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
+    }
+
+    public <T extends EntityBase> T processEntitySynchronized(T entityToSave, Class<T> type) throws Exception {
+        EntityRESTConsumerService service = restBuilder.getService(EntityRESTConsumerService.class);
+        var response = service
+                .processEntity(entityToSave)
+                .execute();
+
+        if (response.isSuccessful()) {
+            if (response.body() != null) {
+                if (response.body().getEsito() == EsitoType.OK) {
+                    Gson gson = UtilityGson.createObject();
+
+                    return gson.fromJson(response.body().getEntity(), type);
+                } else {
+                    Log.e("EntityRESTConsumer", response.body().getErrorMessage());
+                    throw new Exception(response.body().getErrorMessage());
+                }
+            } else {
+                Log.e("EntityRESTConsumer", response.message());
+                throw new Exception(response.message());
+            }
+        } else {
+            Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message());
+            throw new Exception("Status " + response.code() + ": " + response.message());
+        }
     }
 
     public <T extends EntityBase> void processEntity(T entityToSave, final ISimpleOperationCallback<T> callback, Class<T> type) {
+        executorService.execute(() -> {
+            try {
+                var data = processEntitySynchronized(entityToSave, type);
+                if (callback != null) callback.onSuccess(data);
+            } catch (Exception ex) {
+                if (callback != null) callback.onFailed(ex);
+            }
+        });
 
-        RunnableArgs<Exception> tmpFailed = ex -> {
-            if (callback != null) callback.onFailed(ex);
-        };
+    }
 
+    public <T extends EntityBase> List<T> processEntityListSynchronized(List<T> entitiesToSave, boolean singleTransaction, Class<T> type) throws Exception {
         EntityRESTConsumerService service = restBuilder.getService(EntityRESTConsumerService.class);
-        service
-                .processEntity(entityToSave)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
-                        if (response.isSuccessful()) {
+        var response = service.processEntityList(singleTransaction, entitiesToSave)
+                .execute();
 
-                            if (response.body() != null) {
-                                if (response.body().getEsito() == EsitoType.OK) {
-                                    Gson gson = UtilityGson.createObject();
-                                    T object = gson.fromJson(response.body().getEntity(), type);
+        if (response.isSuccessful()) {
 
-                                    callback.onSuccess(object);
-                                } else {
-                                    Log.e("EntityRESTConsumer", response.body().getErrorMessage());
-                                    tmpFailed.run(new Exception(response.body().getErrorMessage()));
-                                }
-                            } else {
-                                Log.e("EntityRESTConsumer", response.message());
-                                tmpFailed.run(new Exception(response.message()));
-                            }
-                        } else {
-                            Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message());
-                            tmpFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
-                        }
+            if (response.body() != null) {
+
+                ArrayList<T> responseList = new ArrayList<>();
+                Gson gson = UtilityGson.createObject();
+
+                for (ServiceRESTResponse<JsonObject> jsonSingleObject : response.body()) {
+
+                    if (jsonSingleObject.getEsito() == EsitoType.OK) {
+                        String jsonText = gson.toJson(jsonSingleObject.getEntity());
+                        responseList.add(gson.fromJson(jsonText, type));
+                    } else {
+                        Log.e("EntityRESTConsumer", jsonSingleObject.getErrorMessage());
+                        throw new Exception(jsonSingleObject.getErrorMessage());
                     }
+                }
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
-                        tmpFailed.run(e);
-                    }
-                });
+                return responseList;
+            } else {
+                Log.e("EntityRESTConsumer", response.message());
+                throw new Exception(response.message());
+            }
+        } else {
+            Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message());
+            throw new Exception("Status " + response.code() + ": " + response.message());
+        }
 
     }
 
     public <T extends EntityBase> void processEntityList(List<T> entitiesToSave, boolean singleTransaction, Class<T> type, final RunnableArgs<List<T>> onComplete, final RunnableArgs<Exception> onFailed) {
-
-        RunnableArgs<Exception> tmpFailed = ex -> {
-//            UtilityExceptions.defaultException(null, ex);
-            if (onFailed != null) onFailed.run(ex);
-        };
-
-        EntityRESTConsumerService service = restBuilder.getService(EntityRESTConsumerService.class);
-        Call<List<ServiceRESTResponse<JsonObject>>> request = service.processEntityList(singleTransaction, entitiesToSave);
-        request.enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<List<ServiceRESTResponse<JsonObject>>> call, Response<List<ServiceRESTResponse<JsonObject>>> response) {
-                if (response.isSuccessful()) {
-
-                    if (response.body() != null) {
-
-                        ArrayList<T> responseList = new ArrayList<>();
-                        Gson gson = UtilityGson.createObject();
-//                        Type typeOfObjectsList = new TypeToken<T>() {}.getType();
-
-                        for (ServiceRESTResponse<JsonObject> jsonSingleObject : response.body()) {
-
-                            if (jsonSingleObject.getEsito() == EsitoType.OK) {
-                                String jsonText = gson.toJson(jsonSingleObject.getEntity());
-                                responseList.add(gson.fromJson(jsonText, type));
-                            } else {
-                                Log.e("EntityRESTConsumer", jsonSingleObject.getErrorMessage());
-                                tmpFailed.run(new Exception(jsonSingleObject.getErrorMessage()));
-
-                                return;
-                            }
-                        }
-
-                        onComplete.run(responseList);
-                    } else {
-                        Log.e("EntityRESTConsumer", response.message());
-                        tmpFailed.run(new Exception(response.message()));
-                    }
-                } else {
-                    Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message());
-                    tmpFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
-                }
-            }
-
-            @Override
-            public void onFailure(Call<List<ServiceRESTResponse<JsonObject>>> call, @NonNull final Exception e) {
-                tmpFailed.run(e);
+        executorService.execute(() -> {
+            try {
+                var data = processEntityListSynchronized(entitiesToSave, singleTransaction, type);
+                if (onComplete != null) onComplete.run(data);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java

@@ -79,32 +79,22 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getValues(String codMdep, List<StbGestSetupReader> stbGestSetupList, RunnableArgs<List<StbGestSetupReader>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<StbGestSetupReader> getValuesSynchronized(String codMdep, List<StbGestSetupReader> stbGestSetupList) throws Exception {
         var stbGestSetups = stbGestSetupList.stream().map(x -> (StbGestSetup) x).collect(Collectors.toList());
 
         GestSetupRESTConsumerService service = restBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValues(codMdep, stbGestSetups).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Response<ServiceRESTResponse<List<StbGestSetup>>> response) {
-                analyzeAnswer(response, "GestSetup", data -> {
+        var response = service.getGestSetupValues(codMdep, stbGestSetups)
+                .execute();
+        var data = analyzeAnswer(response, "GestSetup");
+        for (StbGestSetup stbGestSetup : data) {
+            stbGestSetupList.stream().filter(x -> stbGestSetup.getGestName().equalsIgnoreCase(x.getGestName()) &&
+                            stbGestSetup.getSection().equalsIgnoreCase(x.getSection()) &&
+                            stbGestSetup.getKeySection().equalsIgnoreCase(x.getKeySection()))
+                    .findFirst()
+                    .ifPresent(x -> x.setValue(stbGestSetup.getValue()));
+        }
 
-                    for (StbGestSetup stbGestSetup : data) {
-                        stbGestSetupList.stream().filter(x -> stbGestSetup.getGestName().equalsIgnoreCase(x.getGestName()) &&
-                                        stbGestSetup.getSection().equalsIgnoreCase(x.getSection()) &&
-                                        stbGestSetup.getKeySection().equalsIgnoreCase(x.getKeySection()))
-                                .findFirst()
-                                .ifPresent(x -> x.setValue(stbGestSetup.getValue()));
-                    }
-
-                    onComplete.run(stbGestSetupList);
-                }, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<StbGestSetup>>> call, @NonNull final Exception e) {
-                if (onFailed != null) onFailed.run(e);
-            }
-        });
+        return stbGestSetupList;
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java

@@ -5,37 +5,57 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 
 public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
 
-
     private final RESTBuilder restBuilder;
-    private final ExecutorService executorService;
 
-    public GiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+    public GiacenzaPvRESTConsumer(RESTBuilder restBuilder) {
         this.restBuilder = restBuilder;
-        this.executorService = executorService;
     }
 
-
-    public List<GiacenzaPvDTO> retrieveGiacenzeSynchronized(String codMdep) throws Exception {
+    public List<GiacenzaPvDTO> retrieveGiacenzeSynchronized(String codMdep, String codMart) throws Exception {
         GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 120);
-        var response = giacenzaPvRESTConsumerService.retrieve(codMdep)
-                .execute();
+        var response = giacenzaPvRESTConsumerService.retrieve(codMdep, codMart).execute();
 
         var giacenzeList = analyzeAnswer(response, "retrieve-giacenze-pv");
-
         return giacenzeList != null ? giacenzeList : new ArrayList<>();
     }
 
-    public void saveNewVerificaSynchronized(SaveNewVerificaRequestDTO saveNewVerificaRequest) throws Exception {
+    public void saveNewRowSynchronized(SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest) throws Exception {
         GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
-        var response = giacenzaPvRESTConsumerService.saveNewVerifica(saveNewVerificaRequest)
+        var response = giacenzaPvRESTConsumerService.saveNewRowVerifica(saveNewRowVerificaRequest)
                 .execute();
 
-        analyzeAnswer(response, "save-verifica-pv");
+        analyzeAnswer(response, "save-row-verifica-pv");
     }
 
+    public void updateRowSynchronized(UpdateRowVerificaRequestDTO updateRowVerificaRequest) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.updateRowVerifica(updateRowVerificaRequest)
+                .execute();
+
+        analyzeAnswer(response, "update-row-verifica-pv");
+    }
+
+    public void deleteRowSynchronized(DeleteRowVerificaRequestDTO deleteRowVerificaRequest) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.deleteRowVerifica(deleteRowVerificaRequest)
+                .execute();
+
+        analyzeAnswer(response, "delete-row-verifica-pv");
+    }
+
+    public void closeVerifica(CloseVerificaRequestDTO closeVerificaRequestDTO) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.closeVerifica(closeVerificaRequestDTO)
+                .execute();
+
+        analyzeAnswer(response, "close-verifica-pv");
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java

@@ -3,8 +3,11 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -13,10 +16,18 @@ import retrofit2.http.Query;
 
 public interface GiacenzaPvRESTConsumerService {
 
-    @GET("giacenza/retrieve")
-    Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep);
+    @GET("wms/pv/verifica_giacenze/retrieve")
+    Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep, @Query("codMart") String codMart);
 
+    @POST("wms/pv/verifica_giacenze/save_new_row")
+    Call<ServiceRESTResponse<Void>> saveNewRowVerifica(@Body SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest);
 
-    @POST("wms/pv/verifica_giacenze/save_new_verifica")
-    Call<ServiceRESTResponse<Void>> saveNewVerifica(@Body SaveNewVerificaRequestDTO saveNewVerificaRequest);
+    @POST("wms/pv/verifica_giacenze/update_row")
+    Call<ServiceRESTResponse<Void>> updateRowVerifica(@Body UpdateRowVerificaRequestDTO updateRowVerificaRequest);
+
+    @POST("wms/pv/verifica_giacenze/delete_row")
+    Call<ServiceRESTResponse<Void>> deleteRowVerifica(@Body DeleteRowVerificaRequestDTO deleteRowVerificaRequest);
+
+    @POST("wms/pv/verifica_giacenze/close_verifica")
+    Call<ServiceRESTResponse<Void>> closeVerifica(@Body CloseVerificaRequestDTO closeVerificaRequest);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java

@@ -169,27 +169,28 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getInstantItemSituation(String codMdep, String codMart, String partitaMag, String codJcom, RunnableArgs<InstantItemSituationResponseDto> onComplete, RunnableArgs<Exception> onFailed) {
+    public InstantItemSituationResponseDto getInstantItemSituationSynchronized(String codMdep, String codMart, String partitaMag, String codJcom) throws Exception {
         GiacenzaRESTConsumerService giacenzaRESTConsumerService = restBuilder.getService(GiacenzaRESTConsumerService.class);
 
-        giacenzaRESTConsumerService.retrieveInstantItemSituation(codMdep, codMart, partitaMag, codJcom)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, Response<ServiceRESTResponse<InstantItemSituationResponseDto>> response) {
-                        analyzeAnswer(response, "getInstantItemSituation", data -> {
+        var response = giacenzaRESTConsumerService.retrieveInstantItemSituation(codMdep, codMart, partitaMag, codJcom)
+                .execute();
 
-                            fillInstantItemSituationWithMtbAarts(data, onComplete, onFailed);
-                        }, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "getInstantItemSituation");
+        return fillInstantItemSituationWithMtbAartsSynchronized(data);
     }
 
-    private void fillInstantItemSituationWithMtbAarts(InstantItemSituationResponseDto data, RunnableArgs<InstantItemSituationResponseDto> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getInstantItemSituation(String codMdep, String codMart, String partitaMag, String codJcom, RunnableArgs<InstantItemSituationResponseDto> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = getInstantItemSituationSynchronized(codMdep, codMart, partitaMag, codJcom);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    private InstantItemSituationResponseDto fillInstantItemSituationWithMtbAartsSynchronized(InstantItemSituationResponseDto data) throws Exception {
         var inputCodMarts = new ArrayList<String>();
 
         if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
@@ -205,37 +206,33 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
         }
 
         if (inputCodMarts.isEmpty()) {
-            onComplete.run(data);
-            return;
+            return null;
         }
 
-        mArticoloRESTConsumer.getByCodMarts(inputCodMarts, mtbAarts -> {
+        var mtbAarts = mArticoloRESTConsumer.getByCodMartsSynchronized(inputCodMarts);
+        var newMtbAarts = mArticoloRESTConsumer.fillMtbAartsWithMtbUntMisSynchronized(mtbAarts);
 
-            mArticoloRESTConsumer.fillMtbAartsWithMtbUntMis(mtbAarts, newMtbAarts -> {
-                if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
-                    for (var item : data.getIncomingItems()) {
-                        var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
-                                .findFirstOrElse(null);
+        if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
+            for (var item : data.getIncomingItems()) {
+                var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
+                        .findFirstOrElse(null);
 
-                        if (mtbAart != null)
-                            item.setMtbAart(mtbAart);
-                    }
-                }
+                if (mtbAart != null)
+                    item.setMtbAart(mtbAart);
+            }
+        }
 
-                if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
-                    for (var item : data.getAvailableItems()) {
-                        var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
-                                .findFirstOrElse(null);
+        if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
+            for (var item : data.getAvailableItems()) {
+                var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
+                        .findFirstOrElse(null);
 
-                        if (mtbAart != null)
-                            item.setMtbAart(mtbAart);
-                    }
-                }
+                if (mtbAart != null)
+                    item.setMtbAart(mtbAart);
+            }
+        }
 
-                onComplete.run(data);
-            }, onFailed);
-
-        }, onFailed);
+        return data;
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -18,26 +20,31 @@ import retrofit2.Response;
 public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
 
 
+    private final ExecutorService executorService;
     private final RESTBuilder restBuilder;
 
-    public MagazzinoAutomaticoRESTConsumer(RESTBuilder restBuilder) {
+    public MagazzinoAutomaticoRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder) {
+        this.executorService = executorService;
         this.restBuilder = restBuilder;
     }
 
-    public void pickItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void pickItemsSynchronized(MtbDepoPosizione posizione, MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO) throws Exception {
         MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = restBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
-        magazzinoAutomaticoRESTConsumerService.pickItems(posizione.getPosizione(), magazzinoAutomaticoPickItemsRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "magazzino-automatico/pickItems", data -> onComplete.run(), onFailed);
-                    }
+        var response = magazzinoAutomaticoRESTConsumerService.pickItems(posizione.getPosizione(), magazzinoAutomaticoPickItemsRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "magazzino-automatico/pickItems");
+    }
+
+    public void pickItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                pickItemsSynchronized(posizione, magazzinoAutomaticoPickItemsRequestDTO);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
 
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
@@ -8,6 +9,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiRequestDTO;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 
 @Singleton
 public class MaterialiRESTConsumer extends _BaseRESTConsumer {
@@ -20,6 +23,28 @@ public class MaterialiRESTConsumer extends _BaseRESTConsumer {
         this.executorService = executorService;
     }
 
+    public List<HistoryVersamentoProdULRestDTO> makeSynchronousRetrieveLastVersamentiRequest(String codJfas) throws Exception {
+        var materialiRESTConsumerService = restBuilder.getService(MaterialiRESTConsumerService.class);
+
+        var response = materialiRESTConsumerService.retrieveLastVersamenti(codJfas)
+                .execute();
+
+
+        var data = analyzeAnswer(response, "retrieveLastVersamenti");
+        return data;
+    }
+
+    public void makeRetrieveLastVersamentiRequest(String codJfas, final RunnableArgs<List<HistoryVersamentoProdULRestDTO>> onComplete, final RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = makeSynchronousRetrieveLastVersamentiRequest(codJfas);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
     public MtbColt makeSynchronousRecuperaRequest(RecuperaMaterialiRequestDTO request) throws Exception {
         var materialiRESTConsumerService = restBuilder.getService(MaterialiRESTConsumerService.class);
 
@@ -43,4 +68,27 @@ public class MaterialiRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void makeSynchronousVersaRequest(VersaMaterialiRequestDTO request) throws Exception {
+        var materialiRESTConsumerService = restBuilder.getService(MaterialiRESTConsumerService.class);
+
+        var response = materialiRESTConsumerService.versa(request)
+                .execute();
+
+
+        var data = analyzeAnswer(response, "versaMateriali");
+//        if (data == null) return null;
+//        return data.getUpdatedMtbColtScarico();
+    }
+
+    public void makeVersaRequest(VersaMaterialiRequestDTO request, final Runnable onComplete, final RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousVersaRequest(request);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java

@@ -1,14 +1,27 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.List;
+
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiResponseDTO;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface MaterialiRESTConsumerService {
 
+    @POST("wms/materiali/versa")
+    Call<ServiceRESTResponse<VersaMaterialiResponseDTO>> versa(@Body VersaMaterialiRequestDTO request);
+
+    @GET("wms/materiali/retrieveLastVersamenti")
+    Call<ServiceRESTResponse<List<HistoryVersamentoProdULRestDTO>>> retrieveLastVersamenti(@Query("codJfas") String codJfas);
+
     @POST("wms/materiali/recupera")
     Call<ServiceRESTResponse<RecuperaMaterialiResponseDTO>> recupera(@Body RecuperaMaterialiRequestDTO request);
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java

@@ -66,21 +66,14 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getOrdiniLavorazione(String flagEvaso, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<OrdineLavorazioneDTO> getOrdiniLavorazioneSynchronized(String flagEvaso) throws Exception {
         MesRESTConsumerService mesRESTConsumerService = restBuilder.getService(MesRESTConsumerService.class);
 
-        mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
-                        analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
-                    }
+        var response = mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "mes_v2/getOrdiniLavorazione");
+        return data;
     }
 
     public void getLineeProduzione(String codJfasParent, RunnableArgs<List<JtbFasi>> onComplete, RunnableArgs<Exception> onFailed) {

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -4,14 +4,11 @@ import androidx.annotation.NonNull;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
-import com.orhanobut.logger.Logger;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -21,6 +18,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -28,8 +26,7 @@ import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityQuery;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import retrofit2.Call;
@@ -39,12 +36,14 @@ import retrofit2.Response;
 public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
 
-    public OrdiniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+    public OrdiniRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService,SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
     }
@@ -61,7 +60,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
                             for (PickingObjectDTO pickingObjectDTO : pickingObjects) {
                                 for (MtbColt mtbColt : pickingObjectDTO.getMtbColts()) {
-                                    Stream.of(mtbColt.getMtbColr())
+                                    mtbColt.getMtbColr().stream()
                                             .filter(x -> !UtilityString.isNullOrEmpty(x.getPartitaMag()))
                                             .forEach(x -> {
 
@@ -125,28 +124,24 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         this.mEntityRESTConsumer.processEntityList(partitaMag, true, MtbPartitaMag.class, onComplete, onFailed);
     }
 
-    public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs<List<OrdineUscitaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-
+    public List<OrdineUscitaInevasoDTO> getOrdiniInevasiSynchronized(String codMdep, GestioneEnum gestione) throws Exception {
         OrdiniRESTConsumerService service = restBuilder.getService(OrdiniRESTConsumerService.class);
 
-        service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
-                        analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
-                            if (responseDtoList == null) responseDtoList = new ArrayList<>();
-                            onComplete.run(responseDtoList);
-                        }, ex -> {
-                            Logger.e(ex, "Errore durante il caricamento degli ordini di lavorazione");
-                            if (onFailed != null) onFailed.run(ex);
-                        });
-                    }
+        var response = service.getOrdiniInevasi(codMdep, gestione.getText())
+                .execute();
+        var data = analyzeAnswer(response, "getOrdiniInevasi");
+        return  data == null ? new ArrayList<>() : data;
+    }
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, @NonNull final Exception e) {
-                        if (onFailed != null) onFailed.run(e);
-                    }
-                });
+    public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs<List<OrdineUscitaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = getOrdiniInevasiSynchronized(codMdep, gestione);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -182,44 +177,27 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-        String whereCondGestione = "";
+    public List<AlreadyRegisteredUlDTO> getBancaliGiaRegistratiSynchronized(List<? extends OrdineInevasoDTO> orders, int segno) throws Exception {
+        OrdiniRESTConsumerService service = restBuilder.getService(OrdiniRESTConsumerService.class);
 
-        if (gestione != null) {
-            whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " ";
-        } else {
-            whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') ";
-        }
+        var request = new RetrieveAlreadyRegisteredUdsRequestDTO()
+                .setOrdini(orders)
+                .setSegno(segno);
 
-        String baseSql = "SELECT DISTINCT mtb_colt.* " +
-                "FROM mtb_colt " +
-                "       INNER JOIN mtb_colr ON " +
-                "       mtb_colt.gestione = mtb_colr.gestione " +
-                "        AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
-                "        AND mtb_colt.data_collo = mtb_colr.data_collo " +
-                "        AND mtb_colt.num_collo = mtb_colr.num_collo " +
-                " WHERE " + whereCondGestione +
-                "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
-                "  AND mtb_colt.data_doc IS NULL AND ";
+        var response = service.retrieveAlreadyRegisteredUDS(request)
+                .execute();
+        var data = analyzeAnswer(response, "getBancaliGiaRegistrati");
+        return data == null || data.getUdsList() == null ? new ArrayList<>() : data.getUdsList();
+    }
 
-        List<HashMap<String, Object>> whereCondMapList = new ArrayList<>();
-        for (OrdineInevasoDTO ordineInevaso : orders) {
-            HashMap<String, Object> whereCondMap = new HashMap<>();
-            whereCondMap.put("mtb_colr.data_ord", ordineInevaso.getDataOrdD());
-            whereCondMap.put("mtb_colr.num_ord", ordineInevaso.getNumOrd());
-            whereCondMap.put("mtb_colr.gestione", ordineInevaso.getGestione());
-
-            whereCondMapList.add(whereCondMap);
-        }
-
-        baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
-        }.getType();
-        this.mSystemRESTConsumer.<List<MtbColt>>processSql(baseSql, typeOfObjectsList, value -> {
-            if (onComplete != null) onComplete.run(value);
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
+    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, int segno, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = getBancaliGiaRegistratiSynchronized(orders, segno);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
         });
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java

@@ -5,6 +5,8 @@ import java.util.List;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsResponseDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import retrofit2.Call;
@@ -23,4 +25,7 @@ public interface OrdiniRESTConsumerService {
 
     @GET("SM2GetOrdiniVenditaInevasi")
     Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> getOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
+
+    @POST("wms/spedizione/retrieveAlreadyRegisteredUDS")
+    Call<ServiceRESTResponse<RetrieveAlreadyRegisteredUdsResponseDTO>> retrieveAlreadyRegisteredUDS(@Body RetrieveAlreadyRegisteredUdsRequestDTO request);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java

@@ -1,12 +1,11 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import androidx.annotation.NonNull;
-
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -14,44 +13,33 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
-import retrofit2.Call;
-import retrofit2.Response;
 
 @Singleton
 public class PosizioniRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
     private final SystemRESTConsumer mSystemRESTConsumer;
+    private final ExecutorService executorService;
 
-    public PosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+    public PosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, ExecutorService executorService) {
         this.restBuilder = restBuilder;
         this.mSystemRESTConsumer = systemRESTConsumer;
+        this.executorService = executorService;
     }
 
-    public void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbDepoPosizione> getAvailablePosizioniSynchronized() throws Exception {
         String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = restBuilder.getService(PosizioniRESTConsumerService.class);
-        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, Response<ServiceRESTResponse<List<MtbDepoPosizione>>> response) {
-                analyzeAnswer(response, "getAvailablePosizioni", (m) -> {
-                    onComplete.run(response.body().getDto());
-                }, onFailed);
-            }
+        var response = posizioniRESTConsumerService.getAvailablePosizioni(codMdep)
+                .execute();
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, @NonNull final Exception e) {
-                onFailed.run(e);
-            }
-        });
+        var data = analyzeAnswer(response, "getAvailablePosizioni");
+        return response.body().getDto();
     }
 
-
-    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public ArrayList<MtbColt> getBancaliInPosizioneSynchronized(MtbDepoPosizione mtbDepoPosizione) throws Exception {
         String sql = "SELECT * FROM mtb_colt " +
                 "WHERE segno > 0 " +
                 "AND cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " " +
@@ -61,10 +49,18 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer {
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
         }.getType();
 
-        mSystemRESTConsumer.<ArrayList<MtbColt>>processSql(sql, typeOfObjectsList, value -> {
-            if (onComplete != null) onComplete.run(value);
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
+        var value = mSystemRESTConsumer.<ArrayList<MtbColt>>processSqlSynchronized(sql, typeOfObjectsList);
+        return value;
+    }
+
+    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = getBancaliInPosizioneSynchronized(mtbDepoPosizione);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
         });
 
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -123,27 +123,15 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         printReportType(reportType, codMdep, null, params, onComplete, onFailed);
     }
 
-    public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void printClosedOrdersSynchronized(PrintOrderCloseDTO dto, String codMdep) throws Exception {
         if (BuildConfig.DEBUG) {
-            onComplete.run();
-            return;
+//            return;
         }
 
         PrinterRESTConsumerService printerService = restBuilder.getService(PrinterRESTConsumerService.class, 240);
-        Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);
-        callable.enqueue(new ManagedErrorCallback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                analyzeAnswer(response, "printCollo", data -> {
-                    onComplete.run();
-                }, onFailed);
-            }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
-                onFailed.run(e);
-            }
-        });
+        var response = printerService.printClosedOrders(codMdep, dto).execute();
+        analyzeAnswer(response, "printCollo");
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java

@@ -1,8 +1,5 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import android.text.TextUtils;
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
@@ -17,8 +14,6 @@ import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -27,9 +22,7 @@ import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
 import retrofit2.Response;
 
@@ -89,6 +82,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public List<AvailableCodMdepsDTO> getAvailableCodMdepsSynchronized() throws Exception {
+        SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
+        var response = service.getAvailableCodMdeps().execute();
+        return analyzeAnswer(response, "CodMdepsAvailable");
+    }
 
     public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
         SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
@@ -105,36 +103,6 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
-    public void sendErrorLogMail(String message, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : " [" + SettingsManager.i().getUserSession().getProfileDB() + "]";
-
-        String dest = "";
-        if (BuildConfig.DEBUG) {
-            dest = TextUtils.join(";", CommonConst.Mail.forErrorsDebug);
-        } else {
-            dest = TextUtils.join(";", CommonConst.Mail.forErrors);
-        }
-
-
-        MailRequestDTO mailDTO = new MailRequestDTO()
-                .setFrom("sender@integry.it")
-                .setFromName((BuildConfig.DEBUG ? "[DEBUG] " : "") + "WMS Android")
-                .setTo(dest)
-                .setSubject("Bug notification" + currentAzienda)
-                .setMsgText(message)
-                .setHtml(true);
-
-        sendMail(mailDTO, () -> {
-            if (onComplete != null) onComplete.run();
-        }, ex -> {
-            Log.e(SystemRESTConsumer.class.getName(), "", ex);
-            if (onFailed != null) onFailed.run(ex);
-        });
-    }
-
-
     public void sendMailSynchronized(MailRequestDTO mailDTO) throws Exception {
         SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
         var response = service.sendMail(mailDTO).execute();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliScaricoRESTConsumerInterface.java

@@ -12,13 +12,23 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 
 public interface ColliScaricoRESTConsumerInterface {
 
+    MtbColt createUDSSynchronized(CreateUDSRequestDTO createUDSRequestDTO) throws Exception;
+
     void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed);
 
+    CloseUDSResponseDTO closeUDSSynchronized(CloseUDSRequestDTO closeUDSRequestDTO) throws Exception;
+
     void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed);
 
+    MtbColr insertUDSRowSynchronized(InsertUDSRowRequestDTO insertUDSRowRequestDTO) throws Exception;
+
     void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
+    MtbColr editUDSRowSynchronized(EditUDSRowRequestDTO editUDSRowRequestDTO) throws Exception;
+
     void editUDSRow(EditUDSRowRequestDTO editUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
+    void deleteUDSRowSynchronized(DeleteUDSRowRequestDTO deleteUDSRequestDTO) throws Exception;
+
     void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MutableLiveDataDeserializer.java

@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.rest.deserializer;
+
+import androidx.lifecycle.MutableLiveData;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+public class MutableLiveDataDeserializer implements JsonDeserializer<MutableLiveData<?>> {
+    @Override
+    public MutableLiveData<?> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        Type type = ((ParameterizedType) typeOfT).getActualTypeArguments()[0];
+        MutableLiveData<Object> liveData = new MutableLiveData<>();
+        liveData.setValue(context.deserialize(json, type));
+        return liveData;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java

@@ -1,8 +1,13 @@
 package it.integry.integrywmsnative.core.rest.model;
 
+import com.google.gson.annotations.SerializedName;
+
 public class AvailableCodMdepsDTO {
 
+    @SerializedName("codMdep")
     private String codMdep;
+
+    @SerializedName("descrizione")
     private String descrizione;
 
     public String getCodMdep() {

app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdatePosizioneULRequestDTO.java

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class UpdatePosizioneULRequestDTO {
+
+    private MtbColt mtbColt;
+    private String posizione;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public UpdatePosizioneULRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public UpdatePosizioneULRequestDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/VersaMaterialiRequestDTO.java

@@ -0,0 +1,110 @@
+package it.integry.integrywmsnative.core.rest.model.materiali;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+public class VersaMaterialiRequestDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private BigDecimal numCnf;
+    private BigDecimal qtaCnf;
+    private BigDecimal qtaTot;
+
+    private Integer numCollo;
+    private LocalDate dataCollo;
+    private String gestione;
+    private String serCollo;
+    private String barcodeUl;
+
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public VersaMaterialiRequestDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public VersaMaterialiRequestDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public VersaMaterialiRequestDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public VersaMaterialiRequestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaTot() {
+        return qtaTot;
+    }
+
+    public VersaMaterialiRequestDTO setQtaTot(BigDecimal qtaTot) {
+        this.qtaTot = qtaTot;
+        return this;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public VersaMaterialiRequestDTO setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+        return this;
+    }
+
+    public LocalDate getDataCollo() {
+        return dataCollo;
+    }
+
+    public VersaMaterialiRequestDTO setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = dataCollo;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public VersaMaterialiRequestDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public VersaMaterialiRequestDTO setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+        return this;
+    }
+
+    public String getBarcodeUl() {
+        return barcodeUl;
+    }
+
+    public VersaMaterialiRequestDTO setBarcodeUl(String barcodeUl) {
+        this.barcodeUl = barcodeUl;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/VersaMaterialiResponseDTO.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.rest.model.materiali;
+
+public class VersaMaterialiResponseDTO {
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/CloseVerificaRequestDTO.java

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class CloseVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public CloseVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public CloseVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/DeleteRowVerificaRequestDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class DeleteRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public DeleteRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public DeleteRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public DeleteRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewRowVerificaRequestDTO.java

@@ -0,0 +1,38 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class SaveNewRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public SaveNewRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public SaveNewRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public SaveNewRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java

@@ -1,15 +0,0 @@
-package it.integry.integrywmsnative.core.rest.model.pv;
-
-public class SaveNewVerificaRequestDTO {
-
-    private VerificaGiacenzeDTO data;
-
-    public VerificaGiacenzeDTO getData() {
-        return data;
-    }
-
-    public SaveNewVerificaRequestDTO setData(VerificaGiacenzeDTO data) {
-        this.data = data;
-        return this;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/UpdateRowVerificaRequestDTO.java

@@ -0,0 +1,38 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class UpdateRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public UpdateRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public UpdateRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public UpdateRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsRequestDTO.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+
+public class RetrieveAlreadyRegisteredUdsRequestDTO {
+
+    private List<? extends OrdineInevasoDTO> ordini;
+    private int segno;
+
+    public List<? extends OrdineInevasoDTO> getOrdini() {
+        return ordini;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setOrdini(List<? extends OrdineInevasoDTO> ordini) {
+        this.ordini = ordini;
+        return this;
+    }
+
+    public int getSegno() {
+        return segno;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setSegno(int segno) {
+        this.segno = segno;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsResponseDTO.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
+
+public class RetrieveAlreadyRegisteredUdsResponseDTO {
+
+    private List<AlreadyRegisteredUlDTO> udsList;
+
+    public List<AlreadyRegisteredUlDTO> getUdsList() {
+        return udsList;
+    }
+
+    public RetrieveAlreadyRegisteredUdsResponseDTO setUdsList(List<AlreadyRegisteredUlDTO> udsList) {
+        this.udsList = udsList;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/MutableLiveDataSerializer.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import androidx.lifecycle.MutableLiveData;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+public class MutableLiveDataSerializer implements JsonSerializer<MutableLiveData<?>> {
+    @Override
+    public JsonElement serialize(MutableLiveData<?> src, Type typeOfSrc, JsonSerializationContext context) {
+        return context.serialize(src.getValue());
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java

@@ -12,7 +12,11 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class ServerStatusChecker {
 
-    private static final ServerStatusChecker instance = new ServerStatusChecker();
+
+    private final Handler handler;
+
+
+
 
     private final List<RunnableArgs<Boolean>> mCallback = new ArrayList<>();
 
@@ -26,7 +30,29 @@ public class ServerStatusChecker {
     private final long MILLIS_DELAY = 5 * 1000;
 
 
-    private final Handler handler = new Handler();
+    public ServerStatusChecker(Handler handler) {
+        this.handler = handler;
+    }
+
+    public void addCallback(RunnableArgs<Boolean> callback) {
+        this.mCallback.add(callback);
+    }
+
+    public void removeCallback(RunnableArgs<Boolean> callback) {
+        this.mCallback.remove(callback);
+    }
+
+
+    public void init() {
+        this.shouldExecute = true;
+
+        this.handler.post(this.runnableCode);
+    }
+
+    public void dispose() {
+        this.shouldExecute = false;
+    }
+
     private final Runnable runnableCode = new Runnable() {
         @Override
         public void run() {
@@ -42,27 +68,4 @@ public class ServerStatusChecker {
         }
     };
 
-    public void addCallback(RunnableArgs<Boolean> callback) {
-        this.mCallback.add(callback);
-    }
-
-    public void removeCallback(RunnableArgs<Boolean> callback) {
-        this.mCallback.remove(callback);
-    }
-
-
-    public static void init() {
-        instance.shouldExecute = true;
-
-        instance.handler.post(instance.runnableCode);
-    }
-
-    public static void dispose() {
-        instance.shouldExecute = false;
-    }
-
-    public static ServerStatusChecker getInstance() {
-        return instance;
-    }
-
 }

app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java

@@ -16,7 +16,6 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 @Singleton
 public class InventarioService {
@@ -48,7 +47,7 @@ public class InventarioService {
         MtbColt mtbColt = new MtbColt();
 
         mtbColt.setGestione(inventario.getGestione());
-        mtbColt.setDataCollo(UtilityDate.toDate(inventario.getDataCollo()));
+        mtbColt.setDataCollo(inventario.getDataCollo());
         mtbColt.setSerCollo(inventario.getSerCollo());
         mtbColt.setNumCollo(inventario.getNumCollo());
         mtbColt.setSegno(inventario.getSegno());
@@ -71,7 +70,7 @@ public class InventarioService {
         MtbColr mtbColr = new MtbColr();
 
         mtbColr.setGestione(inventario.getGestione());
-        mtbColr.setDataCollo(UtilityDate.toDate(inventario.getDataCollo()));
+        mtbColr.setDataCollo(inventario.getDataCollo());
         mtbColr.setSerCollo(inventario.getSerCollo());
         mtbColr.setNumCollo(inventario.getNumCollo());
         mtbColr.setCodMart(inventario.getCodMart());

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -96,6 +96,12 @@ public class DBSettingsModel {
     private boolean flagEnableArtCreation;
     private List<String> allowedCodMgrpForArtCreation;
     private boolean flagAccettazioneGroupListForn = false;
+    private boolean flagSpedizioneEnableFastPicking = false;
+    private boolean flagAccettazioneBollaEditableQtaTot = true;
+    private boolean flagViewSwitchDepoButton = true;
+    private boolean flagProduzioneSkipAskVersamentoAutomatico;
+    private boolean flagAccettazioneViewLotto = false;
+    private boolean flagAccettazioneBollaMarkReceived = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -806,4 +812,55 @@ public class DBSettingsModel {
     public void setFlagAccettazioneGroupListForn(boolean flagAccettazioneGroupListForn) {
         this.flagAccettazioneGroupListForn = flagAccettazioneGroupListForn;
     }
+
+    public boolean isFlagSpedizioneEnableFastPicking() {
+        return flagSpedizioneEnableFastPicking;
+    }
+
+    public void setFlagSpedizioneEnableFastPicking(boolean flagSpedizioneEnableFastPicking) {
+        this.flagSpedizioneEnableFastPicking = flagSpedizioneEnableFastPicking;
+    }
+
+    public boolean isFlagAccettazioneBollaEditableQtaTot() {
+        return flagAccettazioneBollaEditableQtaTot;
+    }
+
+    public void setFlagAccettazioneBollaEditableQtaTot(boolean flagAccettazioneBollaEditableQtaTot) {
+        this.flagAccettazioneBollaEditableQtaTot = flagAccettazioneBollaEditableQtaTot;
+    }
+
+    public boolean isFlagViewSwitchDepoButton() {
+        return flagViewSwitchDepoButton;
+    }
+
+    public void setFlagViewSwitchDepoButton(boolean flagViewSwitchDepoButton) {
+        this.flagViewSwitchDepoButton = flagViewSwitchDepoButton;
+    }
+
+    public boolean isFlagProduzioneSkipAskVersamentoAutomatico() {
+        return flagProduzioneSkipAskVersamentoAutomatico;
+    }
+
+    public DBSettingsModel setFlagProduzioneSkipAskVersamentoAutomatico(boolean flagProduzioneSkipAskVersamentoAutomatico) {
+        this.flagProduzioneSkipAskVersamentoAutomatico = flagProduzioneSkipAskVersamentoAutomatico;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneViewLotto() {
+        return flagAccettazioneViewLotto;
+    }
+
+    public DBSettingsModel setFlagAccettazioneViewLotto(boolean flagAccettazioneViewLotto) {
+        this.flagAccettazioneViewLotto = flagAccettazioneViewLotto;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneBollaMarkReceived() {
+        return flagAccettazioneBollaMarkReceived;
+    }
+
+    public DBSettingsModel setFlagAccettazioneBollaMarkReceived(boolean flagAccettazioneBollaMarkReceived) {
+        this.flagAccettazioneBollaMarkReceived = flagAccettazioneBollaMarkReceived;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -39,8 +39,6 @@ public class SettingsManager {
     private static SettingsModel settingsModelIstance;
     private static DBSettingsModel dbSettingsModelIstance;
 
-    private static boolean firstStart = false;
-
     private static Context mContext;
     private static SystemRESTConsumer mSystemRESTConsumer;
     private static ImballiRESTConsumer mImballiRESTConsumer;
@@ -65,15 +63,15 @@ public class SettingsManager {
     public void init() {
         settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
 
-        if (settingsModelIstance == null) {
+        if (settingsModelIstance == null)
             settingsModelIstance = new SettingsModel();
 
+
+        if (settingsModelIstance.getServer() == null)
             settingsModelIstance.setServer(new SettingsModel.Server());
-            firstStart = true;
-        }
+
 
         dbSettingsModelIstance = new DBSettingsModel();
-
     }
 
     public SettingsModel getSettings() {
@@ -89,10 +87,6 @@ public class SettingsManager {
         return dbSettingsModelIstance;
     }
 
-    public static boolean isFirstStart() {
-        return firstStart;
-    }
-
     public static boolean isInstanceAvailable() {
         return i() != null;
     }
@@ -102,136 +96,111 @@ public class SettingsManager {
     }
 
 
-    public static void loadDBVariables(RunnableArgs<String> onProgress, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public static void loadDBVariables(RunnableArgs<String> onProgress) throws Exception {
         dbSettingsModelIstance = new DBSettingsModel();
 
         Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_vars");
         perfTrace.start();
 
-        Runnable tmpOnComplete = () -> {
-            perfTrace.stop();
-            onComplete.run();
-        };
-
-        RunnableArgs<Exception> tmpOnFailed = ex -> {
-            UtilityLogger.error(ex);
-            perfTrace.putAttribute("failed", "true");
-            if (!(ex instanceof SocketTimeoutException)) onFailed.run(ex);
-            else
-                onFailed.run(new Exception("Errore durante il caricamento dei dati. Riavviare l'applicazione!"));
-        };
-
-
-        onProgress.run("depositi");
-        loadAvailableCodMdeps(() -> {
+        try {
+            onProgress.run("depositi");
+            loadAvailableCodMdeps();
 
             onProgress.run("posizioni");
-            loadAvailablePosizioni(() -> {
+            loadAvailablePosizioni();
 
-                onProgress.run("impostazioni");
-                loadGestSetupValues(() -> {
 
-                    onProgress.run("dati azienda");
-                    loadDatiAzienda(() -> {
+            onProgress.run("impostazioni");
+            loadGestSetupValues();
 
-                        loadTipiCollo(tmpOnComplete, tmpOnFailed);
 
-                    }, tmpOnFailed);
-                }, tmpOnFailed);
-            }, tmpOnFailed);
-        }, tmpOnFailed);
+            onProgress.run("dati azienda");
+            loadDatiAzienda();
+            loadTipiCollo();
+
+            perfTrace.stop();
+
+        } catch (Exception ex) {
+            UtilityLogger.error(ex);
+            perfTrace.putAttribute("failed", "true");
+
+            if (!(ex instanceof SocketTimeoutException))
+                throw ex;
+            else
+                throw new Exception("Errore durante il caricamento dei dati. Riavviare l'applicazione!");
+        }
     }
 
-    private static void loadTipiCollo(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiColloUl -> {
-            mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UI, tipiColloUi -> {
+    private static void loadTipiCollo() throws Exception {
+        var tipiColloUl = mImballiRESTConsumer.retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum.UL);
+        var tipiColloUi = mImballiRESTConsumer.retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum.UI);
 
-                var imballiList = new ObservableArrayList<ObservableMtbTcol>();
-                imballiList.addAll(tipiColloUi);
-                imballiList.addAll(tipiColloUl);
+        var imballiList = new ObservableArrayList<ObservableMtbTcol>();
 
-                SettingsManager.iDB().setInternalImballi(imballiList);
-                onComplete.run();
-            }, onFailed);
-        }, onFailed);
+        imballiList.addAll(tipiColloUi);
+        imballiList.addAll(tipiColloUl);
 
+        SettingsManager.iDB().setInternalImballi(imballiList);
     }
 
-    private static void loadDatiAzienda(Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    private static void loadDatiAzienda() throws Exception {
 
-        mAziendaRESTConsumer.retrieveAzienda(datiAzienda -> {
-            SettingsManager.iDB().setDatiAzienda(datiAzienda);
+        var datiAzienda = mAziendaRESTConsumer.retrieveAziendaSynchronized();
 
-            if (!SettingsManager.iDB().isFlagUseCodAnagAziendale()) {
-                onComplete.run();
-                return;
-            }
+        SettingsManager.iDB().setDatiAzienda(datiAzienda);
 
-            String internalCodAnagsQuery = "SELECT ga.cod_anag,\n" +
-                    "       CAST(CASE WHEN vc.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_cliente,\n" +
-                    "       CAST(CASE WHEN af.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_fornitore\n" +
-                    "FROM azienda\n" +
-                    "INNER JOIN gtb_anag ga on azienda.part_iva = ga.part_iva\n" +
-                    "LEFT OUTER JOIN vtb_clie vc on ga.cod_anag = vc.cod_anag AND vc.flag_stato = 'A'\n" +
-                    "LEFT OUTER JOIN atb_forn af on ga.cod_anag = af.cod_anag AND af.flag_stato = 'A'";
+        if (!SettingsManager.iDB().isFlagUseCodAnagAziendale()) {
+            return;
+        }
 
-            Type type = new TypeToken<List<InternalCodAnagsDTO>>() {
-            }.getType();
-            mSystemRESTConsumer.<List<InternalCodAnagsDTO>>processSql(internalCodAnagsQuery, type, internalCodAnagsList -> {
-                SettingsManager.iDB().setInternalCodAnags(internalCodAnagsList);
+        String internalCodAnagsQuery = "SELECT ga.cod_anag,\n" +
+                "       CAST(CASE WHEN vc.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_cliente,\n" +
+                "       CAST(CASE WHEN af.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_fornitore\n" +
+                "FROM azienda\n" +
+                "INNER JOIN gtb_anag ga on azienda.part_iva = ga.part_iva\n" +
+                "LEFT OUTER JOIN vtb_clie vc on ga.cod_anag = vc.cod_anag AND vc.flag_stato = 'A'\n" +
+                "LEFT OUTER JOIN atb_forn af on ga.cod_anag = af.cod_anag AND af.flag_stato = 'A'";
 
-                if (onComplete != null) onComplete.run();
-            }, onFailed);
-
-        }, onFailed);
+        Type type = new TypeToken<List<InternalCodAnagsDTO>>() {
+        }.getType();
+        var internalCodAnagsList = mSystemRESTConsumer.<List<InternalCodAnagsDTO>>processSqlSynchronized(internalCodAnagsQuery, type);
+        SettingsManager.iDB().setInternalCodAnags(internalCodAnagsList);
     }
 
-    private static void loadAvailableCodMdeps(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
-            dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
+    private static void loadAvailableCodMdeps() throws Exception {
+        var availableCodMdeps = mSystemRESTConsumer.getAvailableCodMdepsSynchronized();
 
-            if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
-                onFailed.run(new Exception(mContext.getText(R.string.no_codmdep_available).toString()));
-                return;
-            }
+        dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
 
-            boolean codMdepExistsAnymore = false;
+        if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
+            throw new Exception(mContext.getText(R.string.no_codmdep_available).toString());
+        }
 
-            if (settingsModelIstance.getUserSession().getDepo() != null) {
-                for (AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps) {
-                    //Controllo se il codMdep salvato esiste ancora
-                    if (availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) {
-                        codMdepExistsAnymore = true;
-                        break;
-                    }
+        boolean codMdepExistsAnymore = false;
+
+        if (settingsModelIstance.getUserSession().getDepo() != null) {
+            for (AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps) {
+                //Controllo se il codMdep salvato esiste ancora
+                if (availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) {
+                    codMdepExistsAnymore = true;
+                    break;
                 }
             }
+        }
 
-            if (!codMdepExistsAnymore) {
-                settingsModelIstance.getUserSession().setDepo(availableCodMdeps.get(0));
-            }
-
-            if (onComplete != null) onComplete.run();
-        }, ex -> {
-            //BOH
-            if (onFailed != null) onFailed.run(ex);
-        });
+        if (!codMdepExistsAnymore) {
+            settingsModelIstance.getUserSession().setDepo(availableCodMdeps.get(0));
+        }
     }
 
 
-    private static void loadAvailablePosizioni(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        mPosizioniRESTConsumer.getAvailablePosizioni(availablePosizioni -> {
-                    dbSettingsModelIstance.setAvailablePosizioni(availablePosizioni);
-
-                    if (onComplete != null) onComplete.run();
-                }, ex -> {
-                    if (onFailed != null) onFailed.run(ex);
-                }
-        );
+    private static void loadAvailablePosizioni() throws Exception {
+        var availablePosizioni = mPosizioniRESTConsumer.getAvailablePosizioniSynchronized();
+        dbSettingsModelIstance.setAvailablePosizioni(availablePosizioni);
     }
 
 
-    private static void loadGestSetupValues(Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    private static void loadGestSetupValues() throws Exception {
 
         List<StbGestSetupReader> stbGestSetupReaderList = new ArrayList<>();
 
@@ -285,6 +254,11 @@ public class SettingsManager {
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_DELETE_ROW_ON_CLOSE")
                 .setSetter(dbSettingsModelIstance::setFlagAccettazioneDeleteRowOnClose));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_VIEW_LOTTO")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneViewLotto));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -332,6 +306,12 @@ public class SettingsManager {
                 .setSection("PRODUZIONE")
                 .setKeySection("VIEW_POSIZIONI")
                 .setSetter(dbSettingsModelIstance::setViewPosizioni));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_SKIP_ASK_VERSAMENTO_AUTOMATICO")
+                .setSetter(dbSettingsModelIstance::setFlagProduzioneSkipAskVersamentoAutomatico)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -505,6 +485,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_ASK_PRINT_UL")
                 .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAskPrintUl)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE_BOLLA")
+                .setKeySection("FLAG_ENABLE_MARK_RECEIVED")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaMarkReceived)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
@@ -583,6 +569,18 @@ public class SettingsManager {
                 .setKeySection("ENABLE_POSITION_CHANGE_REQUEST")
                 .setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest)
                 .setDefaultValue(true));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .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")
@@ -636,6 +634,13 @@ public class SettingsManager {
                 .setKeySection("ENABLE_ART_CREATION")
                 .setSetter(dbSettingsModelIstance::setFlagEnableArtCreation));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("VIEW_SWITCH_DEPO_BUTTON")
+                .setSetter(dbSettingsModelIstance::setFlagViewSwitchDepoButton)
+        );
+
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("SETUP")
@@ -648,34 +653,33 @@ public class SettingsManager {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
 
-        mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupReaderList, list -> {
+        var list = mGestSetupRESTConsumer.getValuesSynchronized(codMdep, stbGestSetupReaderList);
 
-            for (var stbGestSetupReader : list) {
-                var value = stbGestSetupReader.getValue();
-                var clazz = stbGestSetupReader.getClazz();
 
-                Object finalValue = null;
-                if (value != null) {
-                    if (clazz == String.class) {
-                        finalValue = clazz.cast(value);
-                    } else if (clazz == Boolean.class) {
-                        finalValue = clazz.cast("S".equalsIgnoreCase(value));
-                    } else if (clazz == Integer.class && value != null) {
-                        finalValue = clazz.cast(Integer.parseInt(value));
-                    }
-                } else if (stbGestSetupReader.getDefaultValue() == null) {
-                    if (clazz == Boolean.class) {
-                        finalValue = clazz.cast(Boolean.FALSE);
-                    } else if (clazz == Integer.class) {
-                        finalValue = clazz.cast(0);
-                    }
-                } else finalValue = stbGestSetupReader.getDefaultValue();
+        for (var stbGestSetupReader : list) {
+            var value = stbGestSetupReader.getValue();
+            var clazz = stbGestSetupReader.getClazz();
 
-                stbGestSetupReader.getSetter().run(finalValue);
-            }
+            Object finalValue = null;
+            if (value != null) {
+                if (clazz == String.class) {
+                    finalValue = clazz.cast(value);
+                } else if (clazz == Boolean.class) {
+                    finalValue = clazz.cast("S".equalsIgnoreCase(value));
+                } else if (clazz == Integer.class && value != null) {
+                    finalValue = clazz.cast(Integer.parseInt(value));
+                }
+            } else if (stbGestSetupReader.getDefaultValue() == null) {
+                if (clazz == Boolean.class) {
+                    finalValue = clazz.cast(Boolean.FALSE);
+                } else if (clazz == Integer.class) {
+                    finalValue = clazz.cast(0);
+                }
+            } else finalValue = stbGestSetupReader.getDefaultValue();
+
+            stbGestSetupReader.getSetter().run(finalValue);
+        }
 
-            if (onComplete != null) onComplete.run();
-        }, onFailed);
 
     }
 

app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java

@@ -7,18 +7,22 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
+import android.text.Html;
+import android.util.Log;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
+
 import java.io.File;
-import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.helper.ContextHelper;
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -26,11 +30,14 @@ import it.integry.integrywmsnative.core.utility.FileDownloader;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableView;
 
 @Singleton
 public class UpdatesManager {
 
+    private static final String TAG = "UpdatesManager";
+
     private final ExecutorService executorService;
     private final Handler handler;
     private final SystemRESTConsumer systemRESTConsumer;
@@ -41,109 +48,149 @@ public class UpdatesManager {
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
-    public void executeCheck(Context context, boolean forceReinstall) {
-
+    public void executeCheck(@NonNull Context context, @NonNull FragmentManager fragmentManager, boolean forceReinstall) {
         executorService.execute(() -> {
-
             try {
-                final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
-                        (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "") + "/ems-api/";
-
                 SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-                var betaEnabled = sharedPreferences.getBoolean(MainSettingsFragment.KEY_BUTTON_ENABLE_BETA, false);
+                boolean betaEnabled = sharedPreferences.getBoolean(MainSettingsFragment.KEY_BUTTON_ENABLE_BETA, false);
 
                 LatestAppVersionInfoDTO latestData = systemRESTConsumer.retrieveUpdatesInfoSynchronized(betaEnabled);
 
-                if (latestData == null)
+                if (latestData == null) {
+                    Log.d(TAG, "No update information received from server.");
                     return;
+                }
 
-                if (latestData.getLatestVersionCode() < BuildConfig.VERSION_CODE)
+                boolean isUpdateRequired = latestData.getLatestVersionCode() > BuildConfig.VERSION_CODE;
+                boolean currentVersionIsBeta = BuildConfig.VERSION_NAME.toLowerCase().contains("beta");
+                boolean isChannelSwitch = currentVersionIsBeta != betaEnabled;
+
+                if (!isUpdateRequired && !forceReinstall && !isChannelSwitch) {
+                    Log.d(TAG, "App is up to date.");
                     return;
+                }
 
-                boolean currentVersionIsBeta = BuildConfig.VERSION_NAME.contains("beta");
-
-                if(!forceReinstall && currentVersionIsBeta == betaEnabled && latestData.getLatestVersionCode() == BuildConfig.VERSION_CODE)
-                    return;
-
-                //Se sto passando da una beta a una stable e viceversa non obbligo l'utente a fare l'aggiornamento
-                if(currentVersionIsBeta != betaEnabled || forceReinstall) {
+                // Se si passa da beta a stabile (o viceversa) o se è una reinstallazione forzata,
+                // l'aggiornamento non deve essere obbligatorio per non bloccare l'utente.
+                if (isChannelSwitch || forceReinstall) {
                     latestData.setForced(false);
                 }
 
-                String currentDownloadUrl = baseEndpoint + latestData.getUrl();
+                final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
+                        (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "") + "/ems-api/";
+                String downloadUrl = baseEndpoint + latestData.getUrl();
 
-                showDialog(context, latestData, () -> {
-                    installAPK(context, currentDownloadUrl);
-                });
+                handler.post(() -> showUpdateAvailableDialog(context, fragmentManager, latestData, downloadUrl));
 
             } catch (Exception e) {
-                handler.post(() -> {
-                    UtilityExceptions.defaultException(context, e);
-                });
+                Log.e(TAG, "Error during update check", e);
+                // Se il check fallisce, non è un errore bloccante. L'utente può continuare a usare l'app.
             }
         });
     }
 
-    private void showDialog(Context context, LatestAppVersionInfoDTO updatesData, Runnable onUpdateStart) {
-        DialogUpdateAvailableView.newInstance(updatesData, onUpdateStart)
-                .show(((FragmentActivity)context).getSupportFragmentManager(), "dialog-updates");
+    private void showUpdateAvailableDialog(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull LatestAppVersionInfoDTO updatesData, @NonNull String downloadUrl) {
+        DialogUpdateAvailableView dialog = DialogUpdateAvailableView.newInstance(updatesData, () -> {
+            // L'utente ha accettato di aggiornare
+            downloadAndInstall(context, fragmentManager, downloadUrl, updatesData.isForced());
+        });
+
+        if (updatesData.isForced()) {
+            dialog.setCancelable(false);
+        }
+
+        dialog.show(fragmentManager, "dialog-updates");
     }
 
-    private void installAPK(Context context, String downloadURL) {
-
-        File destination = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-
-        var progressDialogBuilder = new DialogProgressView("Download", null, false);
-        progressDialogBuilder.show(Objects.requireNonNull(ContextHelper.getFragmentManagerFromContext(context)), "tag");
-
-
-        var fileDownloader = new FileDownloader()
-                .setDestFolder(destination)
-                .setUrlString(downloadURL)
-                .setOnProgressUpdate(progress -> {
-                    handler.post(() -> {
-                        progressDialogBuilder.setProgress(progress);
-                    });
-                })
-                .setOnDownloadCompleted(destPath -> {
-
-                    handler.post(() -> {
-                        progressDialogBuilder.dismiss();
-
-                        if (!destination.exists()) {
-                            UtilityExceptions.defaultException(context, new Exception("Errore durante il download dell'aggiornamento"));
-                            return;
-                        }
-
-                        Uri fileLoc;
-                        Intent intent;
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                            intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-                            fileLoc = GenericFileProvider.getUriForFile(context,
-                                    context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
-                                    destPath);
-                        } else {
-                            intent = new Intent(Intent.ACTION_VIEW);
-                            fileLoc = Uri.fromFile(destPath);
-                        }
-
-                        intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
-                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-                        context.startActivity(intent);
-                    });
-
-                });
+    private void downloadAndInstall(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull String downloadUrl, boolean isForced) {
+        DialogProgressView progressDialog = new DialogProgressView("Download", null, false);
+        if (isForced) {
+            progressDialog.setCancelable(false);
+        }
+        progressDialog.show(fragmentManager, "progress-dialog");
 
+        FileDownloader fileDownloader = new FileDownloader()
+                .setExecutorService(executorService)
+                .setDestFolder(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS))
+                .setUrlString(downloadUrl)
+                .setOnProgressUpdate(progress -> handler.post(() -> progressDialog.setProgress(progress)));
 
         executorService.execute(() -> {
             try {
-                fileDownloader.download();
+                File apkFile = fileDownloader.download();
+                handler.post(() -> {
+                    progressDialog.dismiss();
+                    installApk(context, fragmentManager, apkFile, isForced);
+                });
             } catch (Exception e) {
-                progressDialogBuilder.dismissAllowingStateLoss();
-                UtilityExceptions.defaultException(context, e);
+                Log.e(TAG, "Download failed", e);
+                handler.post(() -> {
+                    progressDialog.dismissAllowingStateLoss();
+                    handleUpdateError(fragmentManager, e, isForced);
+                });
             }
         });
     }
+
+    private void installApk(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull File apkFile, boolean isForced) {
+        if (!apkFile.exists()) {
+            handleUpdateError(fragmentManager, new Exception("File APK non trovato dopo il download."), isForced);
+            return;
+        }
+
+        Uri fileUri;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            fileUri = GenericFileProvider.getUriForFile(context,
+                    context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
+                    apkFile);
+        } else {
+            fileUri = Uri.fromFile(apkFile);
+        }
+
+        Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+        intent.setDataAndType(fileUri, "application/vnd.android.package-archive");
+        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        try {
+            context.startActivity(intent);
+            // Se l'aggiornamento è forzato, l'app si chiuderà per attendere l'installazione manuale.
+            if (isForced) {
+                // Diamo tempo all'utente di vedere l'installer di sistema prima di chiudere l'app.
+                handler.postDelayed(MainApplication::exit, 1000);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to start APK installation", e);
+            handleUpdateError(fragmentManager, e, isForced);
+        }
+    }
+
+    private void handleUpdateError(@NonNull FragmentManager fragmentManager, @NonNull Exception ex, boolean isForced) {
+        FirebaseCrashlytics.getInstance().recordException(ex);
+        String errorMessage = UtilityExceptions.recognizeExceptionMessage(ex);
+
+        handler.post(() -> {
+            String title = isForced ? "Aggiornamento Obbligatorio Fallito" : "Errore Aggiornamento";
+            Runnable onPositiveClick = null;
+            if (isForced) {
+                onPositiveClick = MainApplication::exit;
+            }
+
+            DialogSimpleMessageView dialog = DialogSimpleMessageView.newInstance(
+                    isForced ? DialogSimpleMessageView.TYPE.ERROR : DialogSimpleMessageView.TYPE.WARNING,
+                    title,
+                    Html.fromHtml(errorMessage),
+                    null,
+                    onPositiveClick,
+                    null,
+                    null,
+                    null);
+
+            if (isForced) {
+                dialog.setCancelable(false);
+            }
+
+            dialog.show(fragmentManager, "error-dialog");
+        });
+    }
 }
+

app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java

@@ -0,0 +1 @@
+

app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java

@@ -9,6 +9,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
@@ -18,68 +21,87 @@ public class FileDownloader {
     private File destFolder;
 
     private RunnableArgs<Integer> onProgressUpdate;
-    private RunnableArgs<File> onDownloadCompleted;
 
+    private ExecutorService executorService;
 
-    public void download() throws Exception {
-        InputStream input = null;
-        OutputStream output = null;
-        HttpURLConnection connection = null;
-        File downloadFile = null;
+    public File download() throws Exception {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
 
-        try {
-            if (!destFolder.exists()) destFolder.mkdirs();
+        AtomicReference<File> result = new AtomicReference<>();
+        AtomicReference<Exception> exceptionAtomicReference = new AtomicReference<>();
 
-            URL url = new URL(urlString);
-            connection = (HttpURLConnection) url.openConnection();
-            connection.connect();
-            connection.setConnectTimeout(120 * 1000);
+        executorService.execute(() -> {
+            InputStream input = null;
+            OutputStream output = null;
+            HttpURLConnection connection = null;
+            File downloadFile = null;
 
-            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
-                throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
-
-            input = connection.getInputStream();
-            int totalBytesToDownload = connection.getContentLength();
-            int downloadedBytes = 0;
-
-            String title = URLUtil.guessFileName(String.valueOf(url), null, null);
-            downloadFile = new File(destFolder, title);
-
-            if (downloadFile.exists())
-                downloadFile.delete();
-
-            output = new FileOutputStream(downloadFile);
-
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = input.read(buf)) > 0) {
-                output.write(buf, 0, len);
-
-                downloadedBytes += len;
-                if (onProgressUpdate != null)
-                    onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
-            }
-
-        } catch (Exception e) {
-            if(downloadFile != null && downloadFile.exists())
-                downloadFile.delete();
-            throw e;
-
-        } finally {
             try {
-                if (output != null)
-                    output.close();
-                if (input != null)
-                    input.close();
-            } catch (IOException ignored) {
-            }
-            if (connection != null)
-                connection.disconnect();
-        }
+                if (!destFolder.exists()) destFolder.mkdirs();
 
-        if (onDownloadCompleted != null) onDownloadCompleted.run(downloadFile);
+                URL url = new URL(urlString);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.connect();
+                connection.setConnectTimeout(120 * 1000);
+
+                if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+                    throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
+
+                input = connection.getInputStream();
+                int totalBytesToDownload = connection.getContentLength();
+                int downloadedBytes = 0;
+
+                String title = URLUtil.guessFileName(String.valueOf(url), null, null);
+                downloadFile = new File(destFolder, title);
+
+                if (downloadFile.exists())
+                    downloadFile.delete();
+
+                output = new FileOutputStream(downloadFile);
+
+                byte[] buf = new byte[1024];
+                int len;
+                while ((len = input.read(buf)) > 0) {
+                    output.write(buf, 0, len);
+
+                    downloadedBytes += len;
+                    if (onProgressUpdate != null)
+                        onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
+                }
+
+                result.set(downloadFile);
+            } catch (Exception e) {
+                if(downloadFile != null && downloadFile.exists())
+                    downloadFile.delete();
+                exceptionAtomicReference.set(e);
+
+            } finally {
+                try {
+                    if (output != null)
+                        output.close();
+                    if (input != null)
+                        input.close();
+                } catch (IOException ignored) {
+                }
+                if (connection != null)
+                    connection.disconnect();
+
+                countDownLatch.countDown();
+            }
+        });
+
+        countDownLatch.await();
+
+        if(exceptionAtomicReference.get() != null)
+            throw exceptionAtomicReference.get();
+
+        return result.get();
     }
 
+    public FileDownloader setExecutorService(ExecutorService executorService) {
+        this.executorService = executorService;
+        return this;
+    }
 
     public String getUrlString() {
         return urlString;
@@ -103,9 +125,4 @@ public class FileDownloader {
         this.onProgressUpdate = onProgressUpdate;
         return this;
     }
-
-    public FileDownloader setOnDownloadCompleted(RunnableArgs<File> onDownloadCompleted) {
-        this.onDownloadCompleted = onDownloadCompleted;
-        return this;
-    }
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.text.method.DigitsKeyListener;
+
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+/**
+ * KeyListener personalizzato che accetta numeri decimali
+ * usando il separatore decimale del locale corrente (virgola per italiano)
+ */
+public class LocaleDecimalKeyListener {
+
+    /**
+     * Ottiene un'istanza del KeyListener per il locale corrente
+     */
+    public static DigitsKeyListener getInstance() {
+        return getInstance(Locale.getDefault());
+    }
+
+    /**
+     * Ottiene un'istanza del KeyListener per un locale specifico
+     */
+    public static DigitsKeyListener getInstance(Locale locale) {
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+        char decimalSeparator = symbols.getDecimalSeparator();
+        return DigitsKeyListener.getInstance("0123456789" + decimalSeparator);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.utility;
 
 import android.graphics.Bitmap;
 
-import com.annimon.stream.Stream;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
@@ -12,6 +11,7 @@ import com.journeyapps.barcodescanner.BarcodeEncoder;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.barcode_base_android_library.model.BarcodeType;
@@ -61,7 +61,7 @@ public class UtilityBarcode {
         boolean isPosizione = false;
 
         if (SettingsManager.iDB().getAvailablePosizioni() != null) {
-            Stream<MtbDepoPosizione> tmpStream = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+            Stream<MtbDepoPosizione> tmpStream = SettingsManager.iDB().getAvailablePosizioni().stream()
                     .filter(x -> x.getPosizione().equalsIgnoreCase(barcode) && (!enableCheckCodMdep || currentCodMdep.equalsIgnoreCase(x.getCodMdep())));
 
             if (tmpStream.count() > 0) {
@@ -78,7 +78,7 @@ public class UtilityBarcode {
 
 
     public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) {
-        return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("2");
+        return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().length() == 13 && barcodeScanDTO.getStringValue().startsWith("2");
     }
 
     public static boolean isEan8(BarcodeScanDTO barcodeScanDTO) {

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java

@@ -41,6 +41,19 @@ public class UtilityDate {
         public static final String DM_HUMAN = "dd MMM";
         public static final String DMY_HUMAN = "dd MMM yyyy";
         public static final String DMY_HUMAN_LONG = "dd MMMM yyyy";
+
+
+
+
+        public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_SLASH)
+                .withZone(ZoneId.systemDefault());
+
+
+        public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_TIME_SLASH)
+                .withZone(ZoneId.systemDefault());
+
+        public static final DateTimeFormatter DATE_DMY_HUMAN_FORMATTER = DateTimeFormatter.ofPattern(DMY_HUMAN_LONG)
+                .withZone(ZoneId.systemDefault());
     }
 
     public static Date recognizeDateWithExceptionHandler(String dateString) {

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDialog.java

@@ -40,4 +40,5 @@ public class UtilityDialog {
 //        dialog.getWindow().setLayout(width, LinearLayout.LayoutParams.WRAP_CONTENT);
 //    }
 
+
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java

@@ -10,6 +10,7 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.Logger;
 
 import it.integry.integrywmsnative.BuildConfig;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
@@ -19,11 +20,12 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
 
-    private static final Class<?>[] FIREBASE_IGNORED_EXCEPTIONS = new Class[] {
+    private static final Class<?>[] FIREBASE_IGNORED_EXCEPTIONS = new Class[]{
             InvalidConnectionException.class,
             InvalidLUGestioneException.class,
             InvalidLUException.class
     };
+
     public static void defaultException(Context context, Exception ex) {
         defaultException(context, ex, false);
     }
@@ -36,18 +38,16 @@ public class UtilityExceptions {
             Logger.e(ex, "Errore", (Object) ex.getStackTrace());
         }
 
-        String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
-
-        if (errorMessage == null) {
-            errorMessage = ex.getMessage();
-
-            if (ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
-        }
+        String errorMessage = recognizeExceptionMessage(ex);
 
         FragmentManager fm = ContextHelper.getFragmentManagerFromContext(context);
 
         if (fm != null) {
-            DialogSimpleMessageView.makeErrorDialog(Html.fromHtml(errorMessage), null, null)
+            boolean isBarcodeEnabled = BarcodeManager.isLastCallbackEnabled();
+            if (isBarcodeEnabled) BarcodeManager.disableLastCallback();
+            DialogSimpleMessageView.makeErrorDialog(Html.fromHtml(errorMessage), null, () -> {
+                        if (isBarcodeEnabled) BarcodeManager.enableLastCallback();
+                    })
                     .show(fm, "tag");
         }
 
@@ -62,4 +62,15 @@ public class UtilityExceptions {
         }
     }
 
+    public static String recognizeExceptionMessage(Exception ex) {
+        String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
+
+        if (errorMessage == null) {
+            errorMessage = ex.getMessage();
+
+            if (ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
+        }
+        return errorMessage;
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.utility;
 
+import androidx.lifecycle.MutableLiveData;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -12,10 +14,12 @@ import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
 import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer;
 import it.integry.integrywmsnative.core.rest.deserializer.LocalDateTimeDeserializer;
 import it.integry.integrywmsnative.core.rest.deserializer.MtbTcolFlagUiUlDeserializer;
+import it.integry.integrywmsnative.core.rest.deserializer.MutableLiveDataDeserializer;
 import it.integry.integrywmsnative.core.rest.deserializer.StatoPartitaMagDeserializer;
 import it.integry.integrywmsnative.core.rest.serializer.LocalDateSerializer;
 import it.integry.integrywmsnative.core.rest.serializer.LocalDateTimeSerializer;
 import it.integry.integrywmsnative.core.rest.serializer.MtbTcolFlagUiUlSerializer;
+import it.integry.integrywmsnative.core.rest.serializer.MutableLiveDataSerializer;
 import it.integry.integrywmsnative.core.rest.serializer.StatoPartitaMagSerializer;
 
 public class UtilityGson {
@@ -24,6 +28,8 @@ public class UtilityGson {
         return new GsonBuilder()
                 .setDateFormat("dd/MM/yyyy HH:mm:ss")
                 .excludeFieldsWithModifiers(Modifier.TRANSIENT)
+                .registerTypeAdapter(MutableLiveData.class, new MutableLiveDataDeserializer())
+                .registerTypeAdapter(MutableLiveData.class, new MutableLiveDataSerializer())
                 .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer())
                 .registerTypeAdapter(LocalDate.class, new LocalDateSerializer())
                 .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeDeserializer())

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.utility;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
@@ -9,7 +10,8 @@ import it.integry.integrywmsnative.core.CommonConst;
 
 public class UtilityNumber {
 
-    private static DecimalFormat decimalFormatInstance;
+    // Locale italiano per la formattazione
+    private static final Locale ITALIAN_LOCALE = new Locale("it", "IT");
 
     public static String decimalToString(Float bigDecimal){
         if(bigDecimal == null) return "0";
@@ -23,71 +25,59 @@ public class UtilityNumber {
 
     public static String decimalToString(BigDecimal bigDecimal, int decimal){
         if(bigDecimal == null) return "0";
-        return decimalToString(bigDecimal.floatValue(), decimal);
+
+        // Usa stripTrailingZeros per rimuovere gli zeri finali
+        BigDecimal stripped = bigDecimal.stripTrailingZeros();
+        // Limita il numero di decimali visualizzati
+        int scale = Math.min(stripped.scale(), decimal);
+        stripped = stripped.setScale(scale, RoundingMode.DOWN);
+
+        // Configura il formato italiano con virgola come separatore decimale
+        DecimalFormatSymbols italianSymbols = new DecimalFormatSymbols(ITALIAN_LOCALE);
+        italianSymbols.setDecimalSeparator(',');
+
+        // Crea il pattern dinamico basato sul numero di decimali
+        StringBuilder patternBuilder = new StringBuilder("0");
+        if (scale > 0) {
+            patternBuilder.append(".");
+            for (int i = 0; i < scale; i++) {
+                patternBuilder.append("0");
+            }
+        }
+
+        DecimalFormat formatter = new DecimalFormat(patternBuilder.toString(), italianSymbols);
+        String result = formatter.format(stripped);
+
+        // Se il risultato termina con ',', rimuovilo (per i numeri interi)
+        if (result.endsWith(",")) {
+            result = result.substring(0, result.length() - 1);
+        }
+
+        return result;
     }
 
     public static String decimalToString(float floatValue, int decimal) {
-        DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
-        otherSymbols.setDecimalSeparator('.');
-        otherSymbols.setGroupingSeparator(',');
-
-        final DecimalFormat decimalFormat = new DecimalFormat();
-        decimalFormat.setMaximumFractionDigits(decimal);
-        decimalFormat.setDecimalFormatSymbols(otherSymbols);
-        decimalFormat.setGroupingUsed(false);
-        decimalFormat.setMinimumFractionDigits(Math.min(2, decimal));
-
-        return decimalFormat.format(floatValue);
+        return decimalToString(BigDecimal.valueOf(floatValue), decimal);
     }
 
-    public static DecimalFormat getNumberFormatInstance() {
-
-        if(decimalFormatInstance == null) {
-            DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
-            otherSymbols.setDecimalSeparator('.');
-            otherSymbols.setGroupingSeparator(',');
-
-            decimalFormatInstance = new DecimalFormat();
-            decimalFormatInstance.setMaximumFractionDigits(CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS);
-            decimalFormatInstance.setDecimalFormatSymbols(otherSymbols);
-            decimalFormatInstance.setGroupingUsed(false);
+    public static BigDecimal parseBigDecimal(String value, Locale locale) {
+        if (value == null || value.trim().isEmpty()) return null;
+        try {
+            DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+            DecimalFormat format = new DecimalFormat();
+            format.setDecimalFormatSymbols(symbols);
+            format.setParseBigDecimal(true);
+            return (BigDecimal) format.parse(value);
+        } catch (Exception e) {
+            return null;
         }
-
-        return decimalFormatInstance;
     }
 
-    public static int countNumberOfDecimalDigits(Float value) {
-        String text = getNumberFormatInstance().format(Math.abs(value));
-        int integerPlaces = text.indexOf('.');
-        int decimalPlaces = text.length() - integerPlaces - 1;
-
-        return decimalPlaces;
-    }
-
-    public static String normalizeStringNumber(String numberString) {
-        return numberString.replaceAll(",", ".");
-    }
-
-
-
-
-    public static Float decimalToFloat(BigDecimal bigDecimalValue) {
-        float multiplier = (float) Math.pow(10, CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS);
-
-        Float floatValue = null;
-
-        if(bigDecimalValue != null) {
-            int intValue = (int) (bigDecimalValue.floatValue() * multiplier);
-            floatValue = Float.valueOf(intValue / multiplier);
-        }
-
-        return floatValue;
-    }
-
-    public static float truncateToDecimal(float v, int i) {
-        int delta = 10*i;
-
-        return ((int)v*delta)/delta;
-
+    /**
+     * Parsa una stringa numerica italiana (con virgola come separatore decimale)
+     * e restituisce un BigDecimal
+     */
+    public static BigDecimal parseItalianBigDecimal(String value) {
+        return parseBigDecimal(value, ITALIAN_LOCALE);
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java

@@ -3,9 +3,15 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.RawRes;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -69,4 +75,23 @@ public class UtilityResources {
         return 0;
     }
 
+
+
+
+
+    // Funzione di utilità per ottenere un colore da un attributo del tema
+    public static @ColorRes int getColorResourceFromAttr(Context context, @AttrRes int attrRes) {
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrRes, typedValue, true);
+        return typedValue.data;
+    }
+
+    public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attrRes) {
+        return ContextCompat.getColor(context, getColorResourceFromAttr(context, attrRes));
+    }
+
+    public static ColorStateList getColorStateListFromAttr(Context context, @AttrRes int attrRes) {
+        return ColorStateList.valueOf(getColorResourceFromAttr(context, attrRes));
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java

@@ -2,12 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_elenco;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.databinding.BindingAdapter;
 import androidx.databinding.ObservableArrayList;
 
 import com.annimon.stream.Stream;
@@ -48,6 +53,9 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
     private AppCompatTextView mAppBarTitle;
 
     public BindableBoolean fabVisible = new BindableBoolean(false);
+    public BindableBoolean fabMenuVisible = new BindableBoolean(false);
+
+    private PopupMenu fabPopupMenu;
 
     private String mTextFilter;
 
@@ -100,6 +108,9 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
 
         this.initRecyclerView();
 
+        if (SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived())
+            this.initFab();
+
         mToolbar.setRecyclerView(mBinding.accettazioneMainList);
 
         return mBinding.getRoot();
@@ -111,6 +122,7 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
         super.onStart();
 
         this.fabVisible.set(false);
+        this.fabMenuVisible.set(false);
         mViewModel.init();
     }
 
@@ -147,8 +159,11 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
                             .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x.getGroupTitle()) && y.getSelectedObservable().get())
                             .forEach(y -> y.getSelectedObservable().set(false));
 
-                    fabVisible.set(Stream.of(mBolleInevaseMutableData)
-                            .anyMatch(y -> y.getSelectedObservable().get()));
+                    boolean rowSelected = Stream.of(mBolleInevaseMutableData)
+                            .anyMatch(y -> y.getSelectedObservable().get());
+
+                    fabVisible.set(rowSelected && !SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived());
+                    fabMenuVisible.set(rowSelected && SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived());
                 });
 
         adapter.setEmptyView(this.mBinding.bolleAccettazioneEmptyView);
@@ -159,6 +174,28 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
             mToolbar.setRecyclerView(this.mBinding.accettazioneMainList);
     }
 
+    private void initFab() {
+        fabPopupMenu = new PopupMenu(requireContext(), this.mBinding.accettazioneBollaFab,
+                (Gravity.END | Gravity.BOTTOM),
+                androidx.appcompat.R.attr.popupMenuStyle,
+                com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+
+        fabPopupMenu.setForceShowIcon(true);
+        fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_bolla_fab_menu, fabPopupMenu.getMenu());
+
+        fabPopupMenu.setOnMenuItemClickListener(item -> {
+            int itemId = item.getItemId();
+
+            if (itemId == R.id.open_document) {
+                this.dispatchBolle();
+            } else if (itemId == R.id.mark_document_received) {
+                this.setBolleReceived();
+            }
+
+            return false;
+        });
+    }
+
 
     private void refreshList() {
         List<TestataBollaAccettazioneDTO> tmpList = mViewModel.getBolleList().getValue();
@@ -223,14 +260,23 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
         }).toList();
     }
 
+    public void openFabMenu() {
+        fabPopupMenu.show();
+    }
+
+    private void setBolleReceived() {
+        this.mViewModel.markDocumentReceived(getSelectedBolle());
+    }
 
     public void dispatchBolle() {
-        List<TestataBollaAccettazioneDTO> selectedBolle = Stream.of(this.mBolleInevaseMutableData)
+        this.mViewModel.loadPicking(getSelectedBolle());
+    }
+
+    private List<TestataBollaAccettazioneDTO> getSelectedBolle() {
+        return Stream.of(this.mBolleInevaseMutableData)
                 .filter(x -> x.getSelectedObservable().get())
                 .map(MainAccettazioneBolleElencoListModel::getOriginalModel)
                 .toList();
-
-        this.mViewModel.loadPicking(selectedBolle);
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoViewModel.java

@@ -1,12 +1,15 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_elenco;
 
+import androidx.databinding.ObservableInt;
 import androidx.lifecycle.MutableLiveData;
 
 import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.BolleAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
@@ -34,14 +37,10 @@ public class MainAccettazioneBollaElencoViewModel {
         }, this::sendError);
     }
 
-
     public MutableLiveData<List<TestataBollaAccettazioneDTO>> getBolleList() {
         return bolleList;
     }
 
-
-
-
     public void loadPicking(List<TestataBollaAccettazioneDTO> selectedBolle) {
         this.sendOnLoadingStarted();
 
@@ -53,21 +52,10 @@ public class MainAccettazioneBollaElencoViewModel {
         }, this::sendError);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    public void markDocumentReceived(List<TestataBollaAccettazioneDTO> selectedBolle) {
+        this.sendOnLoadingStarted();
+        this.bolleAccettazioneRESTConsumer.markDocumentReceived(selectedBolle, this::sendOnLoadingEnded, this::sendError);
+    }
 
     public MainAccettazioneBollaElencoViewModel setListener(MainAccettazioneBollaElencoViewModel.Listener listener) {
         this.listener = listener;
@@ -87,10 +75,9 @@ public class MainAccettazioneBollaElencoViewModel {
     }
 
     private void sendOnPickingReady(List<TestataBollaAccettazioneDTO> bolle, List<SitBollaAccettazioneDTO> sitArts) {
-        if(this.listener != null) listener.onPickingReady(bolle, sitArts);
+        if (this.listener != null) listener.onPickingReady(bolle, sitArts);
     }
 
-
     public interface Listener extends ILoadingListener {
         void onError(Exception ex);
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java

@@ -2,15 +2,19 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest;
 
 import androidx.annotation.NonNull;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumerService;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.MarkDocumentReceivedRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaResponseDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoBolleAccettazioneResponseDTO;
@@ -54,7 +58,7 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> call, Response<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> response) {
-                        analyzeAnswer(response, "retrievePickingListBolle", data -> onComplete.run(data.getSitArticoli()), onFailed);
+                        analyzeAnswer(response, "retrievePickingListBolle", data -> onComplete.run(data.getSitArticoli() == null ? new ArrayList<>() : data.getSitArticoli()), onFailed);
                     }
 
                     @Override
@@ -64,4 +68,19 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
+    public void markDocumentReceived(List<TestataBollaAccettazioneDTO> bolle, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        BolleAccettazioneRESTConsumerService service = restBuilder.getService(BolleAccettazioneRESTConsumerService.class);
+        service.markDocumentReceived(new MarkDocumentReceivedRequestDTO().setBolle(bolle))
+                .enqueue(new ManagedErrorCallback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "markDocumentReceived", m -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumerService.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.MarkDocumentReceivedRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaResponseDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoBolleAccettazioneResponseDTO;
@@ -17,4 +18,6 @@ public interface BolleAccettazioneRESTConsumerService {
     @POST("wms/accettazione-bolla/retrievePickingList")
     Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> retrievePickingListBolle(@Body RetrieveElencoArticoliAccettazioneBollaRequestDTO retrieveElencoArticoliAccettazioneBollaReques);
 
+    @POST("wms/accettazione-bolla/markDocumentReceived")
+    Call<ServiceRESTResponse<Void>> markDocumentReceived(@Body MarkDocumentReceivedRequestDTO request);
 }