Finish v1.44.08(477)

# Conflicts:
#	.idea/deploymentTargetSelector.xml
#	app/build.gradle
#	app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
#	app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java

.idea/appInsightsSettings.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
+    <option name="tabSettings">
+      <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.ordify.dulciar" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.integrywmsnative" />
+                  <option name="mobileSdkAppId" value="1:963231271247:android:6d73ab369f33c450" />
+                  <option name="projectId" value="wmsfirebaseproject-64854" />
+                  <option name="projectNumber" value="963231271247" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="Prod_Android.WMS.app">
+        <State />
+      </entry>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-01-27T15:42:06.256113400Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/fileTemplates/Android Activity.java

@@ -0,0 +1,97 @@
+#set( $regex = "([a-z])([A-Z]+)")
+#set( $replacement = "$1_$2")
+#set( $dashName = $NAME.replaceAll($regex, $replacement).toLowerCase())
+#set( $variableName = $NAME.replace($NAME.substring(0, 1), $NAME.substring(0, 1).toLowerCase()))
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
+
+public class ${NAME}Activity extends BaseActivity {
+
+/*
+- Create the following layout resource file [activity_${dashName}.xml]
+
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <data>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
+
+
+
+
+- Create an entry in AndroidManifest.xml
+Fix the android:name tag with current path
+
+<activity
+    android:name="${NAME}Activity"
+    android:label="@string/activity_${dashName}_title"
+    android:screenOrientation="portrait"
+    android:theme="@style/Light" />
+
+
+*/
+
+
+    @Inject
+    ${NAME}ViewModel mViewModel;
+    
+    //private Activity${NAME}Binding mBindings;
+
+    //Pass here all external parameters
+    public static void startActivity(Context context) {
+        Intent myIntent = new Intent(context, ${NAME}Activity.class);
+        
+        //String keyExtraItem = DataCache.addItem(var);
+        //myIntent.putExtra("keyExtraItem", keyExtraItem);
+        
+        context.startActivity(myIntent);
+    }
+    
+    
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        //mBindings = DataBindingUtil.setContentView(this, R.layout.activity_${dashName});
+        //mBindings.setLifecycleOwner(this);
+
+
+        /*
+            - Add following lines into MainApplicationComponent
+            
+            [a] into @Component
+            ${NAME}Module.class
+            
+            [b] into interface body
+            ${NAME}Component.Factory ${variableName}Component();
+        */
+        MainApplication.appComponent
+                .${variableName}Component()
+                .create()
+                .inject(this);
+    }
+
+}

.idea/fileTemplates/Android Activity.java.child.0.java

@@ -0,0 +1,12 @@
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = ${NAME}Component.class)
+public class ${NAME}Module {
+
+    @Provides
+    ${NAME}ViewModel provides${NAME}ViewModel() {
+        return new ${NAME}ViewModel();
+    }
+
+}

.idea/fileTemplates/Android Activity.java.child.1.java

@@ -0,0 +1,12 @@
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ${NAME}Component {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ${NAME}Component create();
+    }
+
+    void inject(${NAME}Activity ${NAME}Activity);
+}

.idea/fileTemplates/Android Activity.java.child.2.java

@@ -0,0 +1,3 @@
+public class ${NAME}ViewModel  {
+
+}

.idea/fileTemplates/Android Dialog.java

@@ -0,0 +1,126 @@
+#set( $regex = "([a-z])([A-Z]+)")
+#set( $replacement = "$1_$2")
+#set( $dashName = $NAME.replaceAll($regex, $replacement).toLowerCase())
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+
+public class Dialog${NAME}View extends BaseDialogFragment {
+
+/*
+Create the following layout resource file [dialog_${dashName}.xml]
+
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="Title here" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="Description here" />
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
+
+*/
+
+
+    @Inject
+    Dialog${NAME}ViewModel mViewModel;
+    
+    //private Dialog${NAME}Binding mBindings;
+    private Context mContext;
+
+    //Pass here all external parameters
+    public static Dialog${NAME}View newInstance() {
+        return new Dialog${NAME}View();
+    }
+    
+    private Dialog${NAME}View() {
+        super();
+        
+        MainApplication.appComponent
+                .dialog${NAME}Component()
+                .create()
+                .inject(this);
+    }
+    
+    
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        //mBindings = Dialog${NAME}Binding.inflate(LayoutInflater.from(this.mContext), null, false);
+        //mBindings.setLifecycleOwner(this);
+
+
+        /*
+            - Add following lines into MainApplicationComponent
+            
+            [a] into @Component
+            Dialog${NAME}Module.class
+            
+            [b] into interface body
+            Dialog${NAME}Component.Factory dialog${NAME}Component();
+        */
+                
+        setCancelable(false);
+                
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+            .setView(mBindings.getRoot())
+            .setCancelable(isCancelable())
+            .create();
+            
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+}

.idea/fileTemplates/Android Dialog.java.child.0.java

@@ -0,0 +1,12 @@
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = Dialog${NAME}Component.class)
+public class Dialog${NAME}Module {
+
+    @Provides
+    Dialog${NAME}ViewModel providesDialog${NAME}ViewModel() {
+        return new Dialog${NAME}ViewModel();
+    }
+
+}

.idea/fileTemplates/Android Dialog.java.child.1.java

@@ -0,0 +1,12 @@
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface Dialog${NAME}Component {
+
+    @Subcomponent.Factory
+    interface Factory {
+        Dialog${NAME}Component create();
+    }
+
+    void inject(Dialog${NAME}View dialog${NAME}View);
+}

.idea/fileTemplates/Android Dialog.java.child.2.java

@@ -0,0 +1,3 @@
+public class Dialog${NAME}ViewModel  {
+
+}

.idea/fileTemplates/Android Fragment.java

@@ -0,0 +1,82 @@
+#set( $regex = "([a-z])([A-Z]+)")
+#set( $replacement = "$1_$2")
+#set( $dashName = $NAME.replaceAll($regex, $replacement).toLowerCase())
+#set( $variableName = $NAME.replace($NAME.substring(0, 1), $NAME.substring(0, 1).toLowerCase()))
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+
+public class ${NAME}Fragment extends BaseFragment {
+
+/*
+- Create the following layout resource file [fragment_${dashName}.xml]
+
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <data>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
+
+*/
+
+
+    @Inject
+    ${NAME}ViewModel mViewModel;
+    
+    //private Fragment${NAME}Binding mBindings;
+
+    
+    public ${NAME}Fragment() {
+        // Required empty public constructor
+    }
+
+    public static ${NAME}Fragment newInstance() {
+        return new ${NAME}Fragment();
+    }
+    
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        setRetainInstance(true);
+
+        //mBindings = Fragment${NAME}Binding.inflate(inflater, container, false);
+        //mBindings.setLifecycleOwner(this);
+
+
+        /*
+            - Add following lines into MainApplicationComponent
+            
+            [a] into @Component
+            ${NAME}Module.class
+            
+            [b] into interface body
+            ${NAME}Component.Factory ${variableName}Component();
+        */
+        MainApplication.appComponent
+                .${variableName}Component()
+                .create()
+                .inject(this);
+                
+        return mBindings.getRoot();
+    }
+
+}

.idea/fileTemplates/Android Fragment.java.child.0.java

@@ -0,0 +1,3 @@
+public class ${NAME}ViewModel  {
+
+}

.idea/fileTemplates/Android Fragment.java.child.1.java

@@ -0,0 +1,12 @@
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ${NAME}Component {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ${NAME}Component create();
+    }
+
+    void inject(${NAME}Fragment ${NAME}Fragment);
+}

.idea/fileTemplates/Android Fragment.java.child.2.java

@@ -0,0 +1,12 @@
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = ${NAME}Component.class)
+public class ${NAME}Module {
+
+    @Provides
+    ${NAME}ViewModel provides${NAME}ViewModel() {
+        return new ${NAME}ViewModel();
+    }
+
+}

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
+    <option name="version" value="1.9.25" />
   </component>
 </project>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/runConfigurations/app.xml

@@ -9,7 +9,7 @@
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
     <option name="CLEAR_APP_STORAGE" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic__base,WMS.dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="false" />
@@ -25,6 +25,8 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -32,14 +34,21 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Hybrid>
-    <Java />
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
       <option name="SHOW_STATIC_VARS" value="true" />
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />

app/build.gradle

@@ -5,13 +5,13 @@ if (!project.hasProperty("disable-performance-plugin")) {
 }
 
 apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 338
