Finish v1.41.05(453)

Corretta lettura data scadenza in decodifica ean128

.idea/appInsightsSettings.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Android Vitals" />
+    <option name="tabSettings">
+      <map>
+        <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="2024-09-13T09:26:42.884931500Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T60AZ93A" />
+            </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.20" />
   </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

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 360
-    def appVersionName = '1.32.20'
+    def appVersionCode = 453
+    def appVersionName = '1.41.05'
 
     signingConfigs {
         release {
@@ -25,18 +25,16 @@ 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 34
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -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
     }
 
@@ -90,12 +88,11 @@ android {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-
-
+    compileSdk 34
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -106,37 +103,36 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:29.1.0')
+    implementation platform('com.google.firebase:firebase-bom:32.8.1')
     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.3.0'
 
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
-    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.7.0'
 //    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.46.1'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -155,12 +151,11 @@ dependencies {
     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'

app/src/main/AndroidManifest.xml

@@ -33,31 +33,25 @@
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.prod_dettaglio_linea.ProdDettaglioLineaActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
-            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>
@@ -68,28 +62,23 @@
         </activity>
         <activity
             android:name=".gest.login.LoginActivity"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
-            android:name=".gest.accettazione_picking.AccettazionePickingActivity"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing"
+            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:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contenuto_bancale.ContenutoBancaleActivity"
             android:label="@string/activity_contenuto_bancale_title"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.inventario.picking.PickingInventarioActivity"
             android:label="@string/activity_picking_inventario_title"
             android:windowSoftInputMode="adjustNothing"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden"/>
 
         <meta-data
@@ -108,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/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,20 @@ 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_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;
@@ -96,17 +112,28 @@ 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_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.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.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;
@@ -115,6 +142,8 @@ 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.tracciamento_imballi.DialogTracciamentoImballiComponent;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
 
 // Definition of the Application graph
 @Singleton
@@ -128,7 +157,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,
@@ -137,7 +166,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,
@@ -159,6 +188,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,
@@ -174,7 +204,21 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         BottomSheetMtbColrEditModalModule.class,
         DialogChooseArtsFromMtbAartListModule.class,
         MainSettingsModule.class,
-        DialogInfoSituazioneArticoloModule.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
 })
 public interface MainApplicationComponent {
 
@@ -192,7 +236,7 @@ public interface MainApplicationComponent {
 
     MainFragmentComponent.Factory mainFragmentComponent();
 
-    MainAccettazioneComponent.Factory mainAccettazioneComponent();
+    MainAccettazioneOrdiniElencoComponent.Factory mainAccettazioneOrdiniComponent();
 
     ListaBancaliComponent.Factory listaBancaliComponent();
 
@@ -210,7 +254,7 @@ public interface MainApplicationComponent {
 
     SpedizioneComponent.Factory spedizioneComponent();
 
-    AccettazionePickingComponent.Factory accettazionePickingComponent();
+    AccettazioneOrdiniPickingComponent.Factory accettazionePickingComponent();
 
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
 
@@ -258,12 +302,8 @@ public interface MainApplicationComponent {
 
     DialogSelectDocInfoComponent.Factory dialogSelectDocInfoNewViewComponent();
 
-    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
-
     DocInterniEditFormComponent.Factory docInterniEditFormComponent();
 
-    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
-
     DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
 
     DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent();
@@ -294,6 +334,37 @@ public interface MainApplicationComponent {
 
     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();
+
     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,11 +16,13 @@ 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.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;
@@ -31,7 +32,9 @@ 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.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
@@ -40,8 +43,10 @@ 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.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.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
@@ -72,7 +77,7 @@ public class MainApplicationModule {
     @Provides
     @Singleton
     public Handler providesMainThreadHandler() {
-        return HandlerCompat.createAsync(Looper.getMainLooper());
+        return HandlerCompat.createAsync(mApplication.getApplicationContext().getMainLooper());
     }
 
     @Provides
@@ -89,8 +94,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) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, systemRESTConsumer);
     }
 
     @Provides
@@ -101,6 +106,12 @@ public class MainApplicationModule {
         return colliDataRecoverService;
     }
 
+    @Provides
+    @Singleton
+    Ean128Service provideEan128Service() {
+        return new Ean128Service();
+    }
+
     @Provides
     @Singleton
     MenuService provideMenuService(MenuRESTConsumer menuRESTConsumer) {
@@ -163,8 +174,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new MagazzinoRESTConsumer(systemRESTConsumer);
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new MagazzinoRESTConsumer(executorService, systemRESTConsumer);
     }
 
     @Provides
@@ -181,8 +192,11 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
+                                                                 ArticoloRESTConsumer articoloRESTConsumer,
+                                                                 EntityRESTConsumer entityRESTConsumer,
+                                                                 SettingsManager settingsManager) {
+        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
     }
 
     @Provides
@@ -193,8 +207,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    BarcodeRESTConsumer provideBarcodeRESTConsumer() {
-        return new BarcodeRESTConsumer();
+    BarcodeRESTConsumer provideBarcodeRESTConsumer(Ean128Service ean128Service) {
+        return new BarcodeRESTConsumer(ean128Service);
     }
 
     @Provides
@@ -235,8 +249,20 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    ImballiRESTConsumer provideImballiRESTConsumer(ExecutorService executorService) {
+        return new ImballiRESTConsumer(executorService);
+    }
+
+    @Provides
+    @Singleton
+    VettoriRESTConsumer provideVettoriRESTConsumer(ExecutorService executorService) {
+        return new VettoriRESTConsumer(executorService);
     }
 
     @Provides
@@ -257,6 +283,12 @@ public class MainApplicationModule {
         return new DocumentRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer() {
+        return new ColliAccettazioneRESTConsumer();
+    }
+
     @Provides
     @Singleton
     ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer() {
@@ -265,8 +297,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer() {
-        return new ColliLavorazioneRESTConsumer();
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
+        return new ColliLavorazioneRESTConsumer(settingsManager);
     }
 
     @Provides
@@ -275,4 +307,18 @@ public class MainApplicationModule {
         return new MagazzinoAutomaticoRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    MagazzinoBufferRESTConsumer provideMagazzinoBufferRESTConsumer() {
+        return new MagazzinoBufferRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    SoundAlertService provideSoundAlertService() {
+        SoundAlertService soundAlertService = new SoundAlertService(mApplication.getApplicationContext());
+        soundAlertService.init();
+        return soundAlertService;
+    }
+
 }

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

@@ -75,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);
 
             });

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,7 +15,9 @@ 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;
@@ -35,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)
@@ -75,7 +88,7 @@ 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)))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_cliente)
@@ -103,7 +116,7 @@ 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)
@@ -111,7 +124,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.free_lav_picking)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
                                 .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
-                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_lav_picking, GestioneEnum.LAVORAZIONE, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_posizionamento_da_ord)
@@ -152,6 +165,30 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleIcon(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)))
+
+                        .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)
@@ -182,6 +219,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()
@@ -201,7 +245,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/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,6 +15,7 @@ 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;
@@ -23,13 +26,15 @@ public class MainContext {
     private final Context applicationContext;
     private final MenuService menuService;
     private final AppDatabase appDatabase;
+    private final SystemRESTConsumer systemRESTConsumer;
 
     private Listener mListener;
 
-    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase) {
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer) {
         this.applicationContext = applicationContext;
         this.menuService = menuService;
         this.appDatabase = appDatabase;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
     public void init() {
@@ -40,10 +45,13 @@ public class MainContext {
             exception.printStackTrace();
         }
 
-        this.initDBData(() -> {
-            this.initMenu(() -> {
-                
-                if (mListener != null) mListener.onContextInitialized();
+
+        this.initDeviceId(() -> {
+            this.initDBData(() -> {
+                this.initMenu(() -> {
+
+                    if (mListener != null) mListener.onContextInitialized();
+                });
             });
         });
 
@@ -52,6 +60,25 @@ public class MainContext {
 
     }
 
+
+    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_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 {
@@ -108,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);
@@ -130,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,7 +41,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
         InventarioRoomDTO.class,
         InventarioRowRoomDTO.class
 },
-        version = 15)
+        version = 17)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class,
@@ -67,13 +68,17 @@ public abstract class AppDatabase extends RoomDatabase {
                     .addMigrations(MIGRATION_11_12)
                     .addMigrations(MIGRATION_12_13)
                     .addMigrations(MIGRATION_13_14)
-                    .addMigrations(MIGRATION_14_15);
+                    .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) {
@@ -155,4 +161,25 @@ public abstract class AppDatabase extends RoomDatabase {
             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/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

@@ -94,6 +94,9 @@ public class ArticoloOrdine {
     @Ignore
     private int bgTint;
 
+    @Ignore
+    private boolean invalid = false;
+
 
     public Integer getArticoloOrdineId() {
         return articoloOrdineId;
@@ -236,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() {
@@ -256,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() {
@@ -300,4 +303,13 @@ public class ArticoloOrdine {
         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/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

@@ -51,6 +51,7 @@ public class Ordine {
     private boolean orderNewProducts = false;
 
     @ColumnInfo(name = "id_griglia")
+    @Nullable
     private Integer idGriglia;
 
     @ColumnInfo(name = "cod_alis")
@@ -80,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,16 +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.setRemoteSyncDate(localItem.getRemoteSyncDate());
                             remoteItem.setNew(false);
-                        }, onComplete, onError);
+                        }, () -> 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/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

@@ -24,7 +24,6 @@ import androidx.databinding.BindingAdapter;
 import androidx.databinding.BindingConversion;
 import androidx.databinding.Observable;
 import androidx.databinding.ObservableField;
-import androidx.lifecycle.MutableLiveData;
 
 import com.google.android.material.datepicker.MaterialDatePicker;
 import com.google.android.material.textfield.TextInputEditText;
@@ -33,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;
@@ -211,16 +211,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));
@@ -238,8 +241,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);
                 }
             };
@@ -247,7 +253,7 @@ 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));
@@ -457,8 +463,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);
@@ -473,37 +479,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 {
@@ -522,7 +524,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));
     }
 

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<String, String>() {
+                                            @Override
+                                            public String call(String input) {
+                                                return input;
+                                            }
+                                        },
+                                        new CallableII<String, Integer, String>() {
+                                            @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<T>();
+        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/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/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/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.dismissAllowingStateLoss();
+        });
     }
 
     @Override

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,11 +22,13 @@ 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;
 