-    def appVersionName = '1.31.04'
+    def appVersionCode = 477
+    def appVersionName = '1.44.08'
 
     signingConfigs {
         release {
@@ -25,21 +25,19 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
-        variant.outputs.all { output ->
+    applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
             output.outputFileName = "android-release.apk"
         }
     }
 
-    compileSdkVersion 33
-
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 35
         versionCode appVersionCode
         versionName appVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
 
         javaCompileOptions {
@@ -65,8 +63,8 @@ android {
     android.buildFeatures.buildConfig true
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
 
@@ -77,66 +75,76 @@ android {
     build {
         doLast {
             delete "$projectDir/build/outputs/apk/release/version.txt"
-            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName
+            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true'
         }
     }
 
     gradle.projectsEvaluated {
-        tasks.withType(JavaCompile.class) {
-            options.compilerArgs << "-Xmaxerrs" << "10000"
+        tasks.withType(JavaCompile.class).tap {
+            configureEach {
+                options.compilerArgs << "-Xmaxerrs" << "10000"
+            }
         }
     }
     lint {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
+    compileSdk 35
+}
 
-
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+//    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:29.1.0')
+    implementation platform('com.google.firebase:firebase-bom:33.8.0')
     implementation 'com.google.firebase:firebase-analytics'
-    implementation 'com.google.firebase:firebase-core'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.1.0'
+    implementation 'com.google.android.gms:play-services-basement:18.5.0'
+
+    //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 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
-    implementation('androidx.preference:preference-ktx:1.2.0') {
+    implementation('androidx.preference:preference-ktx:1.2.1') {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
     }
 
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    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.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    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'
 
     //MVVM
-    def dagger2_version = '2.40.1'
+    def dagger2_version = '2.55'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -147,23 +155,16 @@ dependencies {
     //FAB
     implementation 'com.github.clans:fab:1.6.4'
     //CUSTOM VIEWS
-    implementation 'com.github.NaimishTrivedi:FBToast:1.0'
     implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
-    implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
-    implementation 'com.github.fede87:StatusBarAlert:1.0.1'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.5.0"
+    def room_version = "2.6.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-rxjava3:$room_version"
-    androidTestImplementation "androidx.room:room-testing:2.5.0"
-
-    //AppUpdate
-    implementation 'com.github.javiersantos:AppUpdater:2.7'
 
     //Barcode
     implementation project(':pointmobilescannerlibrary')
@@ -182,11 +183,16 @@ dependencies {
 
 
     //Bluetooth device manager
-    implementation 'com.github.harry1453:android-bluetooth-serial:v1.1'
+    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'
+
+    //Barcode generator
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
 }
 
 repositories {

app/src/main/AndroidManifest.xml

@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
+
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
@@ -23,31 +33,25 @@
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.prod_dettaglio_linea.ProdDettaglioLineaActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.main.MainActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:exported="true">
             <intent-filter>
@@ -56,30 +60,26 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".gest.accettazione_picking.AccettazionePickingActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.login.LoginActivity"
-            android:theme="@style/Light" />
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.accettazione_ordini_picking.AccettazioneOrdiniPickingActivity"
+            android:windowSoftInputMode="adjustPan"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.lista_bancali.ListaBancaliActivity"
             android:label="@string/activity_lista_bancali_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contenuto_bancale.ContenutoBancaleActivity"
             android:label="@string/activity_contenuto_bancale_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.inventario.picking.PickingInventarioActivity"
             android:label="@string/activity_picking_inventario_title"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing"
-            android:theme="@style/Light"/>
+            android:configChanges="orientation|screenSize|keyboardHidden"/>
 
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
@@ -97,6 +97,10 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".gest.accettazione_bolla_picking.AccettazioneBollaPickingActivity"
+            android:screenOrientation="portrait" />
+
         <provider
             android:name=".core.update.GenericFileProvider"
             android:authorities="${applicationId}.core.update.GenericFileProvider"

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

@@ -70,19 +70,19 @@ public class MainApplication extends Application {
 
 
     // handler listener
-    private Thread.UncaughtExceptionHandler _unCaughtExceptionHandler =
+    private final Thread.UncaughtExceptionHandler _unCaughtExceptionHandler =
             new Thread.UncaughtExceptionHandler() {
                 @Override
                 public void uncaughtException(Thread thread, Throwable ex) {
-                    try {
-                        UtilityLogger.error(new Exception(ex));
-                    } catch (Exception e) {
-                        Log.e("Uncaught error", "Exception Logger failed!", e);
-                        //MainApplication.exit();
-                    }
-
                     // re-throw critical exception further to the os (important)
                     defaultUncaughtExceptionHandler.uncaughtException(thread, ex);
+
+                    try {
+                        UtilityLogger.error(new Exception(ex));
+                        MainApplication.exit();
+                    } catch (Exception e) {
+                        Log.e("Uncaught error", "Exception Logger failed!", e);
+                    }
                 }
             };
 

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

@@ -11,10 +11,16 @@ import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentComponent;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentModule;
 import it.integry.integrywmsnative.core.expansion.BaseFragmentComponent;
 import it.integry.integrywmsnative.core.expansion.BaseFragmentModule;
-import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneComponent;
-import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneModule;
-import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
-import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.MainAccettazioneBollaElencoComponent;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.MainAccettazioneBollaElencoModule;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.AccettazioneBollaPickingComponent;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.AccettazioneBollaPickingModule;
+import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoComponent;
+import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoModule;
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingComponent;
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingModule;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaComponent;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
@@ -23,6 +29,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
@@ -63,12 +71,21 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMate
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailComponent;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListComponent;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposizionamentoDaProdComponent;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposizionamentoDaProdModule;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dialogs.info_giacenza.DialogInfoGiacenzaComponent;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dialogs.info_giacenza.DialogInfoGiacenzaModule;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeComponent;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeModule;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale_su_mag_prossimita.ProdVersamentoMaterialeInBufferComponent;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale_su_mag_prossimita.ProdVersamentoMaterialeInBufferModule;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditComponent;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditModule;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloComponent;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloModule;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.edit_articolo.DialogEditArticoloComponent;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.edit_articolo.DialogEditArticoloModule;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.selectArtFromList.DialogSelectArtToOrderComponent;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.selectArtFromList.DialogSelectArtToOrderModule;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoComponent;
@@ -80,6 +97,8 @@ import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListComponent;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloModule;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteComponent;
@@ -94,17 +113,33 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetM
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdModule;
+import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesModule;
+import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreModule;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUComponent;
+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_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;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
-import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
+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.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUComponent;
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUModule;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_to_return.DialogInputQuantityToReturnComponent;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_to_return.DialogInputQuantityToReturnModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
 import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCComponent;
@@ -113,6 +148,12 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUModule;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoComponent;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoModule;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiComponent;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableComponent;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableModule;
 
 // Definition of the Application graph
 @Singleton
@@ -126,7 +167,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         LoginModule.class,
         MainActivityModule.class,
         MainFragmentModule.class,
-        MainAccettazioneModule.class,
+        MainAccettazioneOrdiniElencoModule.class,
         ListaBancaliModule.class,
         ContenutoBancaleModule.class,
         PVOrdiniAcquistoGrigliaModule.class,
@@ -135,7 +176,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         RettificaGiacenzeModule.class,
         ElencoInventariModule.class,
         SpedizioneModule.class,
-        AccettazionePickingModule.class,
+        AccettazioneOrdiniPickingModule.class,
         UltimeConsegneClienteModule.class,
         UltimiArriviFornitoreModule.class,
         PickingResiModule.class,
@@ -144,6 +185,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogInputLUProdModule.class,
         DialogScanArtModule.class,
         DialogScanOrCreateLUModule.class,
+        DialogBasketLUModule.class,
         ProdFabbisognoLineeProdModule.class,
         VersamentoMerceModule.class,
         DialogAskMagazzinoProssimitaModule.class,
@@ -157,6 +199,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
         DialogSelectDocRowsModule.class,
+        DialogSelectLottiModule.class,
         DialogAskClienteModule.class,
         DialogEditArticoloModule.class,
         DialogPrintOrderSSCCListModule.class,
@@ -172,7 +215,25 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         BottomSheetMtbColrEditModalModule.class,
         DialogChooseArtsFromMtbAartListModule.class,
         MainSettingsModule.class,
-
+        DialogInfoSituazioneArticoloModule.class,
+        DialogSelectArtToOrderModule.class,
+        MainAccettazioneBollaElencoModule.class,
+        AccettazioneBollaPickingModule.class,
+        DialogBindProductBarcodeWithPackageModule.class,
+        DialogAskUnknownBarcodeNotesModule.class,
+        ProdVersamentoMaterialeInBufferModule.class,
+        DialogInputQuantityToReturnModule.class,
+        DialogInfoAggiuntiveLUModule.class,
+        DialogAskLineaProdModule.class,
+        ProdRiposizionamentoDaProdModule.class,
+        DialogInfoGiacenzaModule.class,
+        ArticoliInGiacenzaModule.class,
+        DialogTracciamentoImballiModule.class,
+        DialogAskVettoreModule.class,
+        DialogAskVettoreModule.class,
+        DialogCreateNewArtModule.class,
+        DialogSwitchUserDepoModule.class,
+        DialogUpdateAvailableModule.class
 })
 public interface MainApplicationComponent {
 
@@ -190,7 +251,7 @@ public interface MainApplicationComponent {
 
     MainFragmentComponent.Factory mainFragmentComponent();
 
-    MainAccettazioneComponent.Factory mainAccettazioneComponent();
+    MainAccettazioneOrdiniElencoComponent.Factory mainAccettazioneOrdiniComponent();
 
     ListaBancaliComponent.Factory listaBancaliComponent();
 
@@ -208,7 +269,7 @@ public interface MainApplicationComponent {
 
     SpedizioneComponent.Factory spedizioneComponent();
 
-    AccettazionePickingComponent.Factory accettazionePickingComponent();
+    AccettazioneOrdiniPickingComponent.Factory accettazionePickingComponent();
 
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
 
@@ -228,6 +289,8 @@ public interface MainApplicationComponent {
 
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
 
+    DialogBasketLUComponent.Factory dialogBasketLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
 
     VersamentoMerceComponent.Factory versamentoMerceComponent();
@@ -254,14 +317,10 @@ public interface MainApplicationComponent {
 
     DocInterniComponent.Factory docInterniComponent();
 
-    DialogSelectDocInfoComponent.Factory dialogSelectMgrpDtipPairComponent();
-
-    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
+    DialogSelectDocInfoComponent.Factory dialogSelectDocInfoNewViewComponent();
 
     DocInterniEditFormComponent.Factory docInterniEditFormComponent();
 
-    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
-
     DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
 
     DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent();
@@ -290,6 +349,49 @@ public interface MainApplicationComponent {
 
     MainSettingsComponent.Factory mainSettingsFragmentComponent();
 
+    DialogInfoSituazioneArticoloComponent.Factory dialogInfoSituazioneArticoloComponent();
+
+    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsNewComponent();
+    DialogSelectLottiComponent.Factory dialogSelectLottiComponent();
+
+    DialogSelectArtToOrderComponent.Factory dialogSelectArtToOrderNewComponent();
+
+    MainAccettazioneBollaElencoComponent.Factory mainAccettazioneBollaElencoComponent();
+
+    AccettazioneBollaPickingComponent.Factory accettazioneBollaPickingComponent();
+
+    DialogBindProductBarcodeWithPackageComponent.Factory dialogBindProductBarcodeWithPackageComponent();
+
+    DialogAskUnknownBarcodeNotesComponent.Factory dialogAskUnknownBarcodeNotesComponent();
+
+    ProdVersamentoMaterialeInBufferComponent.Factory prodVersamentoMaterialeInBufferComponent();
+
+    DialogInputQuantityToReturnComponent.Factory dialogInputQuantityToReturnComponent();
+
+    DialogInfoAggiuntiveLUComponent.Factory dialogInfoAggiuntiveLUComponent();
+
+    DialogAskLineaProdComponent.Factory dialogAskLineaProdComponent();
+
+    ProdRiposizionamentoDaProdComponent.Factory prodRiposizionamentoDaprodComponent();
+
+    DialogInfoGiacenzaComponent.Factory dialogInfoGiacenzaComponent();
+
+    ArticoliInGiacenzaComponent.Factory controlloGiacenzeComponent();
+
+    DialogTracciamentoImballiComponent.Factory dialogTracciamentoImballiComponent();
+
+    DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
+
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
+    DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
+
+    DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
+
+    ProdRientroMerceOrderListComponent.Factory prodRientroMerceOrderListComponent();
+
+    DialogUpdateAvailableComponent.Factory dialogUpdateAvailableComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative;
 
 import android.app.Application;
 import android.os.Handler;
-import android.os.Looper;
 
 import androidx.core.os.HandlerCompat;
 
@@ -17,33 +16,44 @@ import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
+import it.integry.integrywmsnative.core.ean128.Ean128Service;
 import it.integry.integrywmsnative.core.menu.MenuRESTConsumer;
 import it.integry.integrywmsnative.core.menu.MenuService;
+import it.integry.integrywmsnative.core.rest.AuthInterceptor;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoBufferRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+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.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;
@@ -72,13 +82,13 @@ public class MainApplicationModule {
     @Provides
     @Singleton
     public Handler providesMainThreadHandler() {
-        return HandlerCompat.createAsync(Looper.getMainLooper());
+        return HandlerCompat.createAsync(mApplication.getApplicationContext().getMainLooper());
     }
 
     @Provides
     @Singleton
-    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
-        return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
+    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new SettingsManager(mApplication, systemRESTConsumer, imballiRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
     }
 
     @Provides
@@ -89,8 +99,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase) {
-        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase);
+    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, systemRESTConsumer, authenticationRESTConsumer);
     }
 
     @Provides
@@ -101,6 +111,19 @@ public class MainApplicationModule {
         return colliDataRecoverService;
     }
 
+    @Provides
+    @Singleton
+    Ean128Service provideEan128Service() {
+        return new Ean128Service();
+    }
+
+
+    @Provides
+    @Singleton
+    RESTBuilder providesRESTBuilder(AuthInterceptor authInterceptor) {
+        return new RESTBuilder(authInterceptor);
+    }
+
     @Provides
     @Singleton
     MenuService provideMenuService(MenuRESTConsumer menuRESTConsumer) {
@@ -109,8 +132,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    UpdatesManager provideUpdatesManager() {
-        return new UpdatesManager();
+    UpdatesManager provideUpdatesManager(ExecutorService executorService, Handler handler, SystemRESTConsumer systemRESTConsumer) {
+        return new UpdatesManager(executorService, handler, systemRESTConsumer);
     }
 
     @Provides
@@ -127,20 +150,20 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new OrdiniRESTConsumer(systemRESTConsumer, entityRESTConsumer);
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new OrdiniRESTConsumer(restBuilder, systemRESTConsumer, entityRESTConsumer);
     }
 
     @Provides
     @Singleton
-    GestSetupRESTConsumer provideGestSetupRESTConsumer() {
-        return new GestSetupRESTConsumer();
+    GestSetupRESTConsumer provideGestSetupRESTConsumer(RESTBuilder restBuilder) {
+        return new GestSetupRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ArticoloRESTConsumer provideArticoloRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new ArticoloRESTConsumer(systemRESTConsumer);
+    ArticoloRESTConsumer provideArticoloRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new ArticoloRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
@@ -157,86 +180,108 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MenuRESTConsumer provideMenuRESTConsumer() {
-        return new MenuRESTConsumer();
+    MenuRESTConsumer provideMenuRESTConsumer(RESTBuilder restBuilder) {
+        return new MenuRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new MagazzinoRESTConsumer(systemRESTConsumer);
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new MagazzinoRESTConsumer(restBuilder, executorService, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    MesRESTConsumer provideMesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new MesRESTConsumer(systemRESTConsumer);
+    MesRESTConsumer provideMesRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new MesRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    EntityRESTConsumer provideEntityRESTConsumer() {
-        return new EntityRESTConsumer();
+    EntityRESTConsumer provideEntityRESTConsumer(RESTBuilder restBuilder) {
+        return new EntityRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(RESTBuilder restBuilder,
+                                                                 SystemRESTConsumer systemRESTConsumer,
+                                                                 ArticoloRESTConsumer articoloRESTConsumer,
+                                                                 EntityRESTConsumer entityRESTConsumer,
+                                                                 SettingsManager settingsManager) {
+        return new ColliMagazzinoRESTConsumer(restBuilder, systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
     }
 
     @Provides
     @Singleton
-    AziendaRESTConsumer provideAziendaRESTConsumer() {
-        return new AziendaRESTConsumer();
+    AziendaRESTConsumer provideAziendaRESTConsumer(RESTBuilder restBuilder) {
+        return new AziendaRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    BarcodeRESTConsumer provideBarcodeRESTConsumer() {
-        return new BarcodeRESTConsumer();
+    ProduzioneRESTConsumer provideProduzioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ProduzioneRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    PrinterRESTConsumer providePrinterRESTConsumer() {
-        return new PrinterRESTConsumer();
+    BarcodeRESTConsumer provideBarcodeRESTConsumer(Ean128Service ean128Service) {
+        return new BarcodeRESTConsumer(ean128Service);
     }
 
     @Provides
     @Singleton
-    SystemRESTConsumer provideSystemRESTConsumer() {
-        return new SystemRESTConsumer();
+    PrinterRESTConsumer providePrinterRESTConsumer(RESTBuilder restBuilder) {
+        return new PrinterRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
-        return new PVOrdiniAcquistoRESTConsumer(magazzinoRESTConsumer);
+    SystemRESTConsumer provideSystemRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder) {
+        return new SystemRESTConsumer(executorService, restBuilder);
     }
 
     @Provides
     @Singleton
-    PosizioniRESTConsumer providesPosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new PosizioniRESTConsumer(systemRESTConsumer);
+    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new PVOrdiniAcquistoRESTConsumer(restBuilder, magazzinoRESTConsumer);
     }
 
     @Provides
     @Singleton
-    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
+    PosizioniRESTConsumer providesPosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new PosizioniRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    DocInterniRESTConsumer provideDocInterniRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
-        return new DocInterniRESTConsumer(magazzinoRESTConsumer);
+    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new ProdFabbisognoLineeProdRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    DocInterniRESTConsumer provideDocInterniRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new DocInterniRESTConsumer(restBuilder, magazzinoRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(RESTBuilder restBuilder, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(restBuilder, articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    ImballiRESTConsumer provideImballiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new ImballiRESTConsumer(restBuilder, executorService);
+    }
+
+    @Provides
+    @Singleton
+    VettoriRESTConsumer provideVettoriRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new VettoriRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
@@ -247,32 +292,58 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer() {
-        return new ProductionLinesRESTConsumer();
+    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer(RESTBuilder restBuilder) {
+        return new ProductionLinesRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    DocumentiRESTConsumer provideDocumentiRESTConsumer() {
-        return new DocumentiRESTConsumer();
+    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) {
+        return new DocumentRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer() {
-        return new ColliSpedizioneRESTConsumer();
+    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ColliAccettazioneRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer() {
-        return new ColliLavorazioneRESTConsumer();
+    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ColliSpedizioneRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer() {
-        return new MagazzinoAutomaticoRESTConsumer();
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(RESTBuilder restBuilder, SettingsManager settingsManager) {
+        return new ColliLavorazioneRESTConsumer(restBuilder, settingsManager);
+    }
+
+    @Provides
+    @Singleton
+    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer(RESTBuilder restBuilder) {
+        return new MagazzinoAutomaticoRESTConsumer(restBuilder);
+    }
+
+    @Provides
+    @Singleton
+    MagazzinoBufferRESTConsumer provideMagazzinoBufferRESTConsumer(RESTBuilder restBuilder) {
+        return new MagazzinoBufferRESTConsumer(restBuilder);
+    }
+
+    @Provides
+    @Singleton
+    MaterialiRESTConsumer provideMaterialiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new MaterialiRESTConsumer(restBuilder, executorService);
+    }
+
+    @Provides
+    @Singleton
+    SoundAlertService provideSoundAlertService() {
+        SoundAlertService soundAlertService = new SoundAlertService(mApplication.getApplicationContext());
+        soundAlertService.init();
+        return soundAlertService;
     }
 
 }

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

@@ -103,12 +103,12 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
     @Override
     public void onDBDataLoading(String item) {
-        mBinding.loadingInfoTextview.setText("Caricamento " + item);
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
     }
 
     @Override
     public void onMenuLoading() {
-        mBinding.loadingInfoTextview.setText("Caricamento menù");
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento menù"));
     }
 
     @Override

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

@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.authentication;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+
+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)))
+                .build()
+                .parseClaimsJws(token);
+
+        return jws.getBody();
+    }
+}

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

@@ -14,7 +14,6 @@ import java.util.List;
 import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
 import it.integry.barcode_base_android_library.model.BarcodeSetting;
 import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
 import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
@@ -76,7 +75,7 @@ public class BarcodeManager {
                 var scanMode = sharedPreferences.getString(MainSettingsFragment.KEY_TRIGGER_SCAN_MODE, null);
                 var scanModeSetting = new Pair<String, Object>(BarcodeSetting.P_TRIGGER_SCAN_MODE, scanMode);
                 additionalSettings.add(scanModeSetting);
-                
+
                 BarcodeManager.changeSettings(additionalSettings);
 
             });
@@ -86,7 +85,7 @@ public class BarcodeManager {
 
     private static BarcodeCallbackDTO getValidCallback() {
 
-        if (mBarcodeCallbacksStacktrace.size() > 0) {
+        if (!mBarcodeCallbacksStacktrace.isEmpty()) {
             return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1);
         } else {
             return null;
@@ -107,7 +106,7 @@ public class BarcodeManager {
 
         int newID = -1;
 
-        if (mBarcodeCallbacksStacktrace.size() > 0) {
+        if (!mBarcodeCallbacksStacktrace.isEmpty()) {
             newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1).getID() + 1;
         } else {
             newID = 1;
@@ -136,12 +135,12 @@ public class BarcodeManager {
 
     public static void disable() {
         mEnabled = false;
-        UtilityLogger.trace("Barcode reader disabled");
+//        UtilityLogger.info("Barcode reader disabled");
     }
 
     public static void enable() {
         mEnabled = true;
-        UtilityLogger.trace("Barcode reader enabled");
+//        UtilityLogger.info("Barcode reader enabled");
     }
 
     public static boolean isEnabled() {

app/src/main/java/it/integry/integrywmsnative/core/base/Callable.java

@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.core.base;
+
+public interface Callable<I, O> {
+    O call(I input);
+}

app/src/main/java/it/integry/integrywmsnative/core/base/CallableII.java

@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.core.base;
+
+public interface CallableII<I, L, O> {
+    O call(I input, L input2);
+}

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java

@@ -2,7 +2,10 @@ package it.integry.integrywmsnative.core.class_router.configs;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.MainAccettazioneBollaElencoFragment;
+import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoFragment;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaFragment;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
@@ -12,9 +15,12 @@ import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisogn
 import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposizionamentoDaProdFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale_su_mag_prossimita.ProdVersamentoMaterialeInBufferFragment;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloView;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
@@ -34,10 +40,18 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_accettazione)
                                         .setCodMenu("MG044")
-                                        .setTitleText(R.string.accettazione_title_fragment)
-                                        .setTitleIcon(R.drawable.ic_dashboard_accettazione)
+                                        .setTitleText(R.string.accettazione_ordine_title_fragment)
+                                        .setTitleIcon(R.drawable.ic_dashboard_accettazione_ordini)
                                         .setDrawerIcon(R.drawable.ic_black_download)
-                                        .setFragmentFactory(MainAccettazioneFragment::newInstance))
+                                        .setFragmentFactory(MainAccettazioneOrdiniElencoFragment::newInstance))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_accettazione_bolle)
+                                        .setCodMenu("MG065")
+                                        .setTitleText(R.string.accettazione_bolle_title_fragment)
+                                        .setTitleIcon(R.drawable.ic_dashboard_accettazione_bolle)
+                                        .setDrawerIcon(R.drawable.ic_black_download)
+                                        .setFragmentFactory(MainAccettazioneBollaElencoFragment::newInstance))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_fornitore)
@@ -57,8 +71,16 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setCodMenu("MG046")
                                         .setTitleText(R.string.vendita_title_fragment)
                                         .setTitleIcon(R.drawable.ic_dashboard_spedizione)
-                                        .setDrawerIcon(R.drawable.ic_black_upload)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
+                                        .setDrawerIcon(R.drawable.ic_upload)
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, DialogInfoSituazioneArticoloView.class)))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_rettifica_spedizione)
+                                        .setCodMenu("MG064")
+                                        .setTitleText(R.string.rettifica_spedizione_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_spedizione)
+                                        .setDrawerIcon(R.drawable.ic_rettifica_spedizione_drawer)
+                                        .setFragmentFactory(() -> RettificaGiacenzeFragment.newInstance(GestioneEnum.VENDITA)))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_free_picking)
@@ -66,7 +88,8 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setTitleText(R.string.free_picking)
                                         .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
                                         .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
-                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA)))
+                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_picking, GestioneEnum.VENDITA,
+                                                SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false, false)))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_cliente)
@@ -94,22 +117,23 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                                 .setDrawerIcon(R.drawable.ic_black_external)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, SettingsManager.iDB().isFlagProduzioneShowInfo() ? DialogInfoSituazioneArticoloView.class : null)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_lav_picking)
                                 .setCodMenu("MG051")
-                                .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking)
+                                .setTitleText(R.string.free_lav_picking)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
-                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
+                                .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_lav_picking, GestioneEnum.LAVORAZIONE,
+                                        SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false, SettingsManager.iDB().isFlagAskCommessaInPickingLiberoLav())))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_posizionamento_da_ord)
                                 .setCodMenu("MG052")
                                 .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                .setDrawerIcon(R.drawable.ic_black_load_shelf)
                                 .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))
 
                         .addItem(new MenuItem()
@@ -129,20 +153,44 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance))
 
                         .addItem(new MenuItem()
-                                .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce)
+                                .setID(R.id.nav_prod_rientro_merce)
                                 .setCodMenu("MG059")
-                                .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title)
-                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                .setTitleText(R.string.rientro_merce_fragment_title)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
+                                .setDrawerIcon(R.drawable.ic_black_external)
                                 .setFragmentFactory(ProdRientroMerceFragment::newInstance))
 
                         .addItem(new MenuItem()
-                                .setID(it.integry.integrywmsnative.R.id.nav_prod_linee)
+                                .setID(R.id.nav_prod_linee)
                                 .setCodMenu("MG061")
-                                .setTitleText(it.integry.integrywmsnative.R.string.nav_prod_linee_title)
+                                .setTitleText(R.string.nav_prod_linee_title)
                                 .setTitleIcon(R.drawable.ic_production_line)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_production_line)
+                                .setDrawerIcon(R.drawable.ic_production_line)
                                 .setFragmentFactory(ProdLineeProduzioneFragment::newInstance))
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_prod_versamento_materiale_in_buffer)
+                                .setCodMenu("MG066")
+                                .setTitleText(R.string.prod_versamento_materiale_in_buffer_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(ProdVersamentoMaterialeInBufferFragment::newInstance))
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_prod_versamento_su_ordine)
+                                .setCodMenu("MG068")
+                                .setTitleText(R.string.prod_versamento_su_ordine_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_su_ord)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.prod_versamento_su_ordine_title_fragment, GestioneEnum.LAVORAZIONE, false, true, false)))
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_prod_riposizionamento_da_ord)
+                                .setCodMenu("MG069")
+                                .setTitleText(R.string.prod_riposizionamento_da_prod_title)
+                                .setTitleIcon(R.drawable.ic_production_line_produzione)
+                                .setDrawerIcon(R.drawable.ic_black_load_shelf)
+                                .setFragmentFactory(ProdRiposizionamentoDaProdFragment::newInstance))
                 ).addGroup(
                         new MenuGroup()
                                 .setGroupText(R.string.internal_handling)
@@ -173,6 +221,13 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_black_empty_box)
                                         .setFragmentFactory(ElencoInventariFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_articoli_in_giacenza)
+                                        .setCodMenu("MG070")
+                                        .setTitleText(R.string.articoli_in_giacenza_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_articoli_in_giacenza)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(ArticoliInGiacenzaFragment::newInstance))
 
                 ).addGroup(
                         new MenuGroup()
@@ -192,7 +247,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
                                         .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
                                         .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
-                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setDrawerIcon(R.drawable.ic_documents_outline)
                                         .setFragmentFactory(DocInterniFragment::newInstance))
 
 //                                .addItem(new MenuItem()

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.context;
 
 import android.content.Context;
 
+import com.annimon.stream.Stream;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.DiskLogAdapter;
@@ -91,6 +92,32 @@ public class AppContext {
         logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
         int maxBytesSize = 5 * 1024 * 1024;
         Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
+
+        removeOldLogs(logsFolder);
+    }
+
+    private void removeOldLogs(File logsFolder) {
+        var files = logsFolder.listFiles();
+
+        if (files == null || files.length <= 1)
+            return;
+
+        var logFiles = Stream.of(files)
+                .sortBy(x -> -1 * x.lastModified())
+                .skip(1)
+                .toList();
+
+        for (var logFile : logFiles) {
+            boolean isDeleted = logFile.delete();
+        }
+
+        files = logsFolder.listFiles();
+
+        if (files == null || files.length > 1)
+            return;
+
+        final boolean isRenamed = files[0].renameTo(new File(files[0].getParentFile().getAbsolutePath() + "/" + "logs_0.csv"));
+
     }
 
 }

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

@@ -6,6 +6,8 @@ import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.SpannedString;
 
+import com.google.firebase.installations.FirebaseInstallations;
+
 import java.net.ConnectException;
 
 import javax.inject.Singleton;
@@ -13,9 +15,11 @@ 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
 public class MainContext {
@@ -23,35 +27,82 @@ public class MainContext {
     private final Context applicationContext;
     private final MenuService menuService;
     private final AppDatabase appDatabase;
+    private final SystemRESTConsumer systemRESTConsumer;
+    private final AuthenticationRESTConsumer authenticationRESTConsumer;
 
     private Listener mListener;
 
-    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase) {
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
         this.applicationContext = applicationContext;
         this.menuService = menuService;
         this.appDatabase = appDatabase;
+        this.systemRESTConsumer = systemRESTConsumer;
+        this.authenticationRESTConsumer = authenticationRESTConsumer;
     }
 
     public void init() {
-
         try {
             BarcodeManager.init(applicationContext);
         } catch (Exception exception) {
             exception.printStackTrace();
         }
 
-        this.initDBData(() -> {
-            this.initMenu(() -> {
-                
-                if (mListener != null) mListener.onContextInitialized();
+
+        //this.initAuthSession(() -> {
+        this.initDeviceId(() -> {
+            this.initDBData(() -> {
+                this.initMenu(() -> {
+
+                    if (mListener != null) mListener.onContextInitialized();
+                });
             });
         });
+        //});
 
 
         this.initServerStatusChecker();
 
+//        EventBus.getDefault().register(this);
     }
 
+//    @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 -> {
+            onComplete.run();
+        }, ex -> {
+            if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+        });
+    }
+
+    private void initDeviceId(Runnable onComplete) {
+        if (SettingsManager.i().getUserSession().getDeviceId() != null) {
+            onComplete.run();
+            return;
+        }
+
+
+        FirebaseInstallations.getInstance().getId().addOnCompleteListener(fid -> {
+            SettingsManager.i().getUserSession().setDeviceId(fid.getResult());
+            SettingsManager.update();
+
+            systemRESTConsumer.registerDevice(onComplete, ex -> {
+                if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+            });
+        });
+    }
+
+
     public void logout(Runnable onLoggedOut) {
         menuService.invalidateCache();
         UtilityThread.executeParallel(() -> {

app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java

@@ -30,7 +30,7 @@ public class DataCache {
 
         Object foundDataCache = null;
 
-        if(dataCacheTemp != null && dataCacheTemp.size() > 0) {
+        if(dataCacheTemp != null && !dataCacheTemp.isEmpty()) {
             foundDataCache = dataCacheTemp.get(0).getItem();
             dataCacheList.remove(dataCacheTemp.get(0));
         }

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

@@ -22,6 +22,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityGson;
 
 @Singleton
 public class ColliDataRecoverService {
@@ -39,15 +40,17 @@ public class ColliDataRecoverService {
         if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
             loadLocalFile();
         }
+
+        if(mtbColtsSessions == null)
+            mtbColtsSessions = new ArrayList<>();
     }
 
     public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && !mtbColtsSessions.isEmpty();
     }
 
     public List<Integer> getAllSessionIDs() {
         if(thereIsAnExistantSession()) {
-
             return Stream.of(mtbColtsSessions)
                     .map(ColliDataRecoverDTO::getId)
                     .toList();
@@ -56,7 +59,6 @@ public class ColliDataRecoverService {
     }
 
     public ColliDataRecoverDTO getSession(Integer sessionID) {
-
         if(sessionID == null) return null;
 
         return getIfExists(sessionID);
@@ -107,7 +109,7 @@ public class ColliDataRecoverService {
 
     private void loadLocalFile() {
         InputStream inputStream;
-        Gson gson = new Gson();
+        Gson gson = UtilityGson.createObject();
 
         try {
             inputStream = mApplicationContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
@@ -129,7 +131,7 @@ public class ColliDataRecoverService {
     private void updateLocalFile() {
         FileOutputStream outputStream;
 
-        Gson gson = new Gson();
+        Gson gson = UtilityGson.createObject();
         String jsonText = gson.toJson(mtbColtsSessions);
 
         try {

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java

@@ -21,6 +21,7 @@ import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.RawDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
@@ -40,8 +41,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
         InventarioRoomDTO.class,
         InventarioRowRoomDTO.class
 },
-        version = 14,
-        exportSchema = true)
+        version = 17)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class,
@@ -67,13 +67,18 @@ public abstract class AppDatabase extends RoomDatabase {
                     .addMigrations(MIGRATION_10_11)
                     .addMigrations(MIGRATION_11_12)
                     .addMigrations(MIGRATION_12_13)
-                    .addMigrations(MIGRATION_13_14);
+                    .addMigrations(MIGRATION_13_14)
+                    .addMigrations(MIGRATION_14_15)
+                    .addMigrations(MIGRATION_15_16)
+                    .addMigrations(MIGRATION_16_17);
 
             sInstance = builder.build();
         }
         return sInstance;
     }
 
+    public abstract RawDao rawDao();
+
     public abstract ArticoloGrigliaDao articoloGrigliaDao();
 
     public abstract GrigliaDao grigliaDao();
@@ -91,6 +96,7 @@ public abstract class AppDatabase extends RoomDatabase {
     public abstract InventarioRowDao inventarioRowDao();
 
 
+
     static final Migration MIGRATION_10_11 = new Migration(10, 11) {
         @Override
         public void migrate(SupportSQLiteDatabase database) {
@@ -135,4 +141,45 @@ public abstract class AppDatabase extends RoomDatabase {
                     + " ADD COLUMN new INTEGER");
         }
     };
+
+    static final Migration MIGRATION_14_15 = new Migration(14, 15) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            // rimuovo vincoli "not null" dai campi id_griglia e cod_alis
+            database.execSQL("DROP TABLE IF EXISTS ordini_tmp;");
+            database.execSQL("CREATE TABLE ordini_tmp (ordine_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, data_ins INTEGER, annotazioni TEXT, transmitted INTEGER NOT NULL, transmission_date INTEGER, gestione TEXT, data_ord INTEGER, num_ord INTEGER, cod_mdep TEXT, id_griglia INTEGER, cod_alis TEXT);");
+            database.execSQL("INSERT INTO ordini_tmp(ordine_id,data_ins,annotazioni,transmitted,transmission_date,gestione,data_ord,num_ord,cod_mdep,id_griglia,cod_alis) SELECT ordini.ordine_id,ordini.data_ins,ordini.annotazioni,ordini.transmitted,ordini.transmission_date,ordini.gestione,ordini.data_ord,ordini.num_ord,ordini.cod_mdep,ordini.id_griglia,griglie.cod_alis from ordini left outer join griglie on ordini.id_griglia = griglie.griglia_id;");
+            database.execSQL("DROP TABLE ordini;");
+            database.execSQL("ALTER TABLE ordini_tmp RENAME TO ordini;");
+            // aggiungo campo cod_alis sulle righe dell'ordine
+            database.execSQL("DROP TABLE IF EXISTS art_ord_tmp;");
+            database.execSQL("CREATE TABLE IF NOT EXISTS art_ord_tmp( articolo_ordine_id INTEGER PRIMARY KEY AUTOINCREMENT, cod_mart TEXT, descrizione TEXT, unt_mis TEXT, qta_cnf REAL NOT NULL, bar_code TEXT, merce_da_ric REAL NOT NULL, media_sett REAL NOT NULL, flag_qta_multipla TEXT, qta_min_ordinabile REAL NOT NULL, id_ordine INTEGER NOT NULL, qta_ord REAL NOT NULL, data_ins INTEGER, new_no_promo INTEGER NOT NULL, system_note TEXT, cod_alis TEXT , FOREIGN KEY(id_ordine) REFERENCES ordini(ordine_id) ON UPDATE NO ACTION ON DELETE CASCADE );");
+            database.execSQL("INSERT INTO art_ord_tmp(articolo_ordine_id, cod_mart, descrizione, unt_mis, qta_cnf, bar_code, merce_da_ric, media_sett, flag_qta_multipla, qta_min_ordinabile, id_ordine, qta_ord, data_ins, new_no_promo, system_note, cod_alis) SELECT articolo_ordine_id, cod_mart, descrizione, unt_mis, qta_cnf, bar_code, merce_da_ric, media_sett, flag_qta_multipla, qta_min_ordinabile, id_ordine, qta_ord, data_ins, new_no_promo, system_note, null from articoli_ordine;");
+            database.execSQL("DROP TABLE articoli_ordine;");
+            database.execSQL("ALTER TABLE art_ord_tmp RENAME TO articoli_ordine;");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_articoli_ordine_id_ordine ON articoli_ordine (id_ordine);");
+            database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS index_articoli_ordine_id_ordine_cod_mart ON articoli_ordine (id_ordine, cod_mart);");
+        }
+    };
+    static final Migration MIGRATION_15_16 = new Migration(15, 16) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+        }
+    };
+    static final Migration MIGRATION_16_17 = new Migration(16, 17) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventario_rows RENAME TO _inventario_rows_old;");
+            database.execSQL("DROP INDEX index_inventario_rows__id;");
+            database.execSQL("DROP INDEX index_inventario_rows_parent_id;");
+
+            database.execSQL("CREATE TABLE inventario_rows (_id INTEGER PRIMARY KEY AUTOINCREMENT, parent_id INTEGER, cod_mart TEXT, partita_mag TEXT, descrizione TEXT, qta REAL NOT NULL DEFAULT 0, num_cnf REAL NOT NULL DEFAULT 0, qta_cnf REAL NOT NULL DEFAULT 0, unt_mis TEXT NOT NULL DEFAULT '0', data_ora_inv INTEGER, scan_cod_barre TEXT, zona TEXT, remote_sync_date INTEGER, FOREIGN KEY(parent_id) REFERENCES inventari(_id) ON UPDATE NO ACTION ON DELETE CASCADE);");
+
+            database.execSQL("INSERT INTO inventario_rows SELECT * FROM _inventario_rows_old;");
+
+            database.execSQL("CREATE INDEX index_inventario_rows__id ON inventario_rows (_id);");
+            database.execSQL("CREATE INDEX index_inventario_rows_parent_id ON inventario_rows (parent_id)");
+            database.execSQL("DROP TABLE _inventario_rows_old;");
+        }
+    };
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java

@@ -17,6 +17,7 @@ import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.RawDao;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
@@ -53,7 +54,11 @@ public class RoomModule {
     }
 
 
-
+    @Singleton
+    @Provides
+    RawDao providesRawDao(AppDatabase appDatabase) {
+        return appDatabase.rawDao();
+    }
 
     @Singleton
     @Provides
@@ -104,12 +109,6 @@ public class RoomModule {
     }
 
 
-
-
-
-
-
-
     @Singleton
     @Provides
     InventarioRowMapper providesInventarioRowMapper() {
@@ -123,62 +122,50 @@ public class RoomModule {
     }
 
 
-    @Singleton
     @Provides
     InventarioLocalDataSource providesInventarioLocalDataSource(ExecutorService executorService, InventarioDao inventarioDao) {
         return new InventarioLocalDataSource(executorService, inventarioDao);
     }
 
-
-    @Singleton
     @Provides
     InventarioRowLocalDataSource providesInventarioRowLocalDataSource(ExecutorService executorService, InventarioRowDao inventarioRowDao) {
         return new InventarioRowLocalDataSource(executorService, inventarioRowDao);
     }
 
 
-
-
-
-
-
-    @Singleton
     @Provides
     ArticoloGrigliaRepository providesArticoloGrigliaRepository(ExecutorService executorService, Handler handler, ArticoloGrigliaDao articoloGrigliaDao) {
         return new ArticoliGrigliaDataSource(executorService, handler, articoloGrigliaDao);
     }
 
-    @Singleton
+
     @Provides
     ArticoliOrdineRepository providesArticoliOrdineRepository(ExecutorService executorService, Handler handler, ArticoloOrdineDao articoloOrdineDao) {
         return new ArticoliOrdineDataSource(executorService, handler, articoloOrdineDao);
     }
 
-    @Singleton
+
     @Provides
     GrigliaRepository providesGrigliaRepository(ExecutorService executorService, Handler handler, GrigliaDao grigliaDao) {
         return new GrigliaDataSource(executorService, handler, grigliaDao);
     }
 
-    @Singleton
+
     @Provides
     OrdineRepository providesOrdineRepository(ExecutorService executorService, Handler handler, OrdineDao ordineDao) {
         return new OrdineDataSource(executorService, handler, ordineDao);
     }
 
-    @Singleton
     @Provides
     MtbColtRepository providesMtbColtRepository(ExecutorService executorService, Handler handler, MtbColtDao mtbColtDao) {
         return new SqlMtbColtDataSource(executorService, handler, mtbColtDao);
     }
 
-    @Singleton
     @Provides
     MtbColrDataSource providesMtbColrRepository(ExecutorService executorService, Handler handler, MtbColrDao mtbColrDao) {
         return new SqlMtbColrDataSource(executorService, handler, mtbColrDao);
     }
 
-    @Singleton
     @Provides
     InventarioRepository providesInventarioRepository(ExecutorService executorService, Handler handler,
                                                       InventarioLocalDataSource inventarioLocalDataSource,
@@ -187,7 +174,6 @@ public class RoomModule {
         return new InventarioRepository(inventarioLocalDataSource, inventarioRESTConsumer, inventarioMapper, handler, executorService);
     }
 
-    @Singleton
     @Provides
     InventarioRowRepository providesInventarioRowRepository(ExecutorService executorService, Handler handler,
                                                             InventarioRowLocalDataSource inventarioRowLocalDataSource,

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColrDao.java

@@ -24,6 +24,6 @@ public interface MtbColrDao {
     @Delete
     void delete(SqlMtbColr mtbColr);
 
-    @Query("SELECT * from mtb_colr where id_collo = :idDocument")
+    @Query("SELECT * FROM mtb_colr WHERE id_collo = :idDocument ORDER BY id DESC")
     List<SqlMtbColr> getDocumentRows(long idDocument);
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColtDao.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.data_store.db.dao;
 
+import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
@@ -33,7 +34,7 @@ public interface MtbColtDao {
             " AND ( mtb_colt.data_doc = :dataDoc OR (mtb_colt.data_doc is null and :dataDoc is null)) " +
             " AND ( mtb_colt.num_doc = :numDoc OR (mtb_colt.num_doc is null and :numDoc is null)) " +
             " and cod_dtip is null group by mtb_colt.id")
-    List<DocInternoWrapper> getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc);
+    LiveData<List<DocInternoWrapper>> getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc);
 
     @Query("SELECT ifnull(MAX(num_collo),0) +1 as num_collo from mtb_colt")
     Integer getNextNumCollo();

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java

@@ -19,7 +19,7 @@ public interface OrdineDao {
     @Query("SELECT ordini.* from ordini where ordini.transmitted = 1")
     List<Ordine> getAllTrasnmitted();
 
-    @Query("SELECT ordini.*, count(articolo_ordine_id) as countArticoli from ordini left join articoli_ordine ON ordini.ordine_id = articoli_ordine.id_ordine where ordini.transmitted = 0 and ordini.cod_alis = :codAlis group by ordini.ordine_id")
+    @Query("SELECT ordini.*, count(articolo_ordine_id) as countArticoli from ordini left join articoli_ordine ON ordini.ordine_id = articoli_ordine.id_ordine where ordini.transmitted = 0 and ((:codAlis is null and ordini.cod_alis is null) OR (ordini.cod_alis = :codAlis)) group by ordini.ordine_id")
     List<OrdineWrapper> getAllOpenOrdersByGriglia(String codAlis);
 
     @Insert

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/RawDao.java

@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.RawQuery;
+import androidx.sqlite.db.SupportSQLiteQuery;
+
+@Dao
+public interface RawDao {
+
+    @RawQuery
+    int vacuumDb(SupportSQLiteQuery supportSQLiteQuery);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java

@@ -73,6 +73,9 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "system_note")
     private String systemNote;
 
+    @ColumnInfo(name = "cod_alis")
+    private String codAlis;
+
     @Ignore
     private int ggScadenza = 0;
 
@@ -85,9 +88,15 @@ public class ArticoloOrdine {
     @Ignore
     private BigDecimal qtaProposta = BigDecimal.ZERO;
 
+    @Ignore
+    private BigDecimal ctMaxOrd = BigDecimal.ZERO;
+
     @Ignore
     private int bgTint;
 
+    @Ignore
+    private boolean invalid = false;
+
 
     public Integer getArticoloOrdineId() {
         return articoloOrdineId;
@@ -230,15 +239,15 @@ public class ArticoloOrdine {
     }
 
     public BigDecimal getQtaCnfPrevistaVendita() {
-        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return qtaPrevistaVendita == null || qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public BigDecimal getQtaCnfProposta() {
-        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return qtaProposta == null || qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public BigDecimal getQtaCnfGiacenza() {
-        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return giacenza == null || giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public boolean isNewNoPromo() {
@@ -250,7 +259,7 @@ public class ArticoloOrdine {
     }
 
     public float getCnfDaRic() {
-        return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0;
+        return qtaCnf > 0.f ? merceDaRic / qtaCnf : 0;
     }
 
     public int checkQtaProposta() {
@@ -277,4 +286,30 @@ public class ArticoloOrdine {
     public void setSystemNote(String systemNote) {
         this.systemNote = systemNote;
     }
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public void setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+    }
+
+    public BigDecimal getCtMaxOrd() {
+        return ctMaxOrd;
+    }
+
+    public ArticoloOrdine setCtMaxOrd(BigDecimal ctMaxOrd) {
+        this.ctMaxOrd = ctMaxOrd;
+        return this;
+    }
+
+    public boolean isInvalid() {
+        return invalid;
+    }
+
+    public ArticoloOrdine setInvalid(boolean invalid) {
+        this.invalid = invalid;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java

@@ -97,7 +97,7 @@ public class InventarioRoomDTO extends BaseSyncDTO implements EntityModelInterfa
     private String zona;
 
     @ColumnInfo(name = Columns.IS_NEW)
-    private Boolean isNew;
+    private Boolean isNew = Boolean.TRUE;
 
     @Ignore
     private List<InventarioRowRoomDTO> inventarioRowList;

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java

@@ -17,7 +17,8 @@ import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInte
                 @ForeignKey(
                         entity = InventarioRoomDTO.class,
                         parentColumns = {BaseSyncDTO.Columns.ID},
-                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID}
+                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID},
+                        onDelete = ForeignKey.CASCADE
                 )
         }
 )

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.data_store.db.entity;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
@@ -52,10 +51,10 @@ public class Ordine {
     private boolean orderNewProducts = false;
 
     @ColumnInfo(name = "id_griglia")
-    private int idGriglia;
+    @Nullable
+    private Integer idGriglia;
 
     @ColumnInfo(name = "cod_alis")
-    @NonNull
     private String codAlis;
 
     public int getOrdineId() {
@@ -82,11 +81,11 @@ public class Ordine {
         this.annotazioni = annotazioni;
     }
 
-    public int getIdGriglia() {
+    public Integer getIdGriglia() {
         return idGriglia;
     }
 
-    public void setIdGriglia(int idGriglia) {
+    public void setIdGriglia(Integer idGriglia) {
         this.idGriglia = idGriglia;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColr.java

@@ -6,7 +6,7 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 @Entity(
@@ -138,7 +138,7 @@ public class SqlMtbColr {
     @ColumnInfo(name = "unt_mis")
     private String untMis;
     @ColumnInfo(name = "data_scad")
-    private Date dataScad;
+    private LocalDate dataScad;
 
     public int getId() {
         return id;
@@ -428,11 +428,11 @@ public class SqlMtbColr {
         this.descrizione = descrizione;
     }
 
-    public Date getDataScad() {
+    public LocalDate getDataScad() {
         return dataScad;
     }
 
-    public void setDataScad(Date dataScad) {
+    public void setDataScad(LocalDate dataScad) {
         this.dataScad = dataScad;
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColtRepository.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.data_store.db.repository;
 
+import androidx.lifecycle.LiveData;
+
 import java.util.Date;
 import java.util.List;
 
@@ -17,7 +19,7 @@ public interface MtbColtRepository {
 
     void delete(SqlMtbColt mtbColt, Runnable onSuccess, RunnableArgs<Exception> onError);
 
-    void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError);
+    LiveData<List<DocInternoWrapper>> getDocuments(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc);
 
     void getNextNumCollo(RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColtDataSource.java

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
+import androidx.lifecycle.LiveData;
+
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -50,10 +52,8 @@ public class SqlMtbColtDataSource extends BaseDataSource implements MtbColtRepos
     }
 
     @Override
-    public void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError) {
-        execute(() -> mMtbColtDao.getLocalDocumentsByCodDtip(codDtip, codAnag, codVdes, dataDoc, numDoc),
-                onSuccess,
-                onError);
+    public LiveData<List<DocInternoWrapper>> getDocuments(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc) {
+         return mMtbColtDao.getLocalDocumentsByCodDtip(codDtip, codAnag, codVdes, dataDoc, numDoc);
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java

@@ -21,6 +21,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.mapper.InventarioMapper;
 import it.integry.integrywmsnative.core.model.MtbInvent;
 import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityLiveData;
 
 public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioRoomDTO, InventarioMapper, InventarioLocalDataSource, InventarioRESTConsumer> {
@@ -62,15 +63,20 @@ public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioR
             try {
                 var startRetrieve = new Date();
                 var remoteData = remoteDataSource.makeSynchronousRetrieveRequest();
-                Log.d("Timing [INVENTORIES RETRIEVE]", ((new Date().getTime() - startRetrieve.getTime()) / 1000) + " secs");
+                Log.d("Time INVENTORY RETRIEVE", ((new Date().getTime() - startRetrieve.getTime()) / 1000) + " secs");
 
                 if (remoteData == null) remoteData = new ArrayList<>();
 
-                resolveFetch(remoteData, internalLiveData.getValue(),
+                List<MtbInvent> finalRemoteData = remoteData;
+
+                resolveFetch(finalRemoteData, internalLiveData.getValue(),
                         (remoteItem, localItem) -> Objects.equals(remoteItem.getIdInventario(), localItem.getIdInventario()),
                         (remoteItem, localItem) -> {
-                            remoteItem.setNew(true);
-                        }, onComplete, onError);
+                            remoteItem.setRemoteSyncDate(localItem.getRemoteSyncDate());
+                            remoteItem.setNew(false);
+                        }, () -> handler.post(onComplete), ex -> handler.post(() -> onError.run(ex)),
+                        SettingsManager.iDB().isFlagIsInventarioCacheEnabled());
+
 
             } catch (Exception e) {
                 onError.run(e);

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/_BaseRepository.java

@@ -35,7 +35,8 @@ public abstract class _BaseRepository<
                                 RunnableArgssWithReturn<B, B, Boolean> keyComparator,
                                 RunnableArgss<B, B> dataCopy,
                                 Runnable onComplete,
-                                RunnableArgs<Exception> onError) {
+                                RunnableArgs<Exception> onError,
+                                boolean isCacheEnabled) {
         List<B> finalRemoteData = dataMapper.mapRestsToRooms(remoteData);
 
         if (localData == null) localData = new ArrayList<>();
@@ -53,12 +54,14 @@ public abstract class _BaseRepository<
         }
 
 
+
+
         var dataToUpdate = finalRemoteData.stream()
                 .filter(x -> x.getId() != null && finalLocalData.stream().noneMatch(x::equals))
                 .collect(Collectors.toList());
 
         var dataToDelete = finalLocalData.stream()
-                .filter(x -> x.isSyncronized() && finalRemoteData.stream().noneMatch(y -> keyComparator.run(y, x)))
+                .filter(x -> (!isCacheEnabled || x.isSyncronized()) && finalRemoteData.stream().noneMatch(y -> keyComparator.run(y, x)))
                 .collect(Collectors.toList());
 
         var dataToInsert = finalRemoteData.stream()

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java

@@ -1,218 +0,0 @@
-package it.integry.integrywmsnative.core.data_store.db.view_model;
-
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONObject;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-
-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-
-public class ArticoloDTO {
-
-    public String codMart;
-    public String descrizione;
-    public String untMis;
-    public float qtaCnf;
-    public String barcode;
-    public float merceDaRic;
-    public float mediaSett;
-    public String flagQtaMultipla;
-    public String flagTracciabilita;
-    public float qtaMinOrdinabile;
-    public boolean newNoPromo;
-    private int ggScadenza;
-    private float giacenza;
-    private float qtaPrevistaVendita;
-    private float qtaProposta;
-    private float qtaOrd;
-
-
-    public String getCodMart() {
-        return codMart;
-    }
-
-    public void setCodMart(String codMart) {
-        this.codMart = codMart;
-    }
-
-    public String getDescrizione() {
-        return descrizione;
-    }
-
-    public void setDescrizione(String descrizione) {
-        this.descrizione = descrizione;
-    }
-
-    public String getUntMis() {
-        return untMis;
-    }
-
-    public void setUntMis(String untMis) {
-        this.untMis = untMis;
-    }
-
-    public float getQtaCnf() {
-        return qtaCnf;
-    }
-
-    public void setQtaCnf(float qtaCnf) {
-        this.qtaCnf = qtaCnf;
-    }
-
-    public String getBarCode() {
-        return barcode;
-    }
-
-    public void setBarCode(String barCode) {
-        this.barcode = barCode;
-    }
-
-    public float getMerceDaRic() {
-        return merceDaRic;
-    }
-
-    public void setMerceDaRic(float merceDaRic) {
-        this.merceDaRic = merceDaRic;
-    }
-
-    public float getMediaSett() {
-        return mediaSett;
-    }
-
-    public void setMediaSett(float mediaSett) {
-        this.mediaSett = mediaSett;
-    }
-
-    public String getFlagQtaMultipla() {
-        return flagQtaMultipla;
-    }
-
-    public void setFlagQtaMultipla(String flagQtaMultipla) {
-        this.flagQtaMultipla = flagQtaMultipla;
-    }
-
-    public float getQtaMinOrdinabile() {
-        return qtaMinOrdinabile;
-    }
-
-    public void setQtaMinOrdinabile(float qtaMinOrdinabile) {
-        this.qtaMinOrdinabile = qtaMinOrdinabile;
-    }
-
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-
-    public int getGgScadenza() {
-        return ggScadenza;
-    }
-
-    public void setGgScadenza(int ggScadenza) {
-        this.ggScadenza = ggScadenza;
-    }
-
-    public float getGiacenza() {
-        return giacenza;
-    }
-
-    public void setGiacenza(float giacenza) {
-        this.giacenza = giacenza;
-    }
-
-    public float getQtaPrevistaVendita() {
-        return qtaPrevistaVendita;
-    }
-
-    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
-        this.qtaPrevistaVendita = qtaPrevistaVendita;
-    }
-
-    public float getQtaProposta() {
-        return qtaProposta;
-    }
-
-    public void setQtaProposta(float qtaProposta) {
-        this.qtaProposta = qtaProposta;
-    }
-
-    public String getFlagTracciabilita() {
-        return flagTracciabilita;
-    }
-
-    public ArticoloDTO setFlagTracciabilita(String flagTracciabilita) {
-        this.flagTracciabilita = flagTracciabilita;
-        return this;
-    }
-
-    public boolean isNewNoPromo() {
-        return newNoPromo;
-    }
-
-    public ArticoloDTO setNewNoPromo(boolean newNoPromo) {
-        this.newNoPromo = newNoPromo;
-        return this;
-    }
-
-    public float getQtaOrd() {
-        return qtaOrd;
-    }
-
-    public ArticoloDTO setQtaOrd(float qtaOrd) {
-        this.qtaOrd = qtaOrd;
-        return this;
-    }
-
-    public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
-        ArticoloOrdine articolo = new ArticoloOrdine();
-
-        articolo.setIdOrdine(ordine.getOrdineId());
-
-        articolo.setBarCode(this.getBarCode());
-        articolo.setCodMart(this.getCodMart());
-        articolo.setMediaSett(this.getMediaSett());
-        articolo.setFlagQtaMultipla(this.getFlagQtaMultipla());
-        articolo.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
-        articolo.setMerceDaRic(this.getMerceDaRic());
-        articolo.setQtaCnf(this.getQtaCnf());
-        articolo.setUntMis(this.getUntMis());
-        articolo.setDescrizione(this.getDescrizione());
-        articolo.setDataIns(UtilityDate.getDateInstance());
-        articolo.setGgScadenza(this.getGgScadenza());
-        articolo.setGiacenza(BigDecimal.valueOf(this.getGiacenza()));
-        articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
-        articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
-        articolo.setNewNoPromo(this.isNewNoPromo());
-        articolo.setSystemNote(generateSystemNote());
-        articolo.setQtaOrd(this.getQtaOrd());
-
-        return articolo;
-    }
-
-    public String generateSystemNote() {
-        HashMap<String, String> pairs = new HashMap<>();
-        pairs.put("qta_proposta", String.valueOf(qtaProposta));
-        pairs.put("giacenza", String.valueOf(giacenza));
-
-        return new JSONObject(pairs).toString();
-    }
-
-
-    public int getSortByBarcodeCondition(String barcode) {
-        if (codMart.equalsIgnoreCase(barcode))
-            return 1;
-        if (barcode != null) {
-            if (barcode.equalsIgnoreCase(barcode))
-                return 2;
-            if (StringUtils.leftPad(barcode, 13, "0").equalsIgnoreCase(barcode))
-                return 3;
-        }
-        return 100;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloOrdinabileDTO.java

@@ -0,0 +1,224 @@
+package it.integry.integrywmsnative.core.data_store.db.view_model;
+
+import org.json.JSONObject;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
+public class ArticoloOrdinabileDTO {
+
+
+    private String codAlis;
+    private String codMart;
+    private String descrizione;
+    private String untMis;
+    private float qtaCnf;
+    private float merceDaRic;
+    private float mediaSett;
+    private String flagQtaMultipla;
+    private String flagTracciabilita;
+    private String flagQtaCnfFissa;
+    private boolean newNoPromo;
+    private float qtaMinOrdinabile;
+    private int ggScadenza;
+    private BigDecimal giacenza;
+    private BigDecimal qtaPrevistaVendita;
+    private BigDecimal qtaProposta;
+    private float qtaOrd;
+
+    private float ctMaxOrd;
+
+    private List<String> barcode;
+
+    private String selectedBarcode;
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public ArticoloOrdinabileDTO setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+        return this;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ArticoloOrdinabileDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public ArticoloOrdinabileDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public ArticoloOrdinabileDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public float getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public ArticoloOrdinabileDTO setQtaCnf(float qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public float getMerceDaRic() {
+        return merceDaRic;
+    }
+
+    public ArticoloOrdinabileDTO setMerceDaRic(float merceDaRic) {
+        this.merceDaRic = merceDaRic;
+        return this;
+    }
+
+    public float getMediaSett() {
+        return mediaSett;
+    }
+
+    public ArticoloOrdinabileDTO setMediaSett(float mediaSett) {
+        this.mediaSett = mediaSett;
+        return this;
+    }
+
+    public String getFlagQtaMultipla() {
+        return flagQtaMultipla;
+    }
+
+    public ArticoloOrdinabileDTO setFlagQtaMultipla(String flagQtaMultipla) {
+        this.flagQtaMultipla = flagQtaMultipla;
+        return this;
+    }
+
+    public String getFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public ArticoloOrdinabileDTO setFlagTracciabilita(String flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public String getFlagQtaCnfFissa() {
+        return flagQtaCnfFissa;
+    }
+
+    public ArticoloOrdinabileDTO setFlagQtaCnfFissa(String flagQtaCnfFissa) {
+        this.flagQtaCnfFissa = flagQtaCnfFissa;
+        return this;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public ArticoloOrdinabileDTO setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+        return this;
+    }
+
+    public float getQtaMinOrdinabile() {
+        return qtaMinOrdinabile;
+    }
+
+    public ArticoloOrdinabileDTO setQtaMinOrdinabile(float qtaMinOrdinabile) {
+        this.qtaMinOrdinabile = qtaMinOrdinabile;
+        return this;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public ArticoloOrdinabileDTO setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public ArticoloOrdinabileDTO setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public ArticoloOrdinabileDTO setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public ArticoloOrdinabileDTO setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
+
+    public float getQtaOrd() {
+        return qtaOrd;
+    }
+
+    public ArticoloOrdinabileDTO setQtaOrd(float qtaOrd) {
+        this.qtaOrd = qtaOrd;
+        return this;
+    }
+
+    public float getCtMaxOrd() {
+        return ctMaxOrd;
+    }
+
+    public ArticoloOrdinabileDTO setCtMaxOrd(float ctMaxOrd) {
+        this.ctMaxOrd = ctMaxOrd;
+        return this;
+    }
+
+    public List<String> getBarcode() {
+        return barcode;
+    }
+
+    public ArticoloOrdinabileDTO setBarcode(List<String> barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+
+    public String generateSystemNote() {
+        HashMap<String, String> pairs = new HashMap<>();
+        pairs.put("qta_proposta", String.valueOf(qtaProposta));
+        pairs.put("giacenza", String.valueOf(giacenza));
+
+        return new JSONObject(pairs).toString();
+    }
+
+    public String getSelectedBarcode() {
+        return selectedBarcode;
+    }
+
+    public ArticoloOrdinabileDTO setSelectedBarcode(String selectedBarcode) {
+        this.selectedBarcode = selectedBarcode;
+        return this;
+    }
+}
+    

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/GrigliaDTO.java

@@ -1,36 +0,0 @@
-package it.integry.integrywmsnative.core.data_store.db.view_model;
-
-import java.util.List;
-
-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
-
-public class GrigliaDTO {
-    private String descrLisa;
-    private String descrDepo;
-    private List<ArticoloDTO> grigliaAcquistiChild;
-
-
-    public String getDescrLisa() {
-        return descrLisa;
-    }
-
-    public void setDescrLisa(String descrLisa) {
-        this.descrLisa = descrLisa;
-    }
-
-    public String getDescrDepo() {
-        return descrDepo;
-    }
-
-    public void setDescrDepo(String descrDepo) {
-        this.descrDepo = descrDepo;
-    }
-
-    public List<ArticoloDTO> getGrigliaAcquistiChild() {
-        return grigliaAcquistiChild;
-    }
-
-    public void setGrigliaAcquistiChild(List<ArticoloDTO> grigliaAcquistiChild) {
-        this.grigliaAcquistiChild = grigliaAcquistiChild;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/OrdineWithGriglia.java

@@ -1,33 +0,0 @@
-package it.integry.integrywmsnative.core.data_store.db.view_model;
-
-import androidx.room.Embedded;
-import androidx.room.Ignore;
-
-import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
-import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-import it.integry.integrywmsnative.core.di.BindableBoolean;
-
-public class OrdineWithGriglia {
-
-    @Embedded
-    private Ordine ordine;
-    @Embedded
-    private Griglia griglia;
-
-
-    public Ordine getOrdine() {
-        return ordine;
-    }
-
-    public void setOrdine(Ordine ordine) {
-        this.ordine = ordine;
-    }
-
-    public Griglia getGriglia() {
-        return griglia;
-    }
-
-    public void setGriglia(Griglia griglia) {
-        this.griglia = griglia;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/OrdiniAcquistoGrigliaDTO.java

@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.data_store.db.view_model;
+
+import java.util.List;
+
+public class OrdiniAcquistoGrigliaDTO {
+    private String descrLisa;
+
+    private String descrDepo;
+
+    private List<ArticoloOrdinabileDTO> articoli;
+
+    public String getDescrLisa() {
+        return descrLisa;
+    }
+
+    public OrdiniAcquistoGrigliaDTO setDescrLisa(String descrLisa) {
+        this.descrLisa = descrLisa;
+        return this;
+    }
+
+    public String getDescrDepo() {
+        return descrDepo;
+    }
+
+    public OrdiniAcquistoGrigliaDTO setDescrDepo(String descrDepo) {
+        this.descrDepo = descrDepo;
+        return this;
+    }
+
+    public List<ArticoloOrdinabileDTO> getArticoli() {
+        return articoli;
+    }
+
+    public OrdiniAcquistoGrigliaDTO setArticoli(List<ArticoloOrdinabileDTO> articoli) {
+        this.articoli = articoli;
+        return this;
+    }
+
+
+}

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
-public class BindableBigDecimal  implements Observable {
+public class BindableBigDecimal implements Observable {
 
     BigDecimal mValue;
 

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

@@ -1,10 +1,9 @@
 package it.integry.integrywmsnative.core.di;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
 import androidx.databinding.BaseObservable;
 
+import java.math.BigDecimal;
+
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 
@@ -20,7 +19,7 @@ public class BindableFloat extends BaseObservable {
 
         if(numberOfDigits > CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS) numberOfDigits = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
 
-        return new BigDecimal(get());
+        return BigDecimal.valueOf(get());
     }
 
     public Float get(boolean defaultIfNull) {

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

@@ -32,6 +32,7 @@ import com.google.android.material.textfield.TextInputLayout;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.time.LocalDate;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -104,6 +105,28 @@ public class Converters {
             view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
             view.addTextChangedListener(watcher);
         }
+        String newValue = observableField != null ? observableField.get() : "";
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindEditText(AppCompatTextView view, final ValidatableObservableField<String> observableField) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableField) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if (observableField != null) observableField.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
+            view.addTextChangedListener(watcher);
+        }
         String newValue = observableField.get();
         if (!view.getText().toString().equals(newValue)) {
             view.setText(newValue);
@@ -155,6 +178,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(EditText view, final ValidatableObservableField<String> observableString) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindEditText(AutoCompleteTextView view, final ObservableField<String> observableString) {
         Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -210,16 +255,19 @@ public class Converters {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
+
                     if (!UtilityString.isNullOrEmpty(s.toString()))
                         value = new BigDecimal(s.toString());
+
                     observableBigDecimal.set(value);
                 }
             };
             view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
             view.addTextChangedListener(watcher);
         }
+
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -237,8 +285,11 @@ public class Converters {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
-                    if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                    String newValueString = s.toString().trim();
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
                     observableBigDecimal.set(value);
                 }
             };
@@ -246,7 +297,37 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(EditText view, final ValidatableObservableField<BigDecimal> observableBigDecimal) {
+        Pair<ValidatableObservableField<BigDecimal>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    String newValueString = s.toString().trim();
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
+                    observableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = observableBigDecimal.get();
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -273,7 +354,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = bindableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -300,7 +381,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Integer newValue = bindableInteger.get();
-        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+        Integer viewValue = !view.getText().toString().trim().isEmpty() ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
 
         if (!(viewValue.compareTo(newValue) == 0)) {
             view.setText(newValue.toString());
@@ -351,7 +432,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Integer newValue = observableInteger.get();
-        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+        Integer viewValue = !view.getText().toString().trim().isEmpty() ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
 
         if (!viewValue.equals(newValue) && newValue != null) {
             view.setText(newValue.toString());
@@ -378,7 +459,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Long newValue = observableLong.get();
-        Long viewValue = view.getText().toString().trim().length() > 0 ? Long.valueOf(view.getText().toString()) : Long.valueOf(0);
+        Long viewValue = !view.getText().toString().trim().isEmpty() ? Long.valueOf(view.getText().toString()) : Long.valueOf(0);
 
         if (!viewValue.equals(newValue) && newValue != null) {
             view.setText(newValue.toString());
@@ -456,8 +537,8 @@ public class Converters {
     }
 
     @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false)
-    public static void bindEditTextDate(EditText view, final ObservableField<Date> observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) {
-        Pair<ObservableField<Date>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+    public static void bindEditTextDate(EditText view, final ObservableField<LocalDate> observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) {
+        Pair<ObservableField<LocalDate>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
         if (pair == null || pair.first != observableDate) {
             if (pair != null) {
                 view.removeTextChangedListener(pair.second);
@@ -472,37 +553,33 @@ public class Converters {
 
             RunnableArgs<View> onClick = v -> {
                 // Get Current Date
-                Calendar c = UtilityDate.getCalendarInstance();
-
-                if (observableDate.get() != null) {
-                    c.setTime(observableDate.get());
-                }
-
+                LocalDate selectedDate = observableDate.get() != null ? observableDate.get() : UtilityDate.getNow();
 
                 var datePicker =
                         MaterialDatePicker.Builder.datePicker()
-                                .setSelection(c.getTimeInMillis())
+                                .setSelection(UtilityDate.localDateToMillisTime(selectedDate))
                                 .build();
 
+
+
                 datePicker.addOnDismissListener(dialog -> {
                     if(datePicker.getSelection() != null) {
-                        var timeInMillis = datePicker.getSelection();
+                        var selectedTimeInMillis = datePicker.getSelection();
+                        var nowTime = UtilityDate.millisTimeToLocalDate(selectedTimeInMillis, null);
 
-                        var calendar = UtilityDate.getCalendarInstance();
-                        calendar.setTimeInMillis(timeInMillis);
 
-                        if (parentFragment != null && warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) {
+                        if (parentFragment != null && warningOnOldDates && nowTime.isBefore(UtilityDate.getNow())) {
                             DialogSimpleMessageView
                                     .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> {
-                                        view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-                                        observableDate.set(calendar.getTime());
+                                        view.setText(UtilityDate.formatDate(nowTime, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                                        observableDate.set(nowTime);
                                     }, () -> {
 
                                     })
                                     .show(parentFragment.requireActivity().getSupportFragmentManager(), "tag");
                         } else {
-                            view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-                            observableDate.set(calendar.getTime());
+                            view.setText(UtilityDate.formatDate(nowTime, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                            observableDate.set(nowTime);
                         }
                     }
                     else {
@@ -521,7 +598,7 @@ public class Converters {
                 ((TextInputLayout) view.getParent().getParent()).setOnClickListener(onClick::run);
             }
         }
-        Date newValue = observableDate.get();
+        var newValue = observableDate.get();
         view.setText(UtilityDate.formatDate(newValue, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
     }
 
@@ -654,6 +731,30 @@ public class Converters {
         view.setChecked(newValue);
     }
 
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ValidatableObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
     @BindingAdapter("checked")
     public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_observable) != bindableBoolean) {
@@ -718,10 +819,55 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityWhenNotNull(View view, ObservableField<?> bindableObject) {
+        if(bindableObject == null) return;
+
+        if (view.getTag(R.id.bound_observable) != bindableObject) {
+            view.setTag(R.id.bound_observable, bindableObject);
+        }
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+            }
+        });
+
+        view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+    }
+
+
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityWhenNotNull(View view, Object genericObject) {
+        view.setVisibility(genericObject == null ? View.GONE : View.VISIBLE);
+    }
+
+
+    @BindingAdapter("visibilityWhenNull")
+    public static void bindViewVisibilityWhenNull(View view, ObservableField<?> bindableObject) {
+
+        if (view.getTag(R.id.bound_observable_visibility) != bindableObject) {
+            view.setTag(R.id.bound_observable_visibility, bindableObject);
+        }
+
+        view.setVisibility(bindableObject == null || bindableObject.get() == null ? View.VISIBLE : View.GONE);
+
+        if(bindableObject == null) return;
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.VISIBLE : View.GONE);
+            }
+        });
+    }
+
+
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
-        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
-            view.setTag(R.id.bound_observable, bindableBoolean);
+        if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) {
+            view.setTag(R.id.bound_reverse_visibility, bindableBoolean);
         }
         bindableBoolean.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
             @Override

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

@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.core.di;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.core.di.validators.Validator;
+
+public class ValidatableObservableField<T> extends BaseObservable {
+    private T mValue;
+    private final List<Validator<T>> validators = new ArrayList<>();
+    public String errorMessage;
+
+    public ValidatableObservableField() {
+    }
+
+    public ValidatableObservableField(T value) {
+        mValue = value;
+    }
+
+    /**
+     * @return the stored value.
+     */
+    @Nullable
+    public T get() {
+        return mValue;
+    }
+
+    public void set(T value) {
+        if (value != mValue) {
+            mValue = value;
+            notifyChange();
+            validate();
+        }
+    }
+
+    public void addValidator(Validator<T> validator) {
+        validators.add(validator);
+    }
+
+    public boolean validate() {
+        for (Validator<T> validator : validators) {
+            if (!validator.isValid(mValue)) {
+                setErrorMessage(validator.getErrorMessage());
+                return false;
+            }
+        }
+        setErrorMessage(null);
+        return true;
+    }
+
+    @Bindable
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    private void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        notifyPropertyChanged(BR.errorMessage); // Notifica il cambiamento di errorMessage
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java

@@ -2,5 +2,25 @@ package it.integry.integrywmsnative.core.di.binders;
 
 public class AutoCompleteTextViewBinders {
 
-
+//    @BindingAdapter("binding")
+//    public static void bindUntMisText(AppCompatAutoCompleteTextView view, ObservableField<MtbUntMis> untMisField) {
+//        Pair<ObservableField<MtbUntMis>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+//        if (pair == null || pair.first != untMisField) {
+//            if (pair != null) {
+//                view.removeTextChangedListener(pair.second);
+//            }
+//            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+//                @Override
+//                public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                    if (untMisField != null) untMisField.set(s.toString());
+//                }
+//            };
+//            view.setTag(R.id.bound_observable, new Pair<>(untMisField, watcher));
+//            view.addTextChangedListener(watcher);
+//        }
+//        String newValue = untMisField != null && untMisField.get() != null ? Objects.requireNonNull(untMisField.get()).getUntMis() : "";
+//        if (!view.getText().toString().equals(newValue)) {
+//            view.setText(newValue);
+//        }
+//    }
 }

app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.di.binders;
 
 import androidx.databinding.BindingAdapter;
+
 import com.google.android.material.textfield.TextInputLayout;
 
 public class TextInputLayoutBinders {

app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java

@@ -1,14 +1,15 @@
 package it.integry.integrywmsnative.core.di.binders.recyclerview;
 
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
 import androidx.databinding.ViewDataBinding;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;

app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java

@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+import java.math.BigDecimal;
+
+public class GreaterThenValidator  implements Validator<BigDecimal> {
+    private final String errorMessage;
+    private final BigDecimal greaterThanValue;
+
+    public GreaterThenValidator(BigDecimal greaterThanValue, String errorMessage) {
+        this.greaterThanValue = greaterThanValue;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(BigDecimal value) {
+        return value != null && value.compareTo(greaterThanValue) > 0;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java

@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class MinLengthValidator implements Validator<String> {
+    private final int minLength;
+    private final String errorMessage;
+
+    public MinLengthValidator(int minLength, String errorMessage) {
+        this.minLength = minLength;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && value.length() >= minLength;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotEmptyValidator implements Validator<String> {
+    private final String errorMessage;
+
+    public NotEmptyValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && !value.trim().isEmpty();
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotNullValidator<T> implements Validator<T>{
+    private final String errorMessage;
+
+    public NotNullValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(T value) {
+        return value != null;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public interface Validator<T> {
+    boolean isValid(T value);
+
+    String getErrorMessage();
+}

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

@@ -0,0 +1,127 @@
+package it.integry.integrywmsnative.core.ean128;
+
+public enum Ean128AI {
+
+
+    NULL,       //Valore nullo (usato solo in logica)
+    SSCC,       //Numero sequenziale del collo                                        n2+n18
+    GTIN,       //Codice EAN/UCC unità logistica                                      n2+n14
+    CONTENT,    //Codice EAN/UCC dei prodotti contenuti all'interno di unità log      n2+n14
+    BATCH_LOT,  //Numero del lotto di fabbricazione                                   n2+an.20
+    PROD_DATE,  //Data di produzione (yymmdd) 0~50 (2000~2050) - 51~99 (1951~1999)    n2+n6
+    DUE_DATE,   //Data di scadenza pagamento fattura                                  n2+n6
+    PACK_DATE,  //Data di confezionamento                                             n2+n6
+    BEST_BEFORE,//Data minima di validità                                             n2+n6
+    EXPIRY,     //Data massima di validità                                            n2+n6
+    VARIANT,    //Variante di prodotto - uso interno aziendale                        n2+n2
+    SERIAL,     //Numero di serie                                                     n2+an.20
+    QTY_DATE_BATCH, //Dati supplementari per prodotti farmaceutici                    n2+an.29
+    ADDITIONAL_ID,  //Numedi di identificazione supplementare del prodotto            n3+an.30
+    CUST_PART_NO,   //Codice prodotto interno del cliente                             n3+an.30
+    SECONDARY_SERIAL, //Numero di serie secondario                                    n3+an.30
+    REF_TO_SOURCE,  //Entità di origine o marca auricolare                            n3+an.30
+    VAR_COUNT,      //Quantità variabile                                              n2+n.8
+
+    //Misure commerciali e logistiche       FORMATO: n4+n6
+    NET_WEIGHT_KG,  //Peso netto in Kg
+    LENGTH_M,       //Lunghezza o 1° dimensione, in mt, uso commerciale
+    WIDTH_M,        //Larghezza, diametro o 2° dimensione, in mt, uso commerciale
+    HEIGHT_M,       //Profondità, spessore, altezza o 3° dimensione, in mt, uso commerciale
+    AREA_M2,        //Superficie, in metriquadri, uso commerciale
+    NET_VOLUME_L,   //Volume, in litri, uso commerciale
+    NET_VOLUME_M3,  //Volume, in metricubi, uso commerciale
+    NET_WEIGHT_LB,  //Peso netto, in libbre, uso commerciale
+    LENGTH_I,       //Lunghezza o 1° dimensione, in pollici, uso commerciale
+    LENGTH_F,       //Lunghezza o 1° dimensione, in piedi, uso commerciale
+    LENGTH_Y,       //Lunghezza o 1° dimensione, in yards, uso commerciale
+    WIDTH_I,        //Larghezza, diametro o 2° dimensione, in pollici, uso commerciale
+    WIDTH_F,        //Larghezza, diametro o 2° dimensione, in piedi, uso commerciale
+    WIDTH_Y,        //Larghezza, diametro o 2° dimensione, in yards, uso commerciale
+    HEIGHT_I,       //Profondità, spessore, altezza o 3° dimensione, in pollici, uso commerciale
+    HEIGHT_F,       //Profondità, spessore, altezza o 3° dimensione, in piedi, uso commerciale
+    HEIGHT_Y,       //Profondità, spessore, altezza o 3° dimensione, in yards, uso commerciale
+    CROSSWEIGHT_KG_LOG, //Peso lordo, in Kg, uso logistico
+    LENGTH_M_LOG,   //Lunghezza o 1° dimensione, in metri, uso logistico
+    WIDTH_M_LOG,    //Larghezza, diametro o 2° dimensione, in metri, uso logistico
+    HEIGHT_M_LOG,   //Profondità, spessore, altezza o 3° dimensione, in metri, uso logistico
+    AREA_M2_LOG,    //Superficie, in metriquadri, uso logistico
+    VOLUME_L_LOG,   //Volume lordo, in litri, uso logistico
+    VOLUME_M3_LOG,  //Volume lordo, in metricubi, uso logistico
+    CROSSWEIGHT_LB_LOG, //Peso lordo, in libbre, uso logistico
+    LENGTH_I_LOG,   //Lunghezza o 1° dimensione, in pollici, uso logistico
+    LENGTH_F_LOG,   //Lunghezza o 1° dimensione, in piedi, uso logistico
+    LENGTH_Y_LOG,   //Lunghezza o 1° dimensione, in yards, uso logistico
+    WIDTH_I_LOG,    //Larghezza, diametro o 2° dimensione, in pollici, uso logistico
+    WIDTH_F_LOG,    //Larghezza, diametro o 2° dimensione, in piedi, uso logistico
+    WIDTH_Y_LOG,    //Larghezza, diametro o 2° dimensione, in yards, uso logistico
+    HEIGHT_I_LOG,   //Profondità, spessore, altezza o 3° dimensione, in pollici, uso logistico
+    HEIGHT_F_LOG,   //Profondità, spessore, altezza o 3° dimensione, in piedi, uso logistico
+    HEIGHT_Y_LOG,   //Profondità, spessore, altezza o 3° dimensione, in yards, uso logistico
+    AREA_I2,        //Superficie, in pollici quadrati, uso commerciale
+    AREA_F2,        //Superficie, in piedi quadrati, uso commerciale
+    AREA_Y2,        //Superficie, in yards quadrati, uso commerciale
+    AREA_I2_LOG,    //Superficie, in pollici quadrati, uso logistico
+    AREA_F2_LOG,    //Superficie, in piedi quadrati, uso logistico
+    AREA_Y2_LOG,    //Superficie, in yards quadrati, uso logistico
+    NET_WEIGHT_T,   //Peso netto, in once troy, uso commerciale
+    NET_VOLUME_OZ,  //Volume netto, in once (U.S.), uso commerciale
+    NET_VOLUME_LB,  //Volume netto, in quarti di gallone, uso commerciale
+    NET_VOLUME_G,   //Volume netto, in galloni (U.S.), uso commerciale
+    VOLUME_Q_LOG,   //Volume lordo, in quarti di gallone, uso logistico
+    VOLUME_G_LOG,   //Volume lordo, in galloni (U.S.), uso logistico
+    NET_VOLUME_I3,  //Volume netto, in pollici cubi, uso commerciale
+    NET_VOLUME_F3,  //Volume netto, in piedi cubi, uso commerciale
+    NET_VOLUME_Y3,  //Volume netto, in yards cubi, uso commerciale
+    VOLUME_I3_LOG,  //Volume lordo, in pollici cubi, uso logistico
+    VOLUME_F3_LOG,  //Volume lordo, in piedi cubi, uso logistico
+    VOLUME_Y3_LOG,  //Volume lordo, in yards cubi, uso logistico
+    COUNT,          //Quantità prodotti contenuti in un'unità logistica
+    AMOUNT,         //Importo da pagare singola area monetaria
+    AMOUNT_ISO,     //Importo da pagare con codice valuta ISO
+    PRICE,          //Importo da pagare singola unità monetaria (prodotti a peso variabile)
+    PRICE_ISO,      //Importo da pagare con codice valuta ISO (prodotti a peso variabile)
+    ORDER_NUMBER,   //Numero d'ordine d'acquisto cliente
+    CONSIGNMENT,    //Numero di consegna
+    SHIPMENT_NO,    //Numero di spedizione
+    ROUTE,          //Codice di smistamento pacchi
+    SHIP_TO_LOC,    //Codice di locazione EAN/UCC "Spedire a, Consegnare a"
+    BILL_TO_LOC,    //Codice di locazione EAN/UCC "Fatturare a"
+    PURCHASE_FROM_LOC, //Codice di locazione EAN/UCC "Acquistato da"
+    SHIP_FOR_LOC,   //Codice di locazione EAN/UCC "Sperdire per, Consegnare per, Inoltrare a"
+    LOC_NO,         //Codice di locazione EAN/UCC: identificazione di una locazione fisica
+    PAY_TO_LOC,     //Codice di locazione EAN/UCC di chi emette la fattura
+    SHIP_TO_POST,   //Codice postale "Spedire a, Consegnare a" (nazionale)
+    SHIP_TO_POST_ISO, //Codice postale "Spedire a, Consegnare a" con codice nazione ISO
+    ORIGIN,         //Paese di origine del prodotto
+    COUNTRY_INITIAL_PROCESS, //Paese di lavorazione iniziale del prodotto con codice nazionale ISO
+    COUNTRY_PROCESS,  //Paese di lavorazione con codice nazionale ISO
+    COUNTRY_DISASSEMBLY, //Paese di scomposizione con codice nazionale ISO
+    COUNTRY_FULL_PROCESS,//Paese di lavorazione completa con codice nazionale ISO
+    NSN,            //Numero di stock NATO
+    MEAT_CUT,       //Carcasse animali e classificazione dei tagli UN/ECE
+    PROCESSORS,     //Numero di approvazione del laboratorio di lavorazione intermedio con codice nazionale ISO
+    DIMENSIONS,     //Prodotti in rotoli - larghezza, lunghezza, diametro interno, senso di svolgimento e giunte
+    CMT_NO,         //Numero sequenziale elettronico per applicazioni di telefonia cellulare
+    GRAI,           //Numero di identificazione per beni a rendere,
+    GIAI,           //Numero di identificazione globale per beni individuali
+    PRICE_PER_UNIT, //Prezzo per unità di misura
+    GCTIN,          //Identificazione dei componenti di un prodotto
+    IBAN,           //Numero di contocorrente bancario internazionale
+    PROD_TIME,      //Data e ora di produzione
+    GSRN,           //Numedo Globale di Relazione di Servizio
+    REF_NO,         //Numero del bollettino di pagamento
+    COUPON_1,       //Codice esteso per i coupons, UCC
+    COUPON_2,       //Codice esteso per i coupons, UCC
+    COUPON_3,       //Codice esteso per i coupons, UCC
+    INTERNAL_PART,  //Informazioni concordate tra i partners commerciali
+    INTERNAL_1,     //Informazioni interne
+    INTERNAL_2,     //Informazioni interne
+    INTERNAL_3,     //Informazioni interne
+    INTERNAL_4,     //Informazioni interne
+    INTERNAL_5,     //Informazioni interne
+    INTERNAL_6,     //Informazioni interne
+    INTERNAL_7,     //Informazioni interne
+    INTERNAL_8,     //Informazioni interne
+    INTERNAL_9,     //Informazioni interne
+
+}

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

@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.ean128;
+
+public class Ean128AIModel implements Cloneable {
+
+
+    public Ean128AI AI;
+
+    public String code;
+
+    public int dataLength;
+
+    public boolean flagVariableLength;
+
+    public boolean flagOnlyNumeric;
+
+    public int decimalDigits;
+
+    public Ean128AIModel(Ean128AI AI, String code, int dataLength, boolean flagVariableLength, boolean flagOnlyNumeric, int decimalDigits) {
+        this.AI = AI;
+        this.code = code;
+        this.dataLength = dataLength;
+        this.flagVariableLength = flagVariableLength;
+        this.flagOnlyNumeric = flagOnlyNumeric;
+        this.decimalDigits = decimalDigits;
+    }
+
+    public Ean128AIModel(Ean128AI AI, String code, int dataLength, boolean flagVariableLength, boolean flagOnlyNumeric) {
+        this.AI = AI;
+        this.code = code;
+        this.dataLength = dataLength;
+        this.flagVariableLength = flagVariableLength;
+        this.flagOnlyNumeric = flagOnlyNumeric;
+    }
+
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+
+
+}

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

@@ -0,0 +1,209 @@
+package it.integry.integrywmsnative.core.ean128;
+
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Ean128AIModelBij {
+
+    private final Ean128AIModel[] _aiModelArray = new Ean128AIModel[]{
+            new Ean128AIModel(Ean128AI.SSCC, "^00", 18, false, true),
+            new Ean128AIModel(Ean128AI.GTIN, "^01", 14, false, true),
+            new Ean128AIModel(Ean128AI.CONTENT, "^02", 14, false, true),
+            new Ean128AIModel(Ean128AI.BATCH_LOT, "^10", 20, true, false),
+            new Ean128AIModel(Ean128AI.PROD_DATE, "^11", 6, false, true),
+            new Ean128AIModel(Ean128AI.DUE_DATE, "^12", 6, false, true),
+            new Ean128AIModel(Ean128AI.PACK_DATE, "^13", 6, false, true),
+            new Ean128AIModel(Ean128AI.BEST_BEFORE, "^15", 6, false, true),
+            new Ean128AIModel(Ean128AI.EXPIRY, "^17", 6, false, true),
+            new Ean128AIModel(Ean128AI.VARIANT, "^20", 2, false, true),
+            new Ean128AIModel(Ean128AI.SERIAL, "^21", 20, true, false),
+            new Ean128AIModel(Ean128AI.QTY_DATE_BATCH, "^22", 29, true, false),
+            new Ean128AIModel(Ean128AI.ADDITIONAL_ID, "^240", 30, true, false),
+            new Ean128AIModel(Ean128AI.CUST_PART_NO, "^241", 30, true, false),
+            new Ean128AIModel(Ean128AI.SECONDARY_SERIAL, "^250", 30, true, false),
+            new Ean128AIModel(Ean128AI.REF_TO_SOURCE, "^251", 30, true, false),
+            new Ean128AIModel(Ean128AI.VAR_COUNT, "^30", 8, true, true),
+            new Ean128AIModel(Ean128AI.NET_WEIGHT_KG, "^310(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_M, "^311(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_M, "^312(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_M, "^313(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_M2, "^314(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_L, "^315(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_M3, "^316(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_WEIGHT_LB, "^320(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_I, "^321(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_F, "^322(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_Y, "^323(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_I, "^324(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_F, "^325(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_Y, "^326(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_I, "^327(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_F, "^328(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_Y, "^329(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.CROSSWEIGHT_KG_LOG, "^330(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_M_LOG, "^331(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_M_LOG, "^332(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_M_LOG, "^333(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_M2_LOG, "^334(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_L_LOG, "^335(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_M3_LOG, "^336(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.CROSSWEIGHT_LB_LOG, "^340(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_I_LOG, "^341(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_F_LOG, "^342(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.LENGTH_Y_LOG, "^343(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_I_LOG, "^344(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_F_LOG, "^345(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.WIDTH_Y_LOG, "^346(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_I_LOG, "^347(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_F_LOG, "^348(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.HEIGHT_Y_LOG, "^349(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_I2, "^350(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_F2, "^351(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_Y2, "^352(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_I2_LOG, "^353(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_F2_LOG, "^354(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.AREA_Y2_LOG, "^355(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_WEIGHT_T, "^356(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_OZ, "^357(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_LB, "^360(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_G, "^361(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_Q_LOG, "^362(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_G_LOG, "^363(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_I3, "^364(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_F3, "^365(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.NET_VOLUME_Y3, "^366(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_I3_LOG, "^367(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_F3_LOG, "^368(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.VOLUME_Y3_LOG, "^369(\\d{1})", 6, false, true),
+            new Ean128AIModel(Ean128AI.COUNT, "^37", 8, true, true),
+            new Ean128AIModel(Ean128AI.AMOUNT, "^390(\\d{1})", 15, true, true),
+            new Ean128AIModel(Ean128AI.AMOUNT_ISO, "^391(\\d{1})", 18, true, true),
+            new Ean128AIModel(Ean128AI.PRICE, "^392(\\d{1})", 15, true, true),
+            new Ean128AIModel(Ean128AI.PRICE_ISO, "^393(\\d{1})", 18, true, true),
+            new Ean128AIModel(Ean128AI.ORDER_NUMBER, "^400", 30, true, false),
+            new Ean128AIModel(Ean128AI.CONSIGNMENT, "^401", 30, true, false),
+            new Ean128AIModel(Ean128AI.SHIPMENT_NO, "^402", 17, false, true),
+            new Ean128AIModel(Ean128AI.ROUTE, "^403", 30, true, false),
+            new Ean128AIModel(Ean128AI.SHIP_TO_LOC, "^410", 13, false, true),
+            new Ean128AIModel(Ean128AI.BILL_TO_LOC, "^411", 13, false, true),
+            new Ean128AIModel(Ean128AI.PURCHASE_FROM_LOC, "^412", 13, false, true),
+            new Ean128AIModel(Ean128AI.SHIP_FOR_LOC, "^413", 13, false, true),
+            new Ean128AIModel(Ean128AI.LOC_NO, "^414", 13, false, true),
+            new Ean128AIModel(Ean128AI.PAY_TO_LOC, "^415", 13, false, true),
+            new Ean128AIModel(Ean128AI.SHIP_TO_POST, "^420", 20, true, false),
+            new Ean128AIModel(Ean128AI.SHIP_TO_POST_ISO, "^421", 12, true, false),
+            new Ean128AIModel(Ean128AI.ORIGIN, "^422", 3, false, true),
+            new Ean128AIModel(Ean128AI.COUNTRY_INITIAL_PROCESS, "^423", 15, true, true),
+            new Ean128AIModel(Ean128AI.COUNTRY_PROCESS, "^424", 3, false, true),
+            new Ean128AIModel(Ean128AI.COUNTRY_DISASSEMBLY, "^425", 3, false, true),
+            new Ean128AIModel(Ean128AI.COUNTRY_FULL_PROCESS, "^426", 3, false, true),
+            new Ean128AIModel(Ean128AI.NSN, "^7001", 13, false, true),
+            new Ean128AIModel(Ean128AI.MEAT_CUT, "^7002", 30, true, false),
+            new Ean128AIModel(Ean128AI.DIMENSIONS, "^8001", 14, false, true),
+            new Ean128AIModel(Ean128AI.CMT_NO, "^8002", 20, true, false),
+            new Ean128AIModel(Ean128AI.GRAI, "^8003", 30, true, false),
+            new Ean128AIModel(Ean128AI.GIAI, "^8004", 30, true, false),
+            new Ean128AIModel(Ean128AI.PRICE_PER_UNIT, "^8005", 6, false, true),
+            new Ean128AIModel(Ean128AI.GCTIN, "^8006", 18, false, false),
+            new Ean128AIModel(Ean128AI.IBAN, "^8007", 30, true, false),
+            new Ean128AIModel(Ean128AI.PROD_TIME, "^8008", 12, true, true),
+            new Ean128AIModel(Ean128AI.GSRN, "^8018", 18, false, true),
+            new Ean128AIModel(Ean128AI.REF_NO, "^8020", 25, true, false),
+            new Ean128AIModel(Ean128AI.COUPON_1, "^8100", 6, false, true),
+            new Ean128AIModel(Ean128AI.COUPON_2, "^8101", 10, false, true),
+            new Ean128AIModel(Ean128AI.COUPON_3, "^8102", 2, false, true),
+            new Ean128AIModel(Ean128AI.INTERNAL_PART, "^90", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_1, "^91", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_2, "^92", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_3, "^93", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_4, "^94", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_5, "^95", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_6, "^96", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_7, "^97", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_8, "^98", 30, true, false),
+            new Ean128AIModel(Ean128AI.INTERNAL_9, "^99", 30, true, false)
+    };
+
+
+    public int checkAI(String aiToCheck) {
+        int count = -1;
+
+        if (aiToCheck.length() > 1) {
+            for (int i = 0; i < _aiModelArray.length; i++) {
+                final String groupSeparatorCharInHexForRegex = "\\x1D";
+                String codePattern = "";
+
+                if (aiToCheck.charAt(0) == (char) 29) {
+                    codePattern += groupSeparatorCharInHexForRegex;
+                }
+
+                codePattern += _aiModelArray[i].code;
+
+
+                Pattern pattern = Pattern.compile(codePattern, Pattern.CASE_INSENSITIVE);
+                Matcher matcher = pattern.matcher(aiToCheck);
+
+
+                if (matcher.find()) {
+                    count = i;
+                    MatchResult matchResult = matcher.toMatchResult();
+
+                    if (matchResult.groupCount() >= 1) {
+                        String digitsString = matchResult.group(1);
+                        _aiModelArray[i].decimalDigits = Integer.parseInt(digitsString);
+                    }
+
+                    break;
+                }
+
+            }
+
+        }
+        return count;
+    }
+
+
+    public Ean128AIModel readAI(String aiToSearch) {
+
+        Ean128AIModel barcodeAIModel = null;
+
+        for (Ean128AIModel singleBarcodeAIModel : _aiModelArray) {
+            final String groupSeparatorCharInHexForRegex = "\\x1D";
+            String codePattern = "";
+
+            if (aiToSearch.charAt(0) == (char) 29) {
+                codePattern += groupSeparatorCharInHexForRegex;
+            }
+
+            codePattern += singleBarcodeAIModel.code;
+
+
+            Pattern pattern = Pattern.compile(codePattern, Pattern.CASE_INSENSITIVE);
+            Matcher matcher = pattern.matcher(aiToSearch);
+
+            if (matcher.matches()) {
+                try {
+                    barcodeAIModel = (Ean128AIModel) singleBarcodeAIModel.clone();
+
+                    MatchResult matchResult = matcher.toMatchResult();
+
+                    if (matchResult.groupCount() > 1) {
+                        String digitsString = matchResult.group(1);
+                        barcodeAIModel.decimalDigits = Integer.parseInt(digitsString);
+                    }
+                    break;
+                } catch (CloneNotSupportedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return barcodeAIModel;
+    }
+
+    public Ean128AIModel getAI(int index) {
+        return _aiModelArray[index];
+    }
+
+}

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

@@ -0,0 +1,8 @@
+package it.integry.integrywmsnative.core.ean128;
+
+public class Ean128ISOValueModel<T> {
+
+    public String ISOCode;
+    public T Value;
+
+}

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

@@ -0,0 +1,331 @@
+package it.integry.integrywmsnative.core.ean128;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.base.Callable;
+import it.integry.integrywmsnative.core.base.CallableII;
+import it.integry.integrywmsnative.core.rest.model.Ean128Model;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class Ean128Service {
+
+    public Ean128Model decode(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        byte[] inputEan128ByteArr = barcodeScanDTO.getStringValue().replaceAll("" + ((char) 29), "|").getBytes();
+        Ean128AIModelBij ean128AIModelBij = new Ean128AIModelBij();
+
+        String aiCodeBuffer = "";
+
+        Ean128Model model = new Ean128Model();
+
+        for (int i = 0; i < inputEan128ByteArr.length; i++) {
+            aiCodeBuffer += (char) inputEan128ByteArr[i];
+
+            if (aiCodeBuffer.startsWith("|")) {
+                aiCodeBuffer = aiCodeBuffer.substring(1);
+            }
+
+            if (aiCodeBuffer.length() <= 5) {
+                int aiIndex = ean128AIModelBij.checkAI(aiCodeBuffer);
+
+                if (aiIndex != -1) {
+
+                    Ean128AIModel aiModel = ean128AIModelBij.getAI(aiIndex);
+
+                    StringBuilder aiValue = new StringBuilder();
+
+                    if (!aiModel.flagVariableLength) {
+
+                        for (int j = (i + 1); j < (i + 1) + aiModel.dataLength; j++) {
+                            aiValue.append((char) inputEan128ByteArr[j]);
+                        }
+
+                        //aiValue = barcodeAsString.Substring(i + 1, aiModel.DataLength);
+                        i += aiModel.dataLength;
+                    } else {
+                        String tempBuffer = "";
+
+                        i++;
+
+                        while (i < inputEan128ByteArr.length && i < (aiModel.dataLength + i)) {
+                            byte currentChar = inputEan128ByteArr[i];
+
+                            if (currentChar != 29 && currentChar != '|') { //Controllo carattere FNC1
+                                tempBuffer += (char) currentChar;
+                            } else {
+                                break;
+                            }
+
+                            i++;
+                        }
+
+                        aiValue = new StringBuilder(tempBuffer.replace("\r", "").replace("\n", ""));
+                    }
+
+                    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 -> {
+                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                                aiValue = new StringBuilder(aiValue.substring(1));
+                            }
+                            model.Gtin = aiValue.toString();
+                        }
+                        case CONTENT -> {
+                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                                aiValue = new StringBuilder(aiValue.substring(1));
+                            }
+                            model.Content = aiValue.toString();
+                        }
+                        case BATCH_LOT -> model.BatchLot = aiValue.toString();
+                        case PROD_DATE -> model.ProdDate = convertToDateTime(aiValue.toString());
+                        case DUE_DATE -> model.DueDate = convertToDateTime(aiValue.toString());
+                        case PACK_DATE -> model.PackDate = convertToDateTime(aiValue.toString());
+                        case BEST_BEFORE ->
+                                model.BestBefore = UtilityDate.formatDate(convertToDateTime(aiValue.toString()), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+                        case EXPIRY -> model.Expiry = UtilityDate.formatDate(convertToDateTime(aiValue.toString()), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+                        case VARIANT -> model.Variant = aiValue.toString();
+                        case SERIAL -> model.Serial = aiValue.toString();
+                        case QTY_DATE_BATCH -> model.QtyDateBatch = aiValue.toString();
+                        case ADDITIONAL_ID -> model.AdditionalID = aiValue.toString();
+                        case CUST_PART_NO -> model.CustPartNumber = aiValue.toString();
+                        case SECONDARY_SERIAL -> model.SecondarySerial = aiValue.toString();
+                        case REF_TO_SOURCE -> model.RefToSource = aiValue.toString();
+                        case VAR_COUNT -> model.VarCount = aiValue.toString();
+                        case NET_WEIGHT_KG ->
+                                model.NetWeightKg = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_M ->
+                                model.LengthM = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_M ->
+                                model.WidthM = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_M ->
+                                model.HeightM = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_M2 ->
+                                model.AreaM2 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_L ->
+                                model.NetVolumeL = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_M3 ->
+                                model.NetVolumeM3 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_WEIGHT_LB ->
+                                model.NetWeightLb = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_I ->
+                                model.LengthI = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_F ->
+                                model.LengthF = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_Y ->
+                                model.LengthY = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_I ->
+                                model.WidthI = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_F ->
+                                model.WidthF = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_Y ->
+                                model.WidthY = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_I ->
+                                model.HeightI = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_F ->
+                                model.HeightF = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_Y ->
+                                model.HeightY = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case CROSSWEIGHT_KG_LOG ->
+                                model.CrossweightKgLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case CROSSWEIGHT_LB_LOG ->
+                                model.CrossweightLbLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_M_LOG ->
+                                model.LengthMLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_M_LOG ->
+                                model.WidthMLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_M_LOG ->
+                                model.HeigthMLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_M2_LOG ->
+                                model.AreaM2Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_L_LOG ->
+                                model.VolumeLLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_M3_LOG ->
+                                model.VolumeM3Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_I_LOG ->
+                                model.LengthILog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_F_LOG ->
+                                model.LengthFLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case LENGTH_Y_LOG ->
+                                model.LengthYLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_I_LOG ->
+                                model.WidthILog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_F_LOG ->
+                                model.WidthFLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case WIDTH_Y_LOG ->
+                                model.WidthYLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_I_LOG ->
+                                model.HeigthILog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_F_LOG ->
+                                model.HeigthFLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case HEIGHT_Y_LOG ->
+                                model.HeigthYLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_I2 ->
+                                model.AreaI2 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_F2 ->
+                                model.AreaF2 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_Y2 ->
+                                model.AreaY2 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_I2_LOG ->
+                                model.AreaI2Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_F2_LOG ->
+                                model.AreaF2Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AREA_Y2_LOG ->
+                                model.AreaY2Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_WEIGHT_T ->
+                                model.NetWeightT = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_OZ ->
+                                model.NetVolumeOz = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_LB ->
+                                model.NetVolumeLb = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_G ->
+                                model.NetVolumeG = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_Q_LOG ->
+                                model.VolumeQLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_G_LOG ->
+                                model.VolumeGLog = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_I3 ->
+                                model.NetVolumeI3 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_F3 ->
+                                model.NetVolumeF3 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case NET_VOLUME_Y3 ->
+                                model.NetVolumeY3 = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_I3_LOG ->
+                                model.VolumeI3Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_F3_LOG ->
+                                model.VolumeF3Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case VOLUME_Y3_LOG ->
+                                model.VolumeY3Log = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case COUNT -> model.Count = Integer.parseInt(aiValue.toString());
+                        case AMOUNT ->
+                                model.Amount = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case AMOUNT_ISO ->
+                                model.AmountISO = convertToIsoValueModel(aiValue.toString(), aiModel.decimalDigits,
+                                        Double::parseDouble,
+                                        (input, input2) -> String.valueOf(convertToDecimalString(input, input2)));
+                        case PRICE ->
+                                model.Price = convertToDecimalString(aiValue.toString(), aiModel.decimalDigits);
+                        case PRICE_ISO ->
+                                model.PriceISO = convertToIsoValueModel(aiValue.toString(), aiModel.decimalDigits,
+                                        Double::parseDouble,
+                                        (input, input2) -> String.valueOf(convertToDecimalString(input, input2)));
+                        case ORDER_NUMBER -> model.OrderNumber = aiValue.toString();
+                        case CONSIGNMENT -> model.Consignment = aiValue.toString();
+                        case SHIPMENT_NO -> model.ShipmentNo = aiValue.toString();
+                        case ROUTE -> model.Route = aiValue.toString();
+                        case SHIP_TO_LOC -> model.ShipToLoc = aiValue.toString();
+                        case BILL_TO_LOC -> model.BillToLoc = aiValue.toString();
+                        case PURCHASE_FROM_LOC -> model.PurchaseFromLoc = aiValue.toString();
+                        case SHIP_FOR_LOC -> model.ShipForLoc = aiValue.toString();
+                        case LOC_NO -> model.LocationNumber = aiValue.toString();
+                        case PAY_TO_LOC -> model.PayToLoc = aiValue.toString();
+                        case SHIP_TO_POST -> model.ShipToPost = aiValue.toString();
+                        case SHIP_TO_POST_ISO ->
+                                model.ShipToPostISO = convertToIsoValueModel(aiValue.toString(), 0,
+                                        new Callable<>() {
+                                            @Override
+                                            public String call(String input) {
+                                                return input;
+                                            }
+                                        },
+                                        new CallableII<>() {
+                                            @Override
+                                            public String call(String input, Integer input2) {
+                                                return input;
+                                            }
+                                        });
+                        case ORIGIN -> model.Origin = aiValue.toString();
+                        case COUNTRY_INITIAL_PROCESS ->
+                                model.ShipToPostISO = convertToIsoValueModel(aiValue.toString(), 0,
+                                        input -> input,
+                                        (input, input2) -> input);
+                        case COUNTRY_PROCESS -> model.CountryProcess = aiValue.toString();
+                        case COUNTRY_DISASSEMBLY -> model.CountryDisassembly = aiValue.toString();
+                        case COUNTRY_FULL_PROCESS -> model.CountryFullProcess = aiValue.toString();
+                        case NSN -> model.NSN = aiValue.toString();
+                        case MEAT_CUT -> model.MeatCut = aiValue.toString();
+                        case DIMENSIONS -> model.Dimensions = aiValue.toString();
+                        case CMT_NO -> model.CmtNo = aiValue.toString();
+                        case GRAI -> model.Grai = aiValue.toString();
+                        case GIAI -> model.Giai = aiValue.toString();
+                        case PRICE_PER_UNIT -> model.PricePerUnit = aiValue.toString();
+                        case GCTIN -> model.Gctin = aiValue.toString();
+                        case IBAN -> model.Iban = aiValue.toString();
+                        case PROD_TIME -> model.ProdTime = convertToDateTime(aiValue.toString());
+                        case GSRN -> model.Gsrn = aiValue.toString();
+                        case REF_NO -> model.RefNo = aiValue.toString();
+                        case COUPON_1 -> model.Coupon1 = aiValue.toString();
+                        case COUPON_2 -> model.Coupon2 = aiValue.toString();
+                        case COUPON_3 -> model.Coupon3 = aiValue.toString();
+                        case INTERNAL_PART -> model.InternalPart = aiValue.toString();
+                        case INTERNAL_1 -> model.Internal1 = aiValue.toString();
+                        case INTERNAL_2 -> model.Internal2 = aiValue.toString();
+                        case INTERNAL_3 -> model.Internal3 = aiValue.toString();
+                        case INTERNAL_4 -> model.Internal4 = aiValue.toString();
+                        case INTERNAL_5 -> model.Internal5 = aiValue.toString();
+                        case INTERNAL_6 -> model.Internal6 = aiValue.toString();
+                        case INTERNAL_7 -> model.Internal7 = aiValue.toString();
+                        case INTERNAL_8 -> model.Internal8 = aiValue.toString();
+                        case INTERNAL_9 -> model.Internal9 = aiValue.toString();
+                        default -> {
+                        }
+                    }
+
+                    aiCodeBuffer = "";
+                }
+            } else {
+                throw new Exception(String.format("Il barcode non è un EAN128 valido (%s)", new String(inputEan128ByteArr)));
+            }
+        }
+
+        return model;
+    }
+
+
+    private float convertToDecimalString(String sourceString, int numberOfdecimalDigits) {
+
+        int divider = (int) Math.pow(10, numberOfdecimalDigits);
+
+        return Float.parseFloat(sourceString) / divider;
+    }
+
+    private <T> Ean128ISOValueModel<T> convertToIsoValueModel(String sourceString, int numberOfDecimalDigits, Callable<String, T> castFunc, CallableII<String, Integer, String> splitFunc) {
+        String isoCode = sourceString.substring(0, 3);
+
+        T value = castFunc.call(splitFunc.call(sourceString.substring(3), numberOfDecimalDigits));
+
+        Ean128ISOValueModel<T> isoModel = new Ean128ISOValueModel<>();
+        isoModel.ISOCode = isoCode;
+        isoModel.Value = value;
+
+        return isoModel;
+    }
+
+    private Date convertToDateTime(String sourceString) {
+        int year = Integer.parseInt(sourceString.substring(0, 2));
+
+        //Se l'anno è minore di 50 indica 2000-2050 altrimenti 1951-1999
+        int correctedYear = year <= 50 ? (2000 + year) : (1900 + year);
+
+        int month = Integer.parseInt(sourceString.substring(2, 4));
+        int day = Integer.parseInt(sourceString.substring(4, 6));
+
+        Date d = null;
+
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
+            d = formatter.parse(day + "/" + month + "/" + correctedYear);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return d;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/event/SessionExpiredEvent.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.event;
+
+public class SessionExpiredEvent {
+}

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

@@ -0,0 +1,10 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class EmptyOrderException extends Exception {
+    public EmptyOrderException() {
+        super(UtilityResources.getString(R.string.empty_order));
+    }
+}

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

@@ -0,0 +1,10 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class ExpiredProductListException extends Exception {
+    public ExpiredProductListException() {
+        super(UtilityResources.getString(R.string.expired_list_session));
+    }
+}

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

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class GridNotSelectedException extends Exception {
+
+    public GridNotSelectedException() {
+        super(UtilityResources.getString(R.string.grid_not_selected));
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class InvalidCodMdepException extends Exception {
+    public InvalidCodMdepException() {
+        super(UtilityResources.getString(R.string.invalid_codmdep));
+    }
+}

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

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class InvalidLineaProdBarcodeException extends Exception {
+
+    public InvalidLineaProdBarcodeException() {
+        super(UtilityResources.getString(R.string.no_result_from_linea_prod_barcode));
+    }
+
+    public InvalidLineaProdBarcodeException(String barcode) {
+        super(UtilityResources.getString(R.string.no_result_from_linea_prod_barcode) + " (" + barcode + ")");
+    }
+}

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

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class InvalidProductOrderedException extends Exception {
+
+    public InvalidProductOrderedException() {
+        super(UtilityResources.getString(R.string.invalid_product_ordered));
+    }
+
+    public InvalidProductOrderedException(String product) {
+        super(UtilityResources.getString(R.string.invalid_product_ordered) + " (" + product + ")");
+    }
+}

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

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class MaxQtyExceededException extends Exception {
+
+    public MaxQtyExceededException() {
+        super(UtilityResources.getString(R.string.max_qty_exceeded));
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class MultipleResultFromBarcodeException extends Exception {
+
+    public MultipleResultFromBarcodeException() {
+        super(UtilityResources.getString(R.string.multiple_results_from_barcode));
+    }
+
+    public MultipleResultFromBarcodeException(String barcode) {
+        super(UtilityResources.getString(R.string.multiple_results_from_barcode) + " (" + barcode + ")");
+    }
+}

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

@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class NoOrdersScheduledException extends Exception {
+
+    public NoOrdersScheduledException() {
+        super(UtilityResources.getString(R.string.no_orders_scheduled));
+    }
+}

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

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class NoResultFromCodMartException extends Exception {
+
+    public NoResultFromCodMartException() {
+        super(UtilityResources.getString(R.string.no_result_from_cod_mart));
+    }
+
+    public NoResultFromCodMartException(String codMart) {
+        super(UtilityResources.getString(R.string.no_result_from_cod_mart) + " (" + codMart + ")");
+    }
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class UnauthorizedAccessException extends Exception {
+    public UnauthorizedAccessException() {
+        super("Accesso non autorizzato. Si prega di effettuare nuovamente l'accesso e riprovare");
+    }
+}

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

@@ -6,6 +6,8 @@ import android.view.KeyEvent;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -18,7 +20,8 @@ public class BaseActivity extends AppCompatActivity {
     @Inject
     public DialogProgressView mCurrentProgress;
 
-    private boolean progressOpened;
+    @Inject
+    public ExecutorService executorService;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -47,24 +50,19 @@ public class BaseActivity extends AppCompatActivity {
     }
 
 
+
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
-            this.progressOpened = true;
-            runOnUiThread(() -> {
-                this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-            });
-        }
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
     @Override

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

@@ -2,15 +2,11 @@ package it.integry.integrywmsnative.core.expansion;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.view.KeyEvent;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 
 public class BaseDialog extends Dialog {
 

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -12,6 +13,8 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -19,14 +22,30 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
-public class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
+public abstract class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
 
     @Inject
     public DialogProgressView mCurrentProgress;
-    private boolean progressOpened;
+
+    @Inject
+    public ExecutorService executorService;
 
     private boolean mBarcodeListener = false;
 
+    private boolean cancelable = true;
+
+
+    @Override
+    public boolean isCancelable() {
+        return cancelable;
+    }
+
+
+    @Override
+    public void setCancelable(boolean cancelable) {
+        super.setCancelable(cancelable);
+        this.cancelable = cancelable;
+    }
 
     @Override
     public void show(FragmentManager manager, String tag) {
@@ -55,28 +74,26 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
         BarcodeManager.enable();
     }
 
+
     private void openProgress() {
-        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
-            this.progressOpened = true;
-            requireActivity().runOnUiThread(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+        BarcodeManager.disable();
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
-        if (progressOpened) {
-            this.progressOpened = false;
-            requireActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+        BarcodeManager.enable();
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
 
     public void onError(Exception ex) {
+        this.onLoadingEnded();
+
         requireActivity().runOnUiThread(() -> {
-            this.onLoadingEnded();
             UtilityExceptions.defaultException(requireActivity(), ex);
         });
     }
@@ -97,7 +114,14 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
 
     @Override
     public void onShow(DialogInterface dialogInterface) {
+        getDialog().getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+
         this.initialize();
+        this.onInit(dialogInterface);
+    }
+
+    public void onInit(DialogInterface dialogInterface) {
+
     }
 
     private void initialize() {
@@ -115,4 +139,6 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
             });
         }
     }
+
+
 }

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

@@ -33,7 +33,6 @@ public abstract class BaseFragment extends Fragment {
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
-    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
@@ -67,22 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
-            this.progressOpened = true;
-            executorService.execute(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            executorService.execute(() -> {
-                mCurrentProgress.dismissAllowingStateLoss();
-            });
-        }
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
     public void onError(Exception ex) {

app/src/main/java/it/integry/integrywmsnative/core/helper/ContextHelper.java

@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.core.helper;
+
+import android.content.Context;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
+import it.integry.integrywmsnative.core.utility.UtilityContext;
+
+public final class ContextHelper {
+
+    public static FragmentManager getFragmentManagerFromContext(Context context) {
+        if (context == null) {
+            throw new IllegalArgumentException("Context cannot be null");
+        }
+
+        if (context instanceof FragmentActivity) {
+            return ((FragmentActivity) context).getSupportFragmentManager();
+        } else if (UtilityContext.getMainActivity() != null) {
+            return UtilityContext.getMainActivity().getSupportFragmentManager();
+        }
+
+        return null;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.core.helper;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+
+public final class GestioneToTextConverter {
+
+    public static String convert(GestioneEnum gestioneEnum) {
+        return switch (gestioneEnum) {
+            case ACQUISTO -> "Acquisto";
+            case PRODUZIONE -> "Produzione";
+            case LAVORAZIONE -> "Lavorazione";
+            case VENDITA -> "Vendita";
+        };
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.mapper;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.model.MtbInvenr;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoomDTO> {
 
@@ -32,6 +33,7 @@ public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoom
         data.setDataOraInv(inputData.getDataOraInv());
         data.setScanCodBarre(inputData.getScanCodBarre());
         data.setZona(inputData.getZona());
+        data.setIdDisp(SettingsManager.i().getUserSession().getDeviceId());
         return data;
     }
 }

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

@@ -1,30 +1,38 @@
 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.Callback;
 import retrofit2.Response;
 
 @Singleton
 public class MenuRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public MenuRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void retrieveMenu(String rootCodOpz, RunnableArgs<StbMenu> onComplete, RunnableArgs<Exception> onFailed) {
-        MenuRESTConsumerService menuRESTConsumerService = RESTBuilder.getService(MenuRESTConsumerService.class);
-        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new Callback<>() {
+        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);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }

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

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -141,7 +142,7 @@ public class DtbDocr {
 
     private MtbAart mtbAart;
 
-    private String dataScadPartitaMag;
+    private LocalDate dataScadPartitaMag;
 
     public String getCodAnag() {
         return codAnag;
@@ -741,15 +742,12 @@ public class DtbDocr {
         return this;
     }
 
-    public String getDataScadPartitaMag() {
+    public LocalDate getDataScadPartitaMag() {
         return dataScadPartitaMag;
     }
 
-    public Date getDataScadPartitaMagD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataScadPartitaMag());
-    }
 
-    public DtbDocr setDataScadPartitaMag(String dataScadPartitaMag) {
+    public DtbDocr setDataScadPartitaMag(LocalDate dataScadPartitaMag) {
         this.dataScadPartitaMag = dataScadPartitaMag;
         return this;
     }

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

@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;

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

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.model;
 public class JtbComt extends EntityBase {
 
     private String codJcom;
+    private String codAnag;
     private String codJfas;
     private String codJflav;
     private String descrizione;
@@ -20,6 +21,15 @@ public class JtbComt extends EntityBase {
         return this;
     }
 
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public JtbComt setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
     public String getCodJfas() {
         return codJfas;
     }

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

@@ -860,4 +860,267 @@ public class MtbAart extends EntityBase {
         this.numCnfImpegnata = numCnfImpegnata;
         return this;
     }
+
+
+    public MtbUntMis getFirstUntMis() {
+        return getMtbUntMis() != null && !getMtbUntMis().isEmpty() ? getMtbUntMis().get(0) : null;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        MtbAart mtbAart = (MtbAart) o;
+
+        if (!getCodMart().equals(mtbAart.getCodMart())) return false;
+        if (getDescrizione() != null ? !getDescrizione().equals(mtbAart.getDescrizione()) : mtbAart.getDescrizione() != null)
+            return false;
+        if (getUntMis() != null ? !getUntMis().equals(mtbAart.getUntMis()) : mtbAart.getUntMis() != null)
+            return false;
+        if (getBarCode() != null ? !getBarCode().equals(mtbAart.getBarCode()) : mtbAart.getBarCode() != null)
+            return false;
+        if (getPesoKg() != null ? !getPesoKg().equals(mtbAart.getPesoKg()) : mtbAart.getPesoKg() != null)
+            return false;
+        if (getQtaCnf() != null ? !getQtaCnf().equals(mtbAart.getQtaCnf()) : mtbAart.getQtaCnf() != null)
+            return false;
+        if (getCodAliq() != null ? !getCodAliq().equals(mtbAart.getCodAliq()) : mtbAart.getCodAliq() != null)
+            return false;
+        if (getCodScoArt() != null ? !getCodScoArt().equals(mtbAart.getCodScoArt()) : mtbAart.getCodScoArt() != null)
+            return false;
+        if (getCodTcolUi() != null ? !getCodTcolUi().equals(mtbAart.getCodTcolUi()) : mtbAart.getCodTcolUi() != null)
+            return false;
+        if (getCodTcolUl() != null ? !getCodTcolUl().equals(mtbAart.getCodTcolUl()) : mtbAart.getCodTcolUl() != null)
+            return false;
+        if (getArticoloComposto() != null ? !getArticoloComposto().equals(mtbAart.getArticoloComposto()) : mtbAart.getArticoloComposto() != null)
+            return false;
+        if (getEsposizioneComp() != null ? !getEsposizioneComp().equals(mtbAart.getEsposizioneComp()) : mtbAart.getEsposizioneComp() != null)
+            return false;
+        if (getDescrizioneEstesa() != null ? !getDescrizioneEstesa().equals(mtbAart.getDescrizioneEstesa()) : mtbAart.getDescrizioneEstesa() != null)
+            return false;
+        if (getCodUltForn() != null ? !getCodUltForn().equals(mtbAart.getCodUltForn()) : mtbAart.getCodUltForn() != null)
+            return false;
+        if (getDataUltCar() != null ? !getDataUltCar().equals(mtbAart.getDataUltCar()) : mtbAart.getDataUltCar() != null)
+            return false;
+        if (getValUltCar() != null ? !getValUltCar().equals(mtbAart.getValUltCar()) : mtbAart.getValUltCar() != null)
+            return false;
+        if (getCodUltClie() != null ? !getCodUltClie().equals(mtbAart.getCodUltClie()) : mtbAart.getCodUltClie() != null)
+            return false;
+        if (getDataUltScar() != null ? !getDataUltScar().equals(mtbAart.getDataUltScar()) : mtbAart.getDataUltScar() != null)
+            return false;
+        if (getValUltScar() != null ? !getValUltScar().equals(mtbAart.getValUltScar()) : mtbAart.getValUltScar() != null)
+            return false;
+        if (getTipoCodice() != null ? !getTipoCodice().equals(mtbAart.getTipoCodice()) : mtbAart.getTipoCodice() != null)
+            return false;
+        if (getNote() != null ? !getNote().equals(mtbAart.getNote()) : mtbAart.getNote() != null)
+            return false;
+        if (getPosizione() != null ? !getPosizione().equals(mtbAart.getPosizione()) : mtbAart.getPosizione() != null)
+            return false;
+        if (getColliPedana() != null ? !getColliPedana().equals(mtbAart.getColliPedana()) : mtbAart.getColliPedana() != null)
+            return false;
+        if (getUntMis2() != null ? !getUntMis2().equals(mtbAart.getUntMis2()) : mtbAart.getUntMis2() != null)
+            return false;
+        if (getRapConv2() != null ? !getRapConv2().equals(mtbAart.getRapConv2()) : mtbAart.getRapConv2() != null)
+            return false;
+        if (getFlagInclListino() != null ? !getFlagInclListino().equals(mtbAart.getFlagInclListino()) : mtbAart.getFlagInclListino() != null)
+            return false;
+        if (getUntMis3() != null ? !getUntMis3().equals(mtbAart.getUntMis3()) : mtbAart.getUntMis3() != null)
+            return false;
+        if (getRapConv3() != null ? !getRapConv3().equals(mtbAart.getRapConv3()) : mtbAart.getRapConv3() != null)
+            return false;
+        if (getCodMartStat() != null ? !getCodMartStat().equals(mtbAart.getCodMartStat()) : mtbAart.getCodMartStat() != null)
+            return false;
+        if (getCodMcon() != null ? !getCodMcon().equals(mtbAart.getCodMcon()) : mtbAart.getCodMcon() != null)
+            return false;
+        if (getCodMgrp() != null ? !getCodMgrp().equals(mtbAart.getCodMgrp()) : mtbAart.getCodMgrp() != null)
+            return false;
+        if (getCodMsfa() != null ? !getCodMsfa().equals(mtbAart.getCodMsfa()) : mtbAart.getCodMsfa() != null)
+            return false;
+        if (getCodMsgr() != null ? !getCodMsgr().equals(mtbAart.getCodMsgr()) : mtbAart.getCodMsgr() != null)
+            return false;
+        if (getCodMstp() != null ? !getCodMstp().equals(mtbAart.getCodMstp()) : mtbAart.getCodMstp() != null)
+            return false;
+        if (getCodMtip() != null ? !getCodMtip().equals(mtbAart.getCodMtip()) : mtbAart.getCodMtip() != null)
+            return false;
+        if (getDescrizioneStat() != null ? !getDescrizioneStat().equals(mtbAart.getDescrizioneStat()) : mtbAart.getDescrizioneStat() != null)
+            return false;
+        if (getFlagStato() != null ? !getFlagStato().equals(mtbAart.getFlagStato()) : mtbAart.getFlagStato() != null)
+            return false;
+        if (getCambioDiviCar() != null ? !getCambioDiviCar().equals(mtbAart.getCambioDiviCar()) : mtbAart.getCambioDiviCar() != null)
+            return false;
+        if (getCambioDiviScar() != null ? !getCambioDiviScar().equals(mtbAart.getCambioDiviScar()) : mtbAart.getCambioDiviScar() != null)
+            return false;
+        if (getGgScadPartita() != null ? !getGgScadPartita().equals(mtbAart.getGgScadPartita()) : mtbAart.getGgScadPartita() != null)
+            return false;
+        if (getVolumeMc() != null ? !getVolumeMc().equals(mtbAart.getVolumeMc()) : mtbAart.getVolumeMc() != null)
+            return false;
+        if (getFlagEsponiPrz() != null ? !getFlagEsponiPrz().equals(mtbAart.getFlagEsponiPrz()) : mtbAart.getFlagEsponiPrz() != null)
+            return false;
+        if (getDataUltVar() != null ? !getDataUltVar().equals(mtbAart.getDataUltVar()) : mtbAart.getDataUltVar() != null)
+            return false;
+        if (getPercSfrido() != null ? !getPercSfrido().equals(mtbAart.getPercSfrido()) : mtbAart.getPercSfrido() != null)
+            return false;
+        if (getCodBarreImb() != null ? !getCodBarreImb().equals(mtbAart.getCodBarreImb()) : mtbAart.getCodBarreImb() != null)
+            return false;
+        if (getFlagCalcPrz() != null ? !getFlagCalcPrz().equals(mtbAart.getFlagCalcPrz()) : mtbAart.getFlagCalcPrz() != null)
+            return false;
+        if (getEsposizioneCompAcq() != null ? !getEsposizioneCompAcq().equals(mtbAart.getEsposizioneCompAcq()) : mtbAart.getEsposizioneCompAcq() != null)
+            return false;
+        if (getFlagCalcPrzAcq() != null ? !getFlagCalcPrzAcq().equals(mtbAart.getFlagCalcPrzAcq()) : mtbAart.getFlagCalcPrzAcq() != null)
+            return false;
+        if (getDiacod() != null ? !getDiacod().equals(mtbAart.getDiacod()) : mtbAart.getDiacod() != null)
+            return false;
+        if (getPlu() != null ? !getPlu().equals(mtbAart.getPlu()) : mtbAart.getPlu() != null)
+            return false;
+        if (getPartIvaProd() != null ? !getPartIvaProd().equals(mtbAart.getPartIvaProd()) : mtbAart.getPartIvaProd() != null)
+            return false;
+        if (getRagSocProd() != null ? !getRagSocProd().equals(mtbAart.getRagSocProd()) : mtbAart.getRagSocProd() != null)
+            return false;
+        if (getFlagRapConvVariabile() != null ? !getFlagRapConvVariabile().equals(mtbAart.getFlagRapConvVariabile()) : mtbAart.getFlagRapConvVariabile() != null)
+            return false;
+        if (getFlagMovArtMag() != null ? !getFlagMovArtMag().equals(mtbAart.getFlagMovArtMag()) : mtbAart.getFlagMovArtMag() != null)
+            return false;
+        if (getFlagTracciabilita() != null ? !getFlagTracciabilita().equals(mtbAart.getFlagTracciabilita()) : mtbAart.getFlagTracciabilita() != null)
+            return false;
+        if (getTaraKg() != null ? !getTaraKg().equals(mtbAart.getTaraKg()) : mtbAart.getTaraKg() != null)
+            return false;
+        if (getColliStrato() != null ? !getColliStrato().equals(mtbAart.getColliStrato()) : mtbAart.getColliStrato() != null)
+            return false;
+        if (getFlagQtaCnfFissa() != null ? !getFlagQtaCnfFissa().equals(mtbAart.getFlagQtaCnfFissa()) : mtbAart.getFlagQtaCnfFissa() != null)
+            return false;
+        if (getFlagColliPedanaFisso() != null ? !getFlagColliPedanaFisso().equals(mtbAart.getFlagColliPedanaFisso()) : mtbAart.getFlagColliPedanaFisso() != null)
+            return false;
+        if (getCodCconCosti() != null ? !getCodCconCosti().equals(mtbAart.getCodCconCosti()) : mtbAart.getCodCconCosti() != null)
+            return false;
+        if (getCodCconRicavi() != null ? !getCodCconRicavi().equals(mtbAart.getCodCconRicavi()) : mtbAart.getCodCconRicavi() != null)
+            return false;
+        if (getCodDgrpArt() != null ? !getCodDgrpArt().equals(mtbAart.getCodDgrpArt()) : mtbAart.getCodDgrpArt() != null)
+            return false;
+        if (getCodDiviCar() != null ? !getCodDiviCar().equals(mtbAart.getCodDiviCar()) : mtbAart.getCodDiviCar() != null)
+            return false;
+        if (getCodDiviScar() != null ? !getCodDiviScar().equals(mtbAart.getCodDiviScar()) : mtbAart.getCodDiviScar() != null)
+            return false;
+        if (getCodEcrCat() != null ? !getCodEcrCat().equals(mtbAart.getCodEcrCat()) : mtbAart.getCodEcrCat() != null)
+            return false;
+        if (getCodEcrMcat() != null ? !getCodEcrMcat().equals(mtbAart.getCodEcrMcat()) : mtbAart.getCodEcrMcat() != null)
+            return false;
+        if (getCodEcrRep() != null ? !getCodEcrRep().equals(mtbAart.getCodEcrRep()) : mtbAart.getCodEcrRep() != null)
+            return false;
+        if (getCodEcrStipo() != null ? !getCodEcrStipo().equals(mtbAart.getCodEcrStipo()) : mtbAart.getCodEcrStipo() != null)
+            return false;
+        if (getCodEcrTipo() != null ? !getCodEcrTipo().equals(mtbAart.getCodEcrTipo()) : mtbAart.getCodEcrTipo() != null)
+            return false;
+        if (getCodGrpBolla() != null ? !getCodGrpBolla().equals(mtbAart.getCodGrpBolla()) : mtbAart.getCodGrpBolla() != null)
+            return false;
+        if (getIngredienti() != null ? !getIngredienti().equals(mtbAart.getIngredienti()) : mtbAart.getIngredienti() != null)
+            return false;
+        if (getIdArtEqui() != null ? !getIdArtEqui().equals(mtbAart.getIdArtEqui()) : mtbAart.getIdArtEqui() != null)
+            return false;
+        if (getDescrCassa() != null ? !getDescrCassa().equals(mtbAart.getDescrCassa()) : mtbAart.getDescrCassa() != null)
+            return false;
+        if (getCodNcIntracee() != null ? !getCodNcIntracee().equals(mtbAart.getCodNcIntracee()) : mtbAart.getCodNcIntracee() != null)
+            return false;
+        if (getMarchio() != null ? !getMarchio().equals(mtbAart.getMarchio()) : mtbAart.getMarchio() != null)
+            return false;
+        if (getSezione() != null ? !getSezione().equals(mtbAart.getSezione()) : mtbAart.getSezione() != null)
+            return false;
+        if (getUntMisRifPeso() != mtbAart.getUntMisRifPeso()) return false;
+        if (getQtaEsistente() != null ? !getQtaEsistente().equals(mtbAart.getQtaEsistente()) : mtbAart.getQtaEsistente() != null)
+            return false;
+        if (getQtaImpegnata() != null ? !getQtaImpegnata().equals(mtbAart.getQtaImpegnata()) : mtbAart.getQtaImpegnata() != null)
+            return false;
+        if (getNumCnfEsistente() != null ? !getNumCnfEsistente().equals(mtbAart.getNumCnfEsistente()) : mtbAart.getNumCnfEsistente() != null)
+            return false;
+        if (getNumCnfImpegnata() != null ? !getNumCnfImpegnata().equals(mtbAart.getNumCnfImpegnata()) : mtbAart.getNumCnfImpegnata() != null)
+            return false;
+        return getMtbUntMis() != null ? getMtbUntMis().equals(mtbAart.getMtbUntMis()) : mtbAart.getMtbUntMis() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCodMart().hashCode();
+        result = 31 * result + (getDescrizione() != null ? getDescrizione().hashCode() : 0);
+        result = 31 * result + (getUntMis() != null ? getUntMis().hashCode() : 0);
+        result = 31 * result + (getBarCode() != null ? getBarCode().hashCode() : 0);
+        result = 31 * result + (getPesoKg() != null ? getPesoKg().hashCode() : 0);
+        result = 31 * result + (getQtaCnf() != null ? getQtaCnf().hashCode() : 0);
+        result = 31 * result + (getCodAliq() != null ? getCodAliq().hashCode() : 0);
+        result = 31 * result + (getCodScoArt() != null ? getCodScoArt().hashCode() : 0);
+        result = 31 * result + (getCodTcolUi() != null ? getCodTcolUi().hashCode() : 0);
+        result = 31 * result + (getCodTcolUl() != null ? getCodTcolUl().hashCode() : 0);
+        result = 31 * result + (getArticoloComposto() != null ? getArticoloComposto().hashCode() : 0);
+        result = 31 * result + (getEsposizioneComp() != null ? getEsposizioneComp().hashCode() : 0);
+        result = 31 * result + (getDescrizioneEstesa() != null ? getDescrizioneEstesa().hashCode() : 0);
+        result = 31 * result + (getCodUltForn() != null ? getCodUltForn().hashCode() : 0);
+        result = 31 * result + (getDataUltCar() != null ? getDataUltCar().hashCode() : 0);
+        result = 31 * result + (getValUltCar() != null ? getValUltCar().hashCode() : 0);
+        result = 31 * result + (getCodUltClie() != null ? getCodUltClie().hashCode() : 0);
+        result = 31 * result + (getDataUltScar() != null ? getDataUltScar().hashCode() : 0);
+        result = 31 * result + (getValUltScar() != null ? getValUltScar().hashCode() : 0);
+        result = 31 * result + (getTipoCodice() != null ? getTipoCodice().hashCode() : 0);
+        result = 31 * result + (getNote() != null ? getNote().hashCode() : 0);
+        result = 31 * result + (getPosizione() != null ? getPosizione().hashCode() : 0);
+        result = 31 * result + (getColliPedana() != null ? getColliPedana().hashCode() : 0);
+        result = 31 * result + (getUntMis2() != null ? getUntMis2().hashCode() : 0);
+        result = 31 * result + (getRapConv2() != null ? getRapConv2().hashCode() : 0);
+        result = 31 * result + (getFlagInclListino() != null ? getFlagInclListino().hashCode() : 0);
+        result = 31 * result + (getUntMis3() != null ? getUntMis3().hashCode() : 0);
+        result = 31 * result + (getRapConv3() != null ? getRapConv3().hashCode() : 0);
+        result = 31 * result + (getCodMartStat() != null ? getCodMartStat().hashCode() : 0);
+        result = 31 * result + (getCodMcon() != null ? getCodMcon().hashCode() : 0);
+        result = 31 * result + (getCodMgrp() != null ? getCodMgrp().hashCode() : 0);
+        result = 31 * result + (getCodMsfa() != null ? getCodMsfa().hashCode() : 0);
+        result = 31 * result + (getCodMsgr() != null ? getCodMsgr().hashCode() : 0);
+        result = 31 * result + (getCodMstp() != null ? getCodMstp().hashCode() : 0);
+        result = 31 * result + (getCodMtip() != null ? getCodMtip().hashCode() : 0);
+        result = 31 * result + (getDescrizioneStat() != null ? getDescrizioneStat().hashCode() : 0);
+        result = 31 * result + (getFlagStato() != null ? getFlagStato().hashCode() : 0);
+        result = 31 * result + (getCambioDiviCar() != null ? getCambioDiviCar().hashCode() : 0);
+        result = 31 * result + (getCambioDiviScar() != null ? getCambioDiviScar().hashCode() : 0);
+        result = 31 * result + (getGgScadPartita() != null ? getGgScadPartita().hashCode() : 0);
+        result = 31 * result + (getVolumeMc() != null ? getVolumeMc().hashCode() : 0);
+        result = 31 * result + (getFlagEsponiPrz() != null ? getFlagEsponiPrz().hashCode() : 0);
+        result = 31 * result + (getDataUltVar() != null ? getDataUltVar().hashCode() : 0);
+        result = 31 * result + (getPercSfrido() != null ? getPercSfrido().hashCode() : 0);
+        result = 31 * result + (getCodBarreImb() != null ? getCodBarreImb().hashCode() : 0);
+        result = 31 * result + (getFlagCalcPrz() != null ? getFlagCalcPrz().hashCode() : 0);
+        result = 31 * result + (getEsposizioneCompAcq() != null ? getEsposizioneCompAcq().hashCode() : 0);
+        result = 31 * result + (getFlagCalcPrzAcq() != null ? getFlagCalcPrzAcq().hashCode() : 0);
+        result = 31 * result + (getDiacod() != null ? getDiacod().hashCode() : 0);
+        result = 31 * result + (getPlu() != null ? getPlu().hashCode() : 0);
+        result = 31 * result + (getPartIvaProd() != null ? getPartIvaProd().hashCode() : 0);
+        result = 31 * result + (getRagSocProd() != null ? getRagSocProd().hashCode() : 0);
+        result = 31 * result + (getFlagRapConvVariabile() != null ? getFlagRapConvVariabile().hashCode() : 0);
+        result = 31 * result + (getFlagMovArtMag() != null ? getFlagMovArtMag().hashCode() : 0);
+        result = 31 * result + (getFlagTracciabilita() != null ? getFlagTracciabilita().hashCode() : 0);
+        result = 31 * result + (getTaraKg() != null ? getTaraKg().hashCode() : 0);
+        result = 31 * result + (getColliStrato() != null ? getColliStrato().hashCode() : 0);
+        result = 31 * result + (getFlagQtaCnfFissa() != null ? getFlagQtaCnfFissa().hashCode() : 0);
+        result = 31 * result + (getFlagColliPedanaFisso() != null ? getFlagColliPedanaFisso().hashCode() : 0);
+        result = 31 * result + (getCodCconCosti() != null ? getCodCconCosti().hashCode() : 0);
+        result = 31 * result + (getCodCconRicavi() != null ? getCodCconRicavi().hashCode() : 0);
+        result = 31 * result + (getCodDgrpArt() != null ? getCodDgrpArt().hashCode() : 0);
+        result = 31 * result + (getCodDiviCar() != null ? getCodDiviCar().hashCode() : 0);
+        result = 31 * result + (getCodDiviScar() != null ? getCodDiviScar().hashCode() : 0);
+        result = 31 * result + (getCodEcrCat() != null ? getCodEcrCat().hashCode() : 0);
+        result = 31 * result + (getCodEcrMcat() != null ? getCodEcrMcat().hashCode() : 0);
+        result = 31 * result + (getCodEcrRep() != null ? getCodEcrRep().hashCode() : 0);
+        result = 31 * result + (getCodEcrStipo() != null ? getCodEcrStipo().hashCode() : 0);
+        result = 31 * result + (getCodEcrTipo() != null ? getCodEcrTipo().hashCode() : 0);
+        result = 31 * result + (getCodGrpBolla() != null ? getCodGrpBolla().hashCode() : 0);
+        result = 31 * result + (getIngredienti() != null ? getIngredienti().hashCode() : 0);
+        result = 31 * result + (getIdArtEqui() != null ? getIdArtEqui().hashCode() : 0);
+        result = 31 * result + (getDescrCassa() != null ? getDescrCassa().hashCode() : 0);
+        result = 31 * result + (getCodNcIntracee() != null ? getCodNcIntracee().hashCode() : 0);
+        result = 31 * result + (getMarchio() != null ? getMarchio().hashCode() : 0);
+        result = 31 * result + (getSezione() != null ? getSezione().hashCode() : 0);
+        result = 31 * result + (getUntMisRifPeso() != null ? getUntMisRifPeso().hashCode() : 0);
+        result = 31 * result + (getQtaEsistente() != null ? getQtaEsistente().hashCode() : 0);
+        result = 31 * result + (getQtaImpegnata() != null ? getQtaImpegnata().hashCode() : 0);
+        result = 31 * result + (getNumCnfEsistente() != null ? getNumCnfEsistente().hashCode() : 0);
+        result = 31 * result + (getNumCnfImpegnata() != null ? getNumCnfImpegnata().hashCode() : 0);
+        result = 31 * result + (getMtbUntMis() != null ? getMtbUntMis().hashCode() : 0);
+        return result;
+    }
 }

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

@@ -1,15 +0,0 @@
-package it.integry.integrywmsnative.core.model;
-
-public class MtbAartWithFornitore extends MtbAart {
-
-    private String codArtFor;
-
-    public String getCodArtFor() {
-        return codArtFor;
-    }
-
-    public MtbAartWithFornitore setCodArtFor(String codArtFor) {
-        this.codArtFor = codArtFor;
-        return this;
-    }
-}