@@ -69,22 +74,19 @@ 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.dismissAllowingStateLoss();
+        });
     }
 
 
@@ -111,7 +113,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() {

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.dismissAllowingStateLoss();
+        });
     }
 
     public void onError(Exception ex) {

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/MtbAart.java

@@ -865,4 +865,262 @@ public class MtbAart extends EntityBase {
     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;
-    }
-}

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

@@ -1,11 +1,13 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class MtbColr extends EntityBase {
 
@@ -36,7 +38,7 @@ public class MtbColr extends EntityBase {
     private BigDecimal numCnf;
     private String insPartitaMag;
     private String mtbPartitaMag_descrizione;
-    private String dataScadPartita;
+    private LocalDate dataScadPartita;
     private String descrizione;
     private String untMis;
     private Integer causale;
@@ -259,6 +261,11 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
+    public MtbColr setDataColloRif(LocalDate dataColloRif) {
+        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        return this;
+    }
+
     public BigDecimal getQtaCnf() {
         return qtaCnf;
     }
@@ -361,27 +368,17 @@ public class MtbColr extends EntityBase {
     }
 
 
-    public String getDataScadPartitaS() {
+    public LocalDate getDataScadPartita() {
         return dataScadPartita;
     }
 
-    public Date getDataScadPartitaD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataScadPartitaS());
-    }
-
-    public MtbColr setDataScadPartita(String dataScadPartita) {
+    public MtbColr setDataScadPartita(LocalDate dataScadPartita) {
         this.dataScadPartita = dataScadPartita;
         return this;
     }
 
-    public MtbColr setDataScadPartita(Date dataScadPartita) {
-        this.dataScadPartita = UtilityDate.formatDate(dataScadPartita, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
-        return this;
-    }
-
-
     public String getDescrizione() {
-        return descrizione;
+        return UtilityString.isNull(descrizione, getMtbAart() != null ? UtilityString.isNull(getMtbAart().getDescrizioneEstesa(), getMtbAart().getDescrizione()) : null);
     }
 
     public MtbColr setDescrizione(String descrizione) {

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

@@ -10,6 +10,7 @@ import com.annimon.stream.Stream;
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -68,28 +69,6 @@ public class MtbColt extends EntityBase {
     private Boolean disablePrint;
     private String ragSocCliente;
 
-    public void generaFiltroOrdine() throws Exception {
-
-        if (this.gestione == null) {
-            throw new Exception("Impossibile creare il filtro dell'ordine se la gestione non è valorizzata");
-        }
-
-        if (this.dataOrd == null) {
-            throw new Exception("Impossibile creare il filtro dell'ordine se la data dell'ordine non è valorizzata");
-        }
-
-        if (this.numOrd == null) {
-            throw new Exception("Impossibile creare il filtro dell'ordine se il numero dell'ordine non è valorizzato");
-        }
-
-
-        Date dateOrd = UtilityDate.recognizeDate(this.dataOrd);
-        String dateYMD = UtilityDate.formatDate(dateOrd, UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH);
-
-        this.filtroOrdini = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><ROOT><FILTER><DTB_ORDT><GESTIONE type=\"V\">" + this.gestione + "</GESTIONE><DATA_ORD type=\"D\">" + dateYMD + "</DATA_ORD><NUM_ORD type=\"N\">" + this.numOrd + "</NUM_ORD></DTB_ORDT></FILTER></ROOT>";
-    }
-
-
     private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
 
     public ObservableArrayList<MtbColr> getMtbColr() {
@@ -119,30 +98,22 @@ public class MtbColt extends EntityBase {
 
         String codAnagToUse = null;
         switch (gestioneEnum) {
-            case ACQUISTO:
-            case LAVORAZIONE:
-            case PRODUZIONE:
+            case ACQUISTO, LAVORAZIONE, PRODUZIONE -> {
                 if (SettingsManager.iDB().getInternalCodAnags() == null) break;
-
                 Optional<InternalCodAnagsDTO> optCodAnagForn = Stream.of(SettingsManager.iDB().getInternalCodAnags())
                         .filter(InternalCodAnagsDTO::isFornitore)
                         .findFirst();
-
                 if (optCodAnagForn.isEmpty()) break;
-
                 codAnagToUse = optCodAnagForn.get().getCodAnag();
-                break;
-            case VENDITA:
+            }
+            case VENDITA -> {
                 if (SettingsManager.iDB().getInternalCodAnags() == null) break;
-
                 Optional<InternalCodAnagsDTO> optCodAnagClie = Stream.of(SettingsManager.iDB().getInternalCodAnags())
                         .filter(InternalCodAnagsDTO::isCliente)
                         .findFirst();
-
                 if (optCodAnagClie.isEmpty()) break;
-
                 codAnagToUse = optCodAnagClie.get().getCodAnag();
-                break;
+            }
         }
 
         setCodAnag(codAnagToUse);
@@ -190,6 +161,10 @@ public class MtbColt extends EntityBase {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
     }
 
+    public LocalDate getDataColloLD() {
+        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+    }
+
     public MtbColt setDataCollo(String dataCollo) {
         this.dataCollo = dataCollo;
         return this;
@@ -200,6 +175,11 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbColt setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        return this;
+    }
+
     public String getSerCollo() {
         return serCollo;
     }

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

@@ -1,17 +1,16 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
-import java.util.Date;
-
-import it.integry.integrywmsnative.core.utility.UtilityDate;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public class MtbPartitaMag extends EntityBase{
     private String codMart;    
     
     private String partitaMag;    
     private String descrizione;    
-    private String dataIns;
-    private String dataScad;
+    private LocalDateTime dataIns;
+    private LocalDate dataScad;
     private Integer scelta;    
     private BigDecimal costoUntUmMag;
     private BigDecimal valUntUmMag;    
@@ -62,33 +61,24 @@ public class MtbPartitaMag extends EntityBase{
         return this;
     }
 
-    public String getDataIns() {
+    public LocalDateTime getDataIns() {
         return dataIns;
     }
 
-    public MtbPartitaMag setDataIns(String dataIns) {
+    public MtbPartitaMag setDataIns(LocalDateTime dataIns) {
         this.dataIns = dataIns;
         return this;
     }
 
-    public String getDataScadS() {
+    public LocalDate getDataScad() {
         return dataScad;
     }
 
-    public Date getDataScadD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataScadS());
-    }
-
-    public MtbPartitaMag setDataScad(String dataScad) {
+    public MtbPartitaMag setDataScad(LocalDate dataScad) {
         this.dataScad = dataScad;
         return this;
     }
 
-    public MtbPartitaMag setDataScad(Date dataScad) {
-        this.dataScad = UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
-        return this;
-    }
-
     public Integer getScelta() {
         return scelta;
     }

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.math.BigDecimal;
 
 public class MtbTCol {
@@ -13,7 +15,7 @@ public class MtbTCol {
     private BigDecimal taraKg;
     private String descrizione;
     private String codMart;
-    private String flagUIUL;
+    private FlagUiUlEnum flagUIUL;
     private String circuito;
 
     public String getCodTcol() {
@@ -88,13 +90,12 @@ public class MtbTCol {
         return this;
     }
 
-    public String getFlagUIUL() {
+    public FlagUiUlEnum getFlagUIUL() {
         return flagUIUL;
     }
 
-    public MtbTCol setFlagUIUL(String flagUIUL) {
+    public void setFlagUIUL(FlagUiUlEnum flagUIUL) {
         this.flagUIUL = flagUIUL;
-        return this;
     }
 
     public String getCircuito() {
@@ -107,4 +108,29 @@ public class MtbTCol {
     }
 
 
+    public enum FlagUiUlEnum {
+        @SerializedName("UI")
+        UI("UI"),
+
+        @SerializedName("UL")
+        UL("UL");
+
+        private final String text;
+        FlagUiUlEnum(String text) {
+            this.text = text;
+        }
+
+
+        public String getText() {
+            return this.text;
+        }
+
+        public static FlagUiUlEnum fromString(String text) {
+            for (FlagUiUlEnum b : FlagUiUlEnum.values()) {
+                if (b.text.equalsIgnoreCase(text)) return b;
+            }
+            return null;
+        }
+    }
+
 }

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

@@ -2,8 +2,11 @@ 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;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 /**
  * Created by ValerioC on 06/03/2018.
@@ -38,7 +41,8 @@ public class MvwSitArtUdcDetInventario {
     private BigDecimal pesoLordoKg;
     private String codJfas;
     private MtbAart mtbAart;
-
+    private Integer numOrd;
+    private Date dataOrd;
 
     public String getGestione() {
         return gestione;
@@ -283,6 +287,20 @@ public class MvwSitArtUdcDetInventario {
         return this;
     }
 
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public MvwSitArtUdcDetInventario setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getQtaText(){
+        String text = UtilityNumber.decimalToString(this.qtaCol);
+        text += !UtilityString.isNullOrEmpty(this.untMis) ? "\n" + this.untMis : "";
+        return text;
+    }
 
     public MtbColr toMtbColr() {
         return new MtbColr()
@@ -301,4 +319,13 @@ public class MvwSitArtUdcDetInventario {
                 .setPesoLordoKg(getPesoLordoKg())
                 .setUntMis(getUntMis());
     }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public MvwSitArtUdcDetInventario setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
 }

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

@@ -0,0 +1,95 @@
+package it.integry.integrywmsnative.core.model;
+
+import android.os.Parcelable;
+
+import java.math.BigDecimal;
+
+public class VtbVetr extends EntityBase {
+
+    public VtbVetr() {
+        type = "vtb_vetr";
+    }
+
+    private String codVvet;
+    private String codSpes;
+    private String idRiga;
+    private BigDecimal daQta;
+    private BigDecimal aQta;
+    private BigDecimal impUnt;
+    private BigDecimal impFisso;
+    private String codDivi;
+
+    public String getCodVvet() {
+        return codVvet;
+    }
+
+    public VtbVetr setCodVvet(String codVvet) {
+        this.codVvet = codVvet;
+        return this;
+    }
+
+    public String getCodSpes() {
+        return codSpes;
+    }
+
+    public VtbVetr setCodSpes(String codSpes) {
+        this.codSpes = codSpes;
+        return this;
+    }
+
+    public String getIdRiga() {
+        return idRiga;
+    }
+
+    public VtbVetr setIdRiga(String idRiga) {
+        this.idRiga = idRiga;
+        return this;
+    }
+
+    public BigDecimal getDaQta() {
+        return daQta;
+    }
+
+    public VtbVetr setDaQta(BigDecimal daQta) {
+        this.daQta = daQta;
+        return this;
+    }
+
+    public BigDecimal getaQta() {
+        return aQta;
+    }
+
+    public VtbVetr setaQta(BigDecimal aQta) {
+        this.aQta = aQta;
+        return this;
+    }
+
+    public BigDecimal getImpUnt() {
+        return impUnt;
+    }
+
+    public VtbVetr setImpUnt(BigDecimal impUnt) {
+        this.impUnt = impUnt;
+        return this;
+    }
+
+    public BigDecimal getImpFisso() {
+        return impFisso;
+    }
+
+    public VtbVetr setImpFisso(BigDecimal impFisso) {
+        this.impFisso = impFisso;
+        return this;
+    }
+
+    public String getCodDivi() {
+        return codDivi;
+    }
+
+    public VtbVetr setCodDivi(String codDivi) {
+        this.codDivi = codDivi;
+        return this;
+    }
+
+
+}

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

@@ -0,0 +1,273 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class VtbVett extends EntityBase {
+
+    public VtbVett() {
+        type = "vtb_vett";
+    }
+
+    private String codVvet;
+    private String codLettVett;
+    private String codAnag;
+    private String ragSoc;
+    private String indirizzo;
+    private String cap;
+    private String citta;
+    private String prov;
+    private String nazione;
+    private String telefono;
+    private String fax;
+    private String partIva;
+    private String note;
+    private String eMail;
+    private String modStamp;
+    private BigDecimal coefVol;
+    private String flagAttivo;
+    private String numAutoriz;
+    private List<VtbVetr> vtbVetr;
+
+
+    public String getCodVvet() {
+        return codVvet;
+    }
+
+    public VtbVett setCodVvet(String codVvet) {
+        this.codVvet = codVvet;
+        return this;
+    }
+
+    public String getCodLettVett() {
+        return codLettVett;
+    }
+
+    public VtbVett setCodLettVett(String codLettVett) {
+        this.codLettVett = codLettVett;
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public VtbVett setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getRagSoc() {
+        return ragSoc;
+    }
+
+    public VtbVett setRagSoc(String ragSoc) {
+        this.ragSoc = ragSoc;
+        return this;
+    }
+
+    public String getIndirizzo() {
+        return indirizzo;
+    }
+
+    public VtbVett setIndirizzo(String indirizzo) {
+        this.indirizzo = indirizzo;
+        return this;
+    }
+
+    public String getCap() {
+        return cap;
+    }
+
+    public VtbVett setCap(String cap) {
+        this.cap = cap;
+        return this;
+    }
+
+    public String getCitta() {
+        return citta;
+    }
+
+    public VtbVett setCitta(String citta) {
+        this.citta = citta;
+        return this;
+    }
+
+    public String getProv() {
+        return prov;
+    }
+
+    public VtbVett setProv(String prov) {
+        this.prov = prov;
+        return this;
+    }
+
+    public String getNazione() {
+        return nazione;
+    }
+
+    public VtbVett setNazione(String nazione) {
+        this.nazione = nazione;
+        return this;
+    }
+
+    public String getTelefono() {
+        return telefono;
+    }
+
+    public VtbVett setTelefono(String telefono) {
+        this.telefono = telefono;
+        return this;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public VtbVett setFax(String fax) {
+        this.fax = fax;
+        return this;
+    }
+
+    public String getPartIva() {
+        return partIva;
+    }
+
+    public VtbVett setPartIva(String partIva) {
+        this.partIva = partIva;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public VtbVett setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public String geteMail() {
+        return eMail;
+    }
+
+    public VtbVett seteMail(String eMail) {
+        this.eMail = eMail;
+        return this;
+    }
+
+    public String getModStamp() {
+        return modStamp;
+    }
+
+    public VtbVett setModStamp(String modStamp) {
+        this.modStamp = modStamp;
+        return this;
+    }
+
+    public BigDecimal getCoefVol() {
+        return coefVol;
+    }
+
+    public VtbVett setCoefVol(BigDecimal coefVol) {
+        this.coefVol = coefVol;
+        return this;
+    }
+
+    public String getFlagAttivo() {
+        return flagAttivo;
+    }
+
+    public VtbVett setFlagAttivo(String flagAttivo) {
+        this.flagAttivo = flagAttivo;
+        return this;
+    }
+
+    public String getNumAutoriz() {
+        return numAutoriz;
+    }
+
+    public VtbVett setNumAutoriz(String numAutoriz) {
+        this.numAutoriz = numAutoriz;
+        return this;
+    }
+
+    public List<VtbVetr> getVtbVetr() {
+        return vtbVetr;
+    }
+
+    public VtbVett setVtbVetr(List<VtbVetr> vtbVetr) {
+        this.vtbVetr = vtbVetr;
+        return this;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VtbVett vtbVett = (VtbVett) o;
+
+        if (!getCodVvet().equals(vtbVett.getCodVvet())) return false;
+        if (getCodLettVett() != null ? !getCodLettVett().equals(vtbVett.getCodLettVett()) : vtbVett.getCodLettVett() != null)
+            return false;
+        if (getCodAnag() != null ? !getCodAnag().equals(vtbVett.getCodAnag()) : vtbVett.getCodAnag() != null)
+            return false;
+        if (getRagSoc() != null ? !getRagSoc().equals(vtbVett.getRagSoc()) : vtbVett.getRagSoc() != null)
+            return false;
+        if (getIndirizzo() != null ? !getIndirizzo().equals(vtbVett.getIndirizzo()) : vtbVett.getIndirizzo() != null)
+            return false;
+        if (getCap() != null ? !getCap().equals(vtbVett.getCap()) : vtbVett.getCap() != null)
+            return false;
+        if (getCitta() != null ? !getCitta().equals(vtbVett.getCitta()) : vtbVett.getCitta() != null)
+            return false;
+        if (getProv() != null ? !getProv().equals(vtbVett.getProv()) : vtbVett.getProv() != null)
+            return false;
+        if (getNazione() != null ? !getNazione().equals(vtbVett.getNazione()) : vtbVett.getNazione() != null)
+            return false;
+        if (getTelefono() != null ? !getTelefono().equals(vtbVett.getTelefono()) : vtbVett.getTelefono() != null)
+            return false;
+        if (getFax() != null ? !getFax().equals(vtbVett.getFax()) : vtbVett.getFax() != null)
+            return false;
+        if (getPartIva() != null ? !getPartIva().equals(vtbVett.getPartIva()) : vtbVett.getPartIva() != null)
+            return false;
+        if (getNote() != null ? !getNote().equals(vtbVett.getNote()) : vtbVett.getNote() != null)
+            return false;
+        if (geteMail() != null ? !geteMail().equals(vtbVett.geteMail()) : vtbVett.geteMail() != null)
+            return false;
+        if (getModStamp() != null ? !getModStamp().equals(vtbVett.getModStamp()) : vtbVett.getModStamp() != null)
+            return false;
+        if (getCoefVol() != null ? !getCoefVol().equals(vtbVett.getCoefVol()) : vtbVett.getCoefVol() != null)
+            return false;
+        if (getFlagAttivo() != null ? !getFlagAttivo().equals(vtbVett.getFlagAttivo()) : vtbVett.getFlagAttivo() != null)
+            return false;
+        if (getNumAutoriz() != null ? !getNumAutoriz().equals(vtbVett.getNumAutoriz()) : vtbVett.getNumAutoriz() != null)
+            return false;
+        return getVtbVetr() != null ? getVtbVetr().equals(vtbVett.getVtbVetr()) : vtbVett.getVtbVetr() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCodVvet().hashCode();
+        result = 31 * result + (getCodLettVett() != null ? getCodLettVett().hashCode() : 0);
+        result = 31 * result + (getCodAnag() != null ? getCodAnag().hashCode() : 0);
+        result = 31 * result + (getRagSoc() != null ? getRagSoc().hashCode() : 0);
+        result = 31 * result + (getIndirizzo() != null ? getIndirizzo().hashCode() : 0);
+        result = 31 * result + (getCap() != null ? getCap().hashCode() : 0);
+        result = 31 * result + (getCitta() != null ? getCitta().hashCode() : 0);
+        result = 31 * result + (getProv() != null ? getProv().hashCode() : 0);
+        result = 31 * result + (getNazione() != null ? getNazione().hashCode() : 0);
+        result = 31 * result + (getTelefono() != null ? getTelefono().hashCode() : 0);
+        result = 31 * result + (getFax() != null ? getFax().hashCode() : 0);
+        result = 31 * result + (getPartIva() != null ? getPartIva().hashCode() : 0);
+        result = 31 * result + (getNote() != null ? getNote().hashCode() : 0);
+        result = 31 * result + (geteMail() != null ? geteMail().hashCode() : 0);
+        result = 31 * result + (getModStamp() != null ? getModStamp().hashCode() : 0);
+        result = 31 * result + (getCoefVol() != null ? getCoefVol().hashCode() : 0);
+        result = 31 * result + (getFlagAttivo() != null ? getFlagAttivo().hashCode() : 0);
+        result = 31 * result + (getNumAutoriz() != null ? getNumAutoriz().hashCode() : 0);
+        result = 31 * result + (getVtbVetr() != null ? getVtbVetr().hashCode() : 0);
+        return result;
+    }
+}

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

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.model.dto;
+
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class AlreadyRegisteredUDCDTO {
+
+    private MtbColt mtbColt;
+
+    private boolean canBeRecovered;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public AlreadyRegisteredUDCDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public boolean isCanBeRecovered() {
+        return canBeRecovered;
+    }
+
+    public AlreadyRegisteredUDCDTO setCanBeRecovered(boolean canBeRecovered) {
+        this.canBeRecovered = canBeRecovered;
+        return this;
+    }
+}

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

@@ -54,7 +54,7 @@ public class PickDataDTO {
         if (!UtilityString.isNullOrEmpty(partitaMag)) {
             MtbPartitaMag mtbPartitaMag = new MtbPartitaMag()
                     .setPartitaMag(partitaMag)
-                    .setDataScad(UtilityDate.recognizeDateWithExceptionHandler(dataScad));
+                    .setDataScad(UtilityDate.recognizeLocalDateWithExceptionHandler(dataScad));
 
             manualPickDTO.setMtbPartitaMag(mtbPartitaMag);
         }

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

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.model.dto;
 
 import java.util.Date;
 
+import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
+
 public class StatoArticoloDTO {
     private String codMart;
 
@@ -17,7 +19,7 @@ public class StatoArticoloDTO {
 
     private Integer ggUtili;
 
-    private Integer statoArt;
+    private StatoPartitaMag statoArt;
 
     public String getCodMart() {
         return codMart;
@@ -82,11 +84,11 @@ public class StatoArticoloDTO {
         return this;
     }
 
-    public Integer getStatoArt() {
+    public StatoPartitaMag getStatoArt() {
         return statoArt;
     }
 
-    public StatoArticoloDTO setStatoArt(Integer statoArt) {
+    public StatoArticoloDTO setStatoArt(StatoPartitaMag statoArt) {
         this.statoArt = statoArt;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/secondary/StatoPartitaMag.java

@@ -2,9 +2,10 @@ package it.integry.integrywmsnative.core.model.secondary;
 
 public enum StatoPartitaMag {
 
-    IN_SCADENZA(1),
-    SCADUTO(2),
-    NON_IN_SCADENZA(3);
+    SCADUTO(1),
+    IN_SCADENZA(2),
+    NON_IN_SCADENZA(3),
+    DISATTIVO(4);
 
     private final int text;
 

app/src/main/java/it/integry/integrywmsnative/core/report/ReportType.java

@@ -10,8 +10,6 @@ public enum ReportType {
     ETICHETTA_SSCC_LAVORAZIONE(1),
     @SerializedName("2")
     ETICHETTA_SSCC_SPEDIZIONE(2),
-    @SerializedName("3")
-    WMS_SPEDIZIONE_ETICHETTE_SSCC_ORD(3),
     @SerializedName("4")
     WMS_SPEDIZIONE_PACKING_LIST_ORD(4),
     @SerializedName("5")

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

@@ -22,6 +22,7 @@ public class HttpInterceptor implements Interceptor {
         final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
         final String USERNAME       = SettingsManager.i().getUser().getUsername();
         final String PASSWORD       = SettingsManager.i().getUser().getPassword();
+        final String DEVICE_ID      = SettingsManager.i().getUserSession().getDeviceId();
 
         final Request request = chain.request();
         final HttpUrl url = request.url().newBuilder()
@@ -36,6 +37,7 @@ public class HttpInterceptor implements Interceptor {
                 .addHeader("Accept", "*/*")
                 .addHeader("username", USERNAME != null ? USERNAME : "")
                 .addHeader("password", PASSWORD != null ? PASSWORD : "")
+                .addHeader("device_id", DEVICE_ID != null ? DEVICE_ID : "")
                 .url(url).build();
 
         return chain.proceed(newRequest);

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

@@ -1,24 +1,17 @@
 package it.integry.integrywmsnative.core.rest;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 
-import java.lang.reflect.Modifier;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer;
-import it.integry.integrywmsnative.core.rest.deserializer.LocalDateTimeDeserializer;
-import it.integry.integrywmsnative.core.rest.serializer.LocalDateSerializer;
-import it.integry.integrywmsnative.core.rest.serializer.LocalDateTimeSerializer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityGson;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -63,19 +56,16 @@ public class RESTBuilder {
 
         OkHttpClient client = clientBuilder.build();
 
-        String endpoint = protocol + "://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
+        String endpoint = protocol + "://" + host + (port > 0 ? ":" + port : "") + "/" + (addEmsApi ? "ems-api/" : "");
 
 
-        Gson gson = new GsonBuilder()
-                .setDateFormat("dd/MM/yyyy HH:mm:ss")
-                .excludeFieldsWithModifiers(Modifier.TRANSIENT)
-                .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer())
-                .registerTypeAdapter(LocalDate.class, new LocalDateSerializer())
-                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeDeserializer())
-                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
-                .create();
+        Gson gson = UtilityGson.createObject();
 
-        Retrofit retrofit = new Retrofit.Builder().addConverterFactory(GsonConverterFactory.create(gson)).baseUrl(endpoint).client(client).build();
+        Retrofit retrofit = new Retrofit.Builder()
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .baseUrl(endpoint)
+                .client(client)
+                .build();
 
         return retrofit.create(service);
     }

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

@@ -1,11 +1,11 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -14,9 +14,14 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -31,23 +36,28 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
-    public void getByBarcodeProd(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void searchByBarcode(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumerService.getByBarcodeProd(barcodeProd).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
-                analyzeAnswer(response, "getByBarcodeProd", (m) -> {
-                    List<MtbAart> aartList = response.body().getEntityList();
-                    aartList = aartList != null ? Stream.of(aartList).filter(x -> x.getFlagStato().equalsIgnoreCase("A")).toList() : null;
-                    onComplete.run(aartList);
-                }, onFailed);
-            }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+        var request = new SearchArticoloByBarcodeRequestDTO()
+                .setBarcode(barcodeProd)
+                .setOnlyActive(true);
+
+        articoloRESTConsumerService
+                .searchByBarcode(request)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Response<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> response) {
+                        analyzeAnswer(response, "searchByBarcode", (m) -> {
+                            onComplete.run(response.body().getDto().getArts());
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
     }
 
 
@@ -57,24 +67,26 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     public static void getByCodMartsStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
 
-        String joinedCods = Stream.of(codMartToFind)
-                .collect(Collectors.joining(","));
+        var codMarts = Stream.of(codMartToFind)
+                .withoutNulls()
+                .distinct().toList();
 
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(joinedCods).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
-                analyzeAnswer(response, "getByCodMart", (m) -> {
-                    onComplete.run(response.body().getEntityList());
-                }, onFailed);
-            }
+        articoloRESTConsumer
+                .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
+                        .setCodMarts(codMarts))
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<MtbAart>>> call, Response<ServiceRESTResponse<List<MtbAart>>> response) {
+                        analyzeAnswer(response, "getByCodMart", onComplete, onFailed);
+                    }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<MtbAart>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
 
     }
 
@@ -98,23 +110,9 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     public void getByCodMart(String codMartToFind, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed) {
 
-        ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(codMartToFind).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
-                analyzeAnswer(response, "getByCodMart", (m) -> {
-                    if (response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) {
-                        onComplete.run(response.body().getEntityList().get(0));
-                    } else onComplete.run(null);
-
-                }, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+        getByCodMarts(Collections.singletonList(codMartToFind), artList -> {
+            onComplete.run(artList != null && !artList.isEmpty() ? artList.get(0) : null);
+        }, onFailed);
     }
 
 
@@ -131,8 +129,80 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {
         }.getType();
-        this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
 
+        this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
     }
 
+
+    public void getUntMisArts(List<String> inputUntMis, RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<HashMap<String, Object>> whereCondList = Stream.of(inputUntMis)
+                .distinct()
+                .withoutNulls()
+                .map(x -> {
+                    HashMap<String, Object> data = new HashMap<>();
+                    data.put("unt_mis", x);
+                    return data;
+                })
+                .toList();
+
+        var whereCond = whereCondList.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondList);
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbUntMis>>() {
+        }.getType();
+        this.systemRESTConsumer.processSql("SELECT * FROM mtb_unt_mis " + whereCond, typeOfObjectsList, onComplete, onFailed);
+    }
+
+    public void fillMtbAartsWithMtbUntMis(List<MtbAart> inputMtbAart, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+        var inputUntMis = new ArrayList<String>();
+
+        if (inputMtbAart != null && !inputMtbAart.isEmpty()) {
+            inputUntMis.addAll(Stream.of(inputMtbAart)
+                    .map(MtbAart::getUntMis)
+                    .withoutNulls()
+                    .distinct()
+                    .toList());
+        }
+
+        if (inputUntMis.isEmpty()) {
+            onComplete.run(inputMtbAart);
+            return;
+        }
+
+        getUntMisArts(inputUntMis, mtbUntMiss -> {
+            for (var item : inputMtbAart) {
+                var mtbUntMis = Stream.of(mtbUntMiss).filter(x -> x.getUntMis().equalsIgnoreCase(item.getUntMis()))
+                        .findFirstOrElse(null);
+
+                if (mtbUntMis != null)
+                    item.setMtbUntMis(Collections.singletonList(mtbUntMis));
+            }
+
+            onComplete.run(inputMtbAart);
+        }, onFailed);
+    }
+
+
+    public void updateBarcodeImballo(String codMart, String newBarcodeImballo, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+
+        var request = new UpdateBarcodeImballoRequestDTO()
+                .setCodMart(codMart)
+                .setNewBarcodeImballo(newBarcodeImballo);
+
+        articoloRESTConsumerService
+                .updateBarcodeImballo(request)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "updateBarcodeImballo", m -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }

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

@@ -5,19 +5,26 @@ import java.util.List;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
 
 public interface ArticoloRESTConsumerService {
 
+    @POST("wms/articolo/searchByBarcode")
+    Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> searchByBarcode(@Body() SearchArticoloByBarcodeRequestDTO searchArticoloByBarcodeRequest);
 
-    @POST("SM2getArticoloByBarcode")
-    Call<ServiceRESTResponse<MtbAart>> getByBarcodeProd(@Query("barcode") String barcodeProd);
+    @POST("wms/articolo/retrieveByCodMart")
+    Call<ServiceRESTResponse<List<MtbAart>>> getByCodMart(@Body RetrieveArticoloByCodMartRequestDTO retrieveArticoloByCodMartRequest);
 
-    @GET("SM2getArticoloByCodMart")
-    Call<ServiceRESTResponse<MtbAart>> getByCodMart(@Query("codMart") String barcodeProd);
+    @POST("wms/articolo/updateBarcodeImballo")
+    Call<ServiceRESTResponse<Void>> updateBarcodeImballo(@Body UpdateBarcodeImballoRequestDTO updateBarcodeImballoRequest);
 
     @GET("getProductLotStatus")
     Call<ServiceRESTResponse<List<StatoArticoloDTO>>> getStatoPartita(@Query("codMart") String codMart, @Query("partitaMag") String partitaMag);

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

@@ -3,32 +3,24 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import javax.inject.Singleton;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.ean128.Ean128Service;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 @Singleton
 public class BarcodeRESTConsumer extends _BaseRESTConsumer {
 
+    private final Ean128Service ean128Service;
+
+    public BarcodeRESTConsumer(Ean128Service ean128Service) {
+        this.ean128Service = ean128Service;
+    }
+
     public void decodeEan128(BarcodeScanDTO barcodeObj, RunnableArgs<Ean128Model> onComplete, RunnableArgs<Exception> onFailed) {
-
-        String ean128 = barcodeObj.getStringValue().replaceAll("" + ((char) 29), "|");
-
-        BarcodeRESTConsumerService barcodeRESTConsumerService = RESTBuilder.getService(BarcodeRESTConsumerService.class);
-        barcodeRESTConsumerService.decodeEan128(ean128).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<Ean128Model>> call, Response<ServiceRESTResponse<Ean128Model>> response) {
-                analyzeAnswer(response, "DecodeEan128", onComplete, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<Ean128Model>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+        try {
+            onComplete.run(this.ean128Service.decode(barcodeObj));
+        } catch (Exception e){
+            onFailed.run(e);
+        }
     }
 }

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

@@ -0,0 +1,134 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface {
+
+    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.createUDC(createUDCRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
+                        analyzeAnswer(response, "accettazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
+    @Override
+    public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
+                        analyzeAnswer(response, "accettazione/closeUDC", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
+                        analyzeAnswer(response, "accettazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
+                        analyzeAnswer(response, "accettazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "accettazione/deleteUDCRow", data -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+public interface ColliAccettazioneRESTConsumerService {
+
+    @POST("wms/accettazione/createUDC")
+    Call<ServiceRESTResponse<CreateUDCResponseDTO>> createUDC(@Body CreateUDCRequestDTO createUDCRequestDTO);
+
+    @POST("wms/accettazione/closeUDC")
+    Call<ServiceRESTResponse<CloseUDCResponseDTO>> closeUDC(@Body CloseUDCRequestDTO closeUDCRequestDTO);
+
+    @POST("wms/accettazione/insertUDCRow")
+    Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> insertUDCRow(@Body InsertUDCRowRequestDTO insertUDCRowRequestDTO);
+
+    @POST("wms/accettazione/editUDCRow")
+    Call<ServiceRESTResponse<EditUDCRowResponseDTO>> editUDCRow(@Body EditUDCRowRequestDTO editUDCRowRequestDTO);
+
+    @POST("wms/accettazione/deleteUDCRow")
+    Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
+
+    @GET("wms/accettazione/checkIfBarcodeUlAlreadyRegistered")
+    Call<ServiceRESTResponse<Boolean>> checkIfBarcodeUlAlreadyRegistered(@Query("barcodeUl") String barcodeUl);
+
+}

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

@@ -1,33 +1,124 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.math.BigDecimal;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.rest.model.uds.CanUDSBeDeletedRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.PrintUDSRequestDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
-public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements ColliScaricoRESTConsumerInterface {
+public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface, ColliScaricoRESTConsumerInterface {
 
 
+    private final SettingsManager settingsManager;
+
+    public ColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
+        this.settingsManager = settingsManager;
+    }
+
+    @Override
+    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.createUDC(createUDCRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
+                        analyzeAnswer(response, "lavorazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
+                        analyzeAnswer(response, "lavorazione/closeUDC", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
+                        analyzeAnswer(response, "lavorazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    @Override
+    public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
+                        analyzeAnswer(response, "lavorazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
     public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
@@ -64,63 +155,6 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                 });
     }
 
-    @Override
-    public void canUDSBeDeleted(CanUDSBeDeletedRequestDTO canUDSBeDeletedRequestDTO, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
-
-        colliLavorazioneRESTConsumerService.canUDSBeDeleted(canUDSBeDeletedRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
-                        analyzeAnswer(response, "lavorazione/canUDSBeDeleted", onComplete, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
-    @Override
-    public void deleteUDS(DeleteUDSRequestDTO deleteUDSRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
-
-        colliLavorazioneRESTConsumerService.deleteUDS(deleteUDSRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "lavorazione/deleteUDS", Void -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
-    @Override
-    public void printUDS(PrintUDSRequestDTO printUDSRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
-
-        colliLavorazioneRESTConsumerService.printUDS(printUDSRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "lavorazione/printUDS", Void -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
     @Override
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
@@ -174,4 +208,60 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                 });
     }
 
+    @Override
+    public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "lavorazione/deleteUDCRow", data -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+
+    public void createColloScaricoDaArticolo(MtbAart mtbAart,
+                                             String partitaMag,
+                                             MtbDepoPosizione posizione,
+                                             BigDecimal qta, BigDecimal qtaCnf, BigDecimal numCnf,
+                                             BigDecimal pesoNettoKg, BigDecimal pesoLordoKg,
+                                             Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        CreateUDSFromArtRequestDTO createUDSFromArtRequestDTO = new CreateUDSFromArtRequestDTO()
+                .setCodMart(mtbAart.getCodMart())
+                .setCodMdep(settingsManager.getSettings().getUserSession().getDepo().getCodMdep())
+                .setPartitaMag(partitaMag)
+                .setPosizione(posizione != null ? posizione.getPosizione() : null)
+                .setQta(qta)
+                .setQtaCnf(qtaCnf)
+                .setNumCnf(numCnf)
+                .setPesoLordoKg(pesoLordoKg)
+                .setPesoNettoKg(pesoNettoKg);
+
+        if (posizione != null && posizione.isFlagLineaProduzione()) {
+            createUDSFromArtRequestDTO
+                    .setCodJfas(posizione.getPosizione());
+        }
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.createUDSFromArt(createUDSFromArtRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "lavorazione/createUDSFromArt", data -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }

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

@@ -1,46 +1,62 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.rest.model.uds.CanUDSBeDeletedRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.PrintUDSRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
 
 public interface ColliLavorazioneRESTConsumerService {
 
+    @POST("wms/lavorazione/createUDC")
+    Call<ServiceRESTResponse<CreateUDCResponseDTO>> createUDC(@Body CreateUDCRequestDTO createUDCRequestDTO);
+
     @POST("wms/lavorazione/createUDS")
     Call<ServiceRESTResponse<CreateUDSResponseDTO>> createUDS(@Body CreateUDSRequestDTO createUDSRequestDTO);
 
+    @POST("wms/lavorazione/closeUDC")
+    Call<ServiceRESTResponse<CloseUDCResponseDTO>> closeUDC(@Body CloseUDCRequestDTO createUDCRequestDTO);
+
     @POST("wms/lavorazione/closeUDS")
     Call<ServiceRESTResponse<CloseUDSResponseDTO>> closeUDS(@Body CloseUDSRequestDTO createUDSRequestDTO);
 
-    @POST("wms/lavorazione/canUDSBeDeleted")
-    Call<ServiceRESTResponse<Boolean>> canUDSBeDeleted(@Body CanUDSBeDeletedRequestDTO canUDSBeDeletedRequestDTO);
-
-    @POST("wms/lavorazione/deleteUDS")
-    Call<ServiceRESTResponse<Void>> deleteUDS(@Body DeleteUDSRequestDTO deleteUDSRequestDTO);
-
-    @POST("wms/lavorazione/printUDS")
-    Call<ServiceRESTResponse<Void>> printUDS(@Body PrintUDSRequestDTO printUDSRequestDTO);
+    @POST("wms/lavorazione/insertUDCRow")
+    Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> insertUDCRow(@Body InsertUDCRowRequestDTO insertUDCRowRequestDTO);
 
     @POST("wms/lavorazione/insertUDSRow")
     Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> insertUDSRow(@Body InsertUDSRowRequestDTO insertUDSRowRequestDTO);
 
+    @POST("wms/lavorazione/editUDCRow")
+    Call<ServiceRESTResponse<EditUDCRowResponseDTO>> editUDCRow(@Body EditUDCRowRequestDTO editUDCRowRequestDTO);
+
     @POST("wms/lavorazione/editUDSRow")
     Call<ServiceRESTResponse<EditUDSRowResponseDTO>> editUDSRow(@Body EditUDSRowRequestDTO editUDSRowRequestDTO);
 
     @POST("wms/lavorazione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
+    @POST("wms/lavorazione/deleteUDCRow")
+    Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
+
+    @POST("wms/lavorazione/createUDSFromArt")
+    Call<ServiceRESTResponse<Void>> createUDSFromArt(@Body CreateUDSFromArtRequestDTO createUDSFromArtRequestDTO);
+
 }

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

@@ -18,6 +18,7 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
@@ -31,6 +32,9 @@ import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -47,18 +51,23 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
+    private final SettingsManager mSettingsManager;
 
     public ColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
                                       ArticoloRESTConsumer articoloRESTConsumer,
-                                      EntityRESTConsumer entityRESTConsumer) {
+                                      EntityRESTConsumer entityRESTConsumer,
+                                      SettingsManager settingsManager) {
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
+        this.mSettingsManager = settingsManager;
     }
 
     public void saveCollo(MtbColt mtbColtToSave, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
-        mtbColtToSave.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+        mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+        mtbColtToSaveClone.setOnlyPkMaster(false);
+
 
         mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
 
@@ -166,6 +175,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(newMtbColt, onComplete, onFailed);
     }
 
+
     public void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
@@ -269,14 +279,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(mtbColtToCreate, onComplete, onFailed);
     }
 
-    public void deleteCollo(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        mtbColtToDelete.setOperation(CommonModelConsts.OPERATION.DELETE);
-
-        saveCollo(mtbColtToDelete, value -> {
-            if (onComplete != null) onComplete.run();
-        }, onFailed);
-    }
     public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback<>() {
@@ -305,6 +307,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
     }
+
     public static void fillMtbAartsOfMtbColtsStatic(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<String> codMarts = new ArrayList<>();
 
@@ -449,52 +452,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
-    public void canLUBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("mtb_colt.gestione", mtbColt.getGestione());
-        params.put("mtb_colt.ser_collo", mtbColt.getSerCollo());
-        params.put("mtb_colt.num_collo", mtbColt.getNumCollo());
-        params.put("mtb_colt.data_collo", mtbColt.getDataColloD());
-
-        String whereCond = UtilityQuery.concatFieldsInWhereCond(params);
-
-
-        String query = "SELECT mtb_colt.* " +
-                "FROM mtb_colt " +
-                "LEFT OUTER JOIN " +
-                "  (SELECT gestione, " +
-                "          data_collo, " +
-                "          num_collo, " +
-                "          ser_collo, " +
-                "          cod_mart, " +
-                "          cod_col, " +
-                "          cod_tagl, " +
-                "          partita_mag, " +
-                "          SUM(qta_col) sum_qta_col " +
-                "   FROM mtb_colr " +
-                "   GROUP BY gestione, " +
-                "            data_collo, " +
-                "            num_collo, " +
-                "            ser_collo, " +
-                "            cod_mart, " +
-                "            cod_col, " +
-                "            cod_tagl, " +
-                "            partita_mag) sum_mtb_colr ON mtb_colt.gestione = sum_mtb_colr.gestione " +
-                "AND mtb_colt.num_collo = sum_mtb_colr.num_collo " +
-                "AND mtb_colt.data_collo = sum_mtb_colr.data_collo " +
-                "AND mtb_colt.ser_collo = sum_mtb_colr.ser_collo " +
-                "AND sum_mtb_colr.sum_qta_col > 0 " +
-                "WHERE sum_mtb_colr.num_collo IS NULL " +
-                "  AND " + whereCond;
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
-        }.getType();
-        this.mSystemRESTConsumer.<ArrayList<MtbColt>>processSql(query, typeOfObjectsList, data -> {
-            onComplete.run(data != null && data.size() > 0);
-        }, onFailed);
-    }
 
     public static void retrieveBasketColli(RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
@@ -698,4 +655,69 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             onComplete.run(data.get(0));
         }, onFailed);
     }
+
+
+    public void canULBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        CanULBeDeletedRequestDTO canULBeDeletedRequestDTO = new CanULBeDeletedRequestDTO()
+                .setMtbColt(mtbColt);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+
+        colliMagazzinoRESTConsumerService.canULBeDeleted(canULBeDeletedRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "generic/canULBeDeleted", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
+    public void deleteUL(DeleteULRequestDTO deleteULRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+
+        colliMagazzinoRESTConsumerService.deleteUL(deleteULRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "generic/deleteUL", Void -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
+    public void printUL(PrintULRequestDTO printULRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+
+        colliMagazzinoRESTConsumerService.printUL(printULRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "generic/printUL", Void -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
+
 }

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

@@ -8,6 +8,9 @@ import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -43,4 +46,14 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("wms/confirmGiacenzaUL")
     Call<ServiceRESTResponse<Object>> confirmGiacenzaUL(@Body MtbColt mtbColt);
 
+
+    @POST("wms/generic/canULBeDeleted")
+    Call<ServiceRESTResponse<Boolean>> canULBeDeleted(@Body CanULBeDeletedRequestDTO canULBeDeletedRequestDTO);
+
+    @POST("wms/generic/deleteUL")
+    Call<ServiceRESTResponse<Void>> deleteUL(@Body DeleteULRequestDTO deleteULRequestDTO);
+
+    @POST("wms/generic/printUL")
+    Call<ServiceRESTResponse<Void>> printUL(@Body PrintULRequestDTO printULRequestDTO);
+
 }

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -8,18 +10,17 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.rest.model.uds.CanUDSBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.PrintUDSRequestDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -64,60 +65,6 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
-    public void canUDSBeDeleted(CanUDSBeDeletedRequestDTO canUDSBeDeletedRequestDTO, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
-
-        colliSpedizioneRESTConsumerService.canUDSBeDeleted(canUDSBeDeletedRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
-                        analyzeAnswer(response, "spedizione/canUDSBeDeleted", onComplete, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
-    public void deleteUDS(DeleteUDSRequestDTO deleteUDSRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
-
-        colliSpedizioneRESTConsumerService.deleteUDS(deleteUDSRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "spedizione/deleteUDS", Void -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
-    public void printUDS(PrintUDSRequestDTO printUDSRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
-
-        colliSpedizioneRESTConsumerService.printUDS(printUDSRequestDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "spedizione/printUDS", Void -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-
-    }
-
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
@@ -170,4 +117,21 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
+    public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+
+        colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
+                        analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception());
+                    }
+                });
+    }
+
 }

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

@@ -1,18 +1,18 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.rest.model.uds.CanUDSBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.PrintUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
@@ -25,14 +25,8 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/closeUDS")
     Call<ServiceRESTResponse<CloseUDSResponseDTO>> closeUDS(@Body CloseUDSRequestDTO createUDSRequestDTO);
 
-    @POST("wms/spedizione/canUDSBeDeleted")
-    Call<ServiceRESTResponse<Boolean>> canUDSBeDeleted(@Body CanUDSBeDeletedRequestDTO canUDSBeDeletedRequestDTO);
-
-    @POST("wms/spedizione/deleteUDS")
-    Call<ServiceRESTResponse<Void>> deleteUDS(@Body DeleteUDSRequestDTO deleteUDSRequestDTO);
-
     @POST("wms/spedizione/printUDS")
-    Call<ServiceRESTResponse<Void>> printUDS(@Body PrintUDSRequestDTO printUDSRequestDTO);
+    Call<ServiceRESTResponse<Void>> printUDS(@Body PrintULRequestDTO printULRequestDTO);
 
     @POST("wms/spedizione/insertUDSRow")
     Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> insertUDSRow(@Body InsertUDSRowRequestDTO insertUDSRowRequestDTO);
@@ -43,4 +37,7 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
+    @POST("wms/spedizione/duplicateUDS")
+    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDS(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
+
 }

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

@@ -13,6 +13,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 @Singleton
 public class CommessaRESTConsumer extends _BaseRESTConsumer {
@@ -26,6 +27,8 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer {
 
     public void getJtbComts(List<String> itemsToFind, RunnableArgs<List<JtbComt>> onComplete, RunnableArgs<Exception> onFailed) {
         var whereCondMap = Stream.of(itemsToFind)
+                .withoutNulls()
+                .filter(x -> !UtilityString.isNullOrEmpty(x))
                 .map(x -> {
                     HashMap<String, Object> vars = new HashMap<>();
                     vars.put("cod_jcom", x);
@@ -33,6 +36,11 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer {
                 })
                 .toList();
 
+        if(whereCondMap.isEmpty()) {
+            onComplete.run(new ArrayList<>());
+            return;
+        }
+
         var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
 
         Type typeOfObjectsList = new TypeToken<ArrayList<JtbComt>>() {}.getType();

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

@@ -9,7 +9,6 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 
 @Singleton
@@ -28,27 +27,4 @@ public class DepositoRESTConsumer extends _BaseRESTConsumer {
         }.getType();
         this.systemRESTConsumer.processSql("SELECT * FROM mtb_depo", typeOfObjectsList, onComplete, onFailed);
     }
-
-    public void getDepoByCodMdep(String codMdep, RunnableArgs<MtbDepo> onComplete, RunnableArgs<Exception> onFailed) {
-
-        MtbDepo mtbDepo = new MtbDepo();
-        mtbDepo.setCodMdep(codMdep);
-        mtbDepo.setOperation(CommonModelConsts.OPERATION.SELECT);
-        mtbDepo.setOnlyPkMaster(false);
-
-        this.entityRESTConsumer.selectEntity(mtbDepo, new ISimpleOperationCallback<>() {
-            @Override
-            public void onSuccess(List<MtbDepo> value) {
-                if (value != null && value.size() > 0) {
-                    onComplete.run(value.get(0));
-                }
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                onFailed.run(ex);
-            }
-        }, MtbDepo.class);
-    }
-
 }

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -18,7 +19,7 @@ import retrofit2.Response;
 
 @Singleton
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
-    
+
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
@@ -50,10 +51,23 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void checkDocument(String fornitore, String numDoc, String dataDoc, String tipoDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        inventarioRESTConsumerService.checkDocument(fornitore, numDoc,tipoDoc, dataDoc)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "checkDocument", onComplete, onFailed);
+                    }
 
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 
-
-    public void loadDocumentoAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
         inventarioRESTConsumerService.retrieveArts(codDtip, codMgrp, codAnagForn)
                 .enqueue(new Callback<>() {

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDoct;
@@ -20,8 +21,12 @@ public interface DocumentiRESTConsumerService {
     @POST("createDocFromColli")
     Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
 
-
-
+    @GET("wms/documento/checkDoc")
+    Call<ServiceRESTResponse<Boolean>> checkDocument(
+            @Query("fornitore") String fornitore,
+            @Query("numDoc") String numDoc,
+            @Query("tipoDoc") String tipoDoc,
+            @Query("dataDoc") String dataDoc);
 
     @GET("wms/documento/arts")
     Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> retrieveArts(

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

@@ -15,6 +15,7 @@ import it.integry.integrywmsnative.core.model.EntityBase;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityGson;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -39,7 +40,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
 
                             if (response.body() != null) {
                                 if (response.body().getEsito() == EsitoType.OK) {
-                                    Gson gson = new Gson();
+                                    Gson gson = UtilityGson.createObject();
                                     T object = gson.fromJson(response.body().getEntity(), type);
 
                                     callback.onSuccess(object);
@@ -83,7 +84,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
                     if (response.body() != null) {
 
                         ArrayList<T> responseList = new ArrayList<>();
-                        Gson gson = new Gson();
+                        Gson gson = UtilityGson.createObject();
 //                        Type typeOfObjectsList = new TypeToken<T>() {}.getType();
 
                         for (ServiceRESTResponse<JsonObject> jsonSingleObject : response.body()) {
@@ -120,18 +121,19 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
     }
 
 
+    @Deprecated
     public <T extends EntityBase> void selectEntity(T entityToSave, final ISimpleOperationCallback<List<T>> callback, Class type) {
 
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         Call<ServiceRESTResponse<JsonObject>> request = service.processEntity(entityToSave);
-        request.enqueue(new Callback<ServiceRESTResponse<JsonObject>>() {
+        request.enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 if (response.isSuccessful()) {
 
                     if (response.body() != null) {
                         if (response.body().getEsito() == EsitoType.OK) {
-                            Gson gson = new Gson();
+                            Gson gson = UtilityGson.createObject();
                             List<JsonObject> jsons = response.body().getEntityList();
 
                             List<T> newList = new ArrayList<T>();

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

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import android.util.Log;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -11,6 +12,7 @@ import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.GestSetupDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.settings.StbGestSetupReader;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -24,18 +26,18 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
         service.getGestSetupValue(gestName, sectionName, keySection)
                 .enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<GestSetupDTO>> call, Response<ServiceRESTResponse<GestSetupDTO>> response) {
-                analyzeAnswer(response, "GestSetup", onComplete, onFailed);
-            }
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<GestSetupDTO>> call, Response<ServiceRESTResponse<GestSetupDTO>> response) {
+                        analyzeAnswer(response, "GestSetup", onComplete, onFailed);
+                    }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
-                Log.e("GestSetup", t.toString());
-                // UtilityLogger.errorMe(new Exception(t));
-                if (onFailed != null) onFailed.run(new Exception(t));
-            }
-        });
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
+                        Log.e("GestSetup", t.toString());
+                        // UtilityLogger.errorMe(new Exception(t));
+                        if (onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
     }
 
     public void getBooleanValue(String gestName, String sectionName, String keySection, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
@@ -76,12 +78,25 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getValues(String codMdep, List<StbGestSetup> stbGestSetupList, RunnableArgs<List<StbGestSetup>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getValues(String codMdep, List<StbGestSetupReader> stbGestSetupList, RunnableArgs<List<StbGestSetupReader>> onComplete, RunnableArgs<Exception> onFailed) {
+        var stbGestSetups = stbGestSetupList.stream().map(x -> (StbGestSetup) x).collect(Collectors.toList());
+
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValues(codMdep, stbGestSetupList).enqueue(new Callback<>() {
+        service.getGestSetupValues(codMdep, stbGestSetups).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Response<ServiceRESTResponse<List<StbGestSetup>>> response) {
-                analyzeAnswer(response, "GestSetup", onComplete, onFailed);
+                analyzeAnswer(response, "GestSetup", data -> {
+
+                    for (StbGestSetup stbGestSetup : data) {
+                        stbGestSetupList.stream().filter(x -> stbGestSetup.getGestName().equalsIgnoreCase(x.getGestName()) &&
+                                        stbGestSetup.getSection().equalsIgnoreCase(x.getSection()) &&
+                                        stbGestSetup.getKeySection().equalsIgnoreCase(x.getKeySection()))
+                                .findFirst()
+                                .ifPresent(x -> x.setValue(stbGestSetup.getValue()));
+                    }
+
+                    onComplete.run(stbGestSetupList);
+                }, onFailed);
             }
 
             @Override

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

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -13,8 +14,10 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationIncomingItemDto;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -22,11 +25,9 @@ import retrofit2.Response;
 @Singleton
 public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
-    public GiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
+    public GiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
 
     }
@@ -36,6 +37,48 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
         giacenzaRESTConsumerService.retrieveAvailableItems(posizione.getPosizione()).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
+                analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
+
+                    if(inventarioList != null && !inventarioList.isEmpty()){
+                        List<String> codMarts = Stream.of(inventarioList)
+                                .map(x -> x.getCodMart().trim())
+                                .toList();
+
+                        mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                            for (var row : inventarioList) {
+
+                                MtbAart foundMtbAart = null;
+                                Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                        .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                                        .findFirst();
+
+                                if (mtbAartOpt.isPresent()) {
+                                    foundMtbAart = mtbAartOpt.get();
+                                }
+
+                                row.setMtbAart(foundMtbAart);
+                            }
+
+                            onComplete.run(inventarioList);
+                        }, onFailed);
+                    }else{
+                        onComplete.run(new ArrayList<>());
+                    }
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+    public void getGiacenzeInPosizione(List<String> posizioni, boolean withTestataCollo, RunnableArgs<List<ArtsInGiacenzaDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
+        giacenzaRESTConsumerService.retrieveAvailableItems(posizioni, withTestataCollo).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> call, Response<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> response) {
                 analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
 
                     List<String> codMarts = Stream.of(inventarioList)
@@ -43,18 +86,22 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                             .toList();
 
                     mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
-                        for (var row : inventarioList) {
+                        for (var articoli : inventarioList) {
+                            List<MvwSitArtUdcDetInventario> mvwSitArtUdcDetInventario = articoli.getMvwSitArtUdcDetInventarioDTO();
+                            if (mvwSitArtUdcDetInventario != null && !mvwSitArtUdcDetInventario.isEmpty()){
+                                for (var row : mvwSitArtUdcDetInventario){
+                                    MtbAart foundMtbAart = null;
+                                    Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                            .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                                            .findFirst();
 
-                            MtbAart foundMtbAart = null;
-                            Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
-                                    .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
-                                    .findFirst();
+                                    if (mtbAartOpt.isPresent()) {
+                                        foundMtbAart = mtbAartOpt.get();
+                                    }
 
-                            if (mtbAartOpt.isPresent()) {
-                                foundMtbAart = mtbAartOpt.get();
+                                    row.setMtbAart(foundMtbAart);
+                                }
                             }
-
-                            row.setMtbAart(foundMtbAart);
                         }
 
                         onComplete.run(inventarioList);
@@ -63,7 +110,7 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> call, Throwable t) {
                 onFailed.run(new Exception(t));
             }
         });
@@ -120,7 +167,10 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, Response<ServiceRESTResponse<InstantItemSituationResponseDto>> response) {
-                        analyzeAnswer(response, "getInstantItemSituation", onComplete, onFailed);
+                        analyzeAnswer(response, "getInstantItemSituation", data -> {
+
+                            fillInstantItemSituationWithMtbAarts(data, onComplete, onFailed);
+                        }, onFailed);
                     }
 
                     @Override
@@ -130,5 +180,54 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
+    private void fillInstantItemSituationWithMtbAarts(InstantItemSituationResponseDto data, RunnableArgs<InstantItemSituationResponseDto> onComplete, RunnableArgs<Exception> onFailed) {
+        var inputCodMarts = new ArrayList<String>();
+
+        if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
+            inputCodMarts.addAll(Stream.of(data.getIncomingItems())
+                    .map(InstantItemSituationIncomingItemDto::getCodMart)
+                    .toList());
+        }
+
+        if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
+            inputCodMarts.addAll(Stream.of(data.getAvailableItems())
+                    .map(MvwSitArtUdcDetInventario::getCodMart)
+                    .toList());
+        }
+
+        if (inputCodMarts.isEmpty()) {
+            onComplete.run(data);
+            return;
+        }
+
+        mArticoloRESTConsumer.getByCodMarts(inputCodMarts, mtbAarts -> {
+
+            mArticoloRESTConsumer.fillMtbAartsWithMtbUntMis(mtbAarts, newMtbAarts -> {
+                if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
+                    for (var item : data.getIncomingItems()) {
+                        var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
+                                .findFirstOrElse(null);
+
+                        if (mtbAart != null)
+                            item.setMtbAart(mtbAart);
+                    }
+                }
+
+                if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
+                    for (var item : data.getAvailableItems()) {
+                        var mtbAart = Stream.of(newMtbAarts).filter(x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()))
+                                .findFirstOrElse(null);
+
+                        if (mtbAart != null)
+                            item.setMtbAart(mtbAart);
+                    }
+                }
+
+                onComplete.run(data);
+            }, onFailed);
+
+        }, onFailed);
+    }
+
 
 }

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

@@ -2,11 +2,16 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
+import it.integry.integrywmsnative.core.model.DtbDoct;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.Query;
 
 public interface GiacenzaRESTConsumerService {
@@ -15,6 +20,9 @@ public interface GiacenzaRESTConsumerService {
     Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> retrieveAvailableItems(
             @Query("posizione") String posizione);
 
+    @POST("wms/giacenza/availableItemsByPosizione")
+    Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> retrieveAvailableItems(@Body List<String> posizioni, @Query("withTestataCollo") boolean withTestataCollo);
+
     @GET("wms/giacenza/availableItemsByArticolo")
     Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> retrieveAvailableItemsByArt(
             @Query("codMart") String codMart);

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

@@ -0,0 +1,92 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Response;
+
+@Singleton
+public class ImballiRESTConsumer extends _BaseRESTConsumer {
+
+    private final ExecutorService executorService;
+
+    public ImballiRESTConsumer(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+
+    public List<MtbTCol> retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveTipiCollo(tipoImballo)
+                .execute();
+
+        return analyzeAnswer(response, "retrieveTipiCollo");
+    }
+
+    public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = retrieveTipiColloSyncronized(tipoImballo);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+
+    public void registraCaricoSyncronized(String codAnag, List<ImballoQuantityDTO> imballi) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<Void>> response = service.registraCarico(
+                        new RegistraCaricoImballiRequestDTO()
+                                .setCodAnag(codAnag)
+                                .setUsedImballi(imballi))
+                .execute();
+
+        analyzeAnswer(response, "registraCarico");
+    }
+
+    public void registraCarico(String codAnag, List<ImballoQuantityDTO> imballi, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                registraCaricoSyncronized(codAnag, imballi);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+
+    public void registraScaricoSyncronized(String codVettore, List<ImballoQuantityDTO> imballi) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<Void>> response = service.registraScarico(
+                        new RegistraScaricoImballiRequestDTO()
+                                .setCodVettore(codVettore)
+                                .setUsedImballi(imballi))
+                .execute();
+
+        analyzeAnswer(response, "registraScarico");
+    }
+
+    public void registraScarico(String idVettore, List<ImballoQuantityDTO> imballi, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                registraScaricoSyncronized(idVettore, imballi);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface ImballiRESTConsumerService {
+
+
+    @GET("wms/imballi/retrieve/{tipo}")
+    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
+
+    @POST("wms/imballi/registraCarico")
+    Call<ServiceRESTResponse<Void>> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest);
+
+    @POST("wms/imballi/registraScarico")
+    Call<ServiceRESTResponse<Void>> registraScarico(@Body RegistraScaricoImballiRequestDTO registraScaricoImballiRequest);
+
+}