Finish v1.24.1(269)_2

Aggiunto ulteriore controllo su licenza

.idea/.gitignore

@@ -0,0 +1 @@
+/saveactions_settings.xml

.idea/runConfigurations/app_base.xml

@@ -15,6 +15,7 @@
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -45,7 +46,7 @@
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>

.idea/runConfigurations/app_vglimenti.xml

@@ -15,6 +15,7 @@
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -45,7 +46,7 @@
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>

app/build.gradle

@@ -1,13 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (!project.hasProperty("disable-performance-plugin")) {
+    apply plugin: 'com.google.firebase.firebase-perf'
+}
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 247
-    def appVersionName = '1.20.0'
+    def appVersionCode = 269
+    def appVersionName = '1.24.1'
 
     signingConfigs {
         release {
@@ -27,12 +31,12 @@ android {
         }
     }
 
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -81,6 +85,7 @@ android {
     dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti"]
 
 
+
 }
 
 dependencies {
@@ -94,37 +99,37 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation platform('com.google.firebase:firebase-bom:29.1.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-core'
-    implementation 'com.google.firebase:firebase-crash'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.6.0'
+    implementation 'com.google.android.gms:play-services-basement:18.0.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     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.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.35.1'
+    def dagger2_version = '2.40'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version" // if you use the support libraries
+    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"
 
     //FAB
@@ -134,13 +139,11 @@ dependencies {
     implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
     implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
     implementation 'com.github.fede87:StatusBarAlert:1.0.1'
-    implementation 'com.github.akshay2211:Stash:master'
-    testImplementation 'junit:junit:4.13.2'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.3.0"
+    def room_version = "2.4.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -154,12 +157,14 @@ dependencies {
     implementation project(':barcode_base_android_library')
     implementation project(':honeywellscannerlibrary')
     implementation project(':keyobardemulatorscannerlibrary')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
-    androidTestImplementation 'org.testng:testng:7.4.0'
 
 
     implementation 'com.github.RaviKoradiya:LiveAdapter:1.3.4'
-    implementation 'org.reflections:reflections:0.10.2'
+
+    // Required -- JUnit 4 framework
+//    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
+//    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+//    androidTestImplementation 'org.testng:testng:7.4.0'
 }
 
 repositories {

app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package it.integry.integrywmsnative;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("it.integry.integrywmsnative", appContext.getPackageName());
-    }
-}

app/src/androidTest/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModelTest.java

@@ -1,8 +0,0 @@
-package it.integry.integrywmsnative.gest.spedizione;
-
-class SpedizioneViewModelTest {
-
-    @org.junit.jupiter.api.Test
-    void createNewLU() {
-    }
-}

app/src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
             android:screenOrientation="portrait"
@@ -40,7 +41,8 @@
         <activity
             android:name=".gest.main.MainActivity"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing">
+            android:windowSoftInputMode="adjustNothing"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
@@ -73,7 +75,8 @@
         <activity
             android:name=".SplashActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -5,20 +5,28 @@ import javax.inject.Singleton;
 import dagger.Component;
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.core.expansion.BaseActivityComponent;
+import it.integry.integrywmsnative.core.expansion.BaseActivityModule;
+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.contab_doc_interni.DocInterniComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairComponent;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormComponent;
 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.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliModule;
+import it.integry.integrywmsnative.gest.login.LoginComponent;
+import it.integry.integrywmsnative.gest.login.LoginModule;
 import it.integry.integrywmsnative.gest.main.MainActivityComponent;
 import it.integry.integrywmsnative.gest.main.MainActivityModule;
 import it.integry.integrywmsnative.gest.main.MainFragmentComponent;
@@ -43,6 +51,8 @@ import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamento
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeModule;
 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_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
@@ -57,10 +67,13 @@ import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviForn
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
 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.input_lu_prod.DialogInputLUProdComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
@@ -76,6 +89,9 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         RoomModule.class,
         SplashActivityModule.class,
         MainApplicationModule.class,
+        BaseActivityModule.class,
+        BaseFragmentModule.class,
+        LoginModule.class,
         MainActivityModule.class,
         MainFragmentModule.class,
         MainAccettazioneModule.class,
@@ -105,47 +121,98 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         ProdVersamentoMaterialeModule.class,
         DialogChooseArtsFromListaArtsModule.class,
         DocInterniModule.class,
-        DialogSelectMgrpDtipPairModule.class,
-        DocInterniEditFormModule.class
+        DialogSelectDocInfoModule.class,
+        DocInterniEditFormModule.class,
+        DialogSelectDocRowsModule.class,
+        DialogAskClienteModule.class,
+        DialogEditArticoloModule.class
 })
 public interface MainApplicationComponent {
 
+    BaseActivityComponent.Factory baseActivityComponent();
+
+    BaseFragmentComponent.Factory baseFragmentComponent();
+
     SplashActivityComponent.Factory splashActivityComponent();
+
+    LoginComponent.Factory loginActivityComponent();
+
     MainActivityComponent.Factory mainActivityComponent();
+
     MainFragmentComponent.Factory mainFragmentComponent();
+
     MainAccettazioneComponent.Factory mainAccettazioneComponent();
+
     ListaBancaliComponent.Factory listaBancaliComponent();
+
     ContenutoBancaleComponent.Factory contenutoBancaleComponent();
+
     PVOrdiniAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
     PVOrdineAcquistoEditComponent.Factory pvOrdineAcquistoEditComponent();
+
     PickingLiberoComponent.Factory pickingLiberoComponent();
+
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
+
     SpedizioneComponent.Factory spedizioneComponent();
+
     AccettazionePickingComponent.Factory accettazionePickingComponent();
+
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+
     UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
+
     PickingResiComponent.Factory pickingResiComponent();
+
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+
+    DialogAskClienteComponent.Factory dialogAskClienteComponent();
+
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+
     DialogInputLUProdComponent.Factory dialogInputLUProdComponent();
+
     DialogScanArtComponent.Factory dialogScanArtComponent();
+
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+
     VersamentoMerceComponent.Factory versamentoMerceComponent();
+
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+
     DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
+
     DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
+
     ProdRientroMerceComponent.Factory prodRientroMerceComponent();
+
     ProdRientroMerceOrderDetailComponent.Factory prodRientroMerceOrderDetailComponent();
+
     ProdOrdineProduzioneElencoComponent.Factory prodOrdineProduzioneElencoComponent();
+
     ProdRecuperoMaterialeComponent.Factory prodRecuperoMaterialeComponent();
+
     ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
+
     DialogChooseArtsFromListaArtsComponent.Factory dialogChooseArtsFromListaArtsComponent();
+
     DocInterniComponent.Factory docInterniComponent();
-    DialogSelectMgrpDtipPairComponent.Factory dialogSelectMgrpDtipPairComponent();
+
+    DialogSelectDocInfoComponent.Factory dialogSelectMgrpDtipPairComponent();
+
+    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
+
     DocInterniEditFormComponent.Factory docInterniEditFormComponent();
 
+    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
+
+    DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
+
     void inject(MainApplication mainApplication);
+
     void inject(AppContext mainApplication);
 
 }

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

@@ -19,14 +19,19 @@ import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
 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.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+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;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 @Module
 public class MainApplicationModule {
@@ -69,6 +74,24 @@ public class MainApplicationModule {
         return new MenuService(menuRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    UpdatesManager provideUpdatesManager() {
+        return new UpdatesManager();
+    }
+
+    @Provides
+    @Singleton
+    DialogProgressView providesDialogProgressView() {
+        return DialogProgressView.newInstance();
+    }
+
+    @Provides
+    @Singleton
+    DialogInputQuantityV2View providesDialogInputQuantityV2View() {
+        return new DialogInputQuantityV2View();
+    }
+
     @Provides
     @Singleton
     OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
@@ -165,5 +188,16 @@ public class MainApplicationModule {
         return new DocInterniRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    InventarioService provideInventarioService(GiacenzaRESTConsumer giacenzaRESTConsumer) {
+        return new InventarioService(giacenzaRESTConsumer);
+    }
 
 }

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -38,6 +39,12 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
     private RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult;
 
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, SplashActivity.class);
+        context.startActivity(intent);
+    }
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -16,7 +16,7 @@ public class CommonConst {
 
         public static String DEFAULT_ANONYMOUS_UL_SERIE = "UL";
 
-        public static int NUMBER_OF_DECIMAL_DIGITS = 3;
+        public static int NUMBER_OF_DECIMAL_DIGITS = 5;
     }
 
     public static class Files {

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

@@ -23,7 +23,7 @@ public class BarcodeCallbackDTO {
         return onScanSuccessfull;
     }
 
-    public BarcodeCallbackDTO setOnScanSuccessfull(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
+    public BarcodeCallbackDTO setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
         this.onScanSuccessfull = onScanSuccessfull;
         return this;
     }

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

@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
@@ -124,6 +125,14 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale)
                         .setDrawerIcon(R.drawable.ic_black_external)
                         .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance))
+
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce)
+                        .setCodMenu("MG059")
+                        .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione)
+                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                        .setFragmentFactory(ProdRientroMerceFragment::newInstance))
         ).addGroup(
                 new MenuGroup()
                         .setGroupText(R.string.internal_handling)

app/src/main/java/it/integry/integrywmsnative/core/coollection/Coollection.java

@@ -1,49 +0,0 @@
-package it.integry.integrywmsnative.core.coollection;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Contains;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Equals;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.EqualsIgnoreCase;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.GreaterThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.IsNull;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.LessThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Not;
-import it.integry.integrywmsnative.core.coollection.query.Query;
-
-import java.util.Collection;
-
-public class Coollection {
-
-  public static <T> Query<T> from(Collection<T> collection) {
-    return new Query<T>(collection);
-  }
-
-  public static Matcher eq(Object value) {
-    return new Equals(value);
-  }
-
-  public static Matcher contains(String value) {
-    return new Contains(value);
-  }
-
-  public static Matcher eqIgnoreCase(String value) {
-    return new EqualsIgnoreCase(value);
-  }
-
-  public static Matcher not(Matcher matcher) {
-    return new Not(matcher);
-  }
-
-  public static Matcher greaterThan(Number value) {
-    return new GreaterThan(value);
-  }
-
-  public static Matcher lessThan(Number value) {
-    return new LessThan(value);
-  }
-
-  public static Matcher isNull() {
-    return new IsNull();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/Matcher.java

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher;
-
-public interface Matcher {
-
-  boolean match(Object value);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Contains.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Contains implements Matcher {
-
-  private final String matcherValue;
-
-  public Contains(String matcherValue) {
-    this.matcherValue = matcherValue;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return String.valueOf(value).contains(matcherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Equals.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Equals implements Matcher {
-
-  private final Object value;
-
-  public Equals(Object value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return value.equals(anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/EqualsIgnoreCase.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class EqualsIgnoreCase implements Matcher {
-
-  private final String value;
-
-  public EqualsIgnoreCase(String value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return (value).equalsIgnoreCase((String) anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/GreaterThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class GreaterThan implements Matcher {
-
-  private final Number value;
-
-  public GreaterThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() > value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/IsNull.java

@@ -1,12 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class IsNull implements Matcher {
-
-  @Override
-  public boolean match(Object value) {
-    return value == null;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/LessThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class LessThan implements Matcher {
-
-  private final Number value;
-
-  public LessThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() < value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Not.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Not implements Matcher {
-
-  private final Matcher matcher;
-
-  public Not(Matcher matcher) {
-    this.matcher = matcher;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return !matcher.match(value);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/Query.java

@@ -1,90 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.criteria.CriteriaList;
-import it.integry.integrywmsnative.core.coollection.query.order.Order;
-import it.integry.integrywmsnative.core.coollection.query.order.OrderCriteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.AndSpecification;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.OrSpecification;
-
-public class Query<T> {
-
-  private final Collection<T> collection;
-  private CriteriaList<T> criterias;
-  private OrderCriteria<T> orderCriteria;
-
-  public Query(Collection<T> collection) {
-    this.collection = collection;
-    criterias = new CriteriaList<T>();
-  }
-
-  public Query<T> where(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> and(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new AndSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> or(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new OrSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> orderBy(String method, Order order) {
-    orderCriteria = new OrderCriteria<T>(method, order);
-    return this;
-  }
-
-  public Query<T> orderBy(String method) {
-    return orderBy(method, Order.ASC);
-  }
-
-  public List<T> all() {
-    List<T> all = new ArrayList<T>();
-    for (T item : collection) {
-      if (criterias.match(item)) {
-        all.add(item);
-      }
-    }
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    return all;
-  }
-
-  public T first() {
-    List<T> all = cloneCollection(collection);
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    for (T item : all) {
-      if (criterias.match(item)) {
-        return item;
-      }
-    }
-    return null;
-  }
-
-  private List<T> cloneCollection(Collection<T> collection) {
-    List<T> list = new ArrayList<T>();
-    for (T item : collection) {
-      list.add(item);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/Criteria.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-public class Criteria<T> {
-
-  private final String method;
-  private final Matcher matcher;
-  private Specification<T> specification;
-
-  public Criteria(String method, Matcher matcher) {
-    this.method = method;
-    this.matcher = matcher;
-  }
-
-  public void setSpecification(Specification<T> specification) {
-    this.specification = specification;
-  }
-
-  public Specification<T> specification() {
-    return specification;
-  }
-
-  public boolean match(T item) {
-    try {
-      Object value = Phanton.from(item).call(method);
-      return matcher.match(value);
-    } catch (Exception err) {
-      throw new RuntimeException(err);
-    }
-  }
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/CriteriaList.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CriteriaList<T> {
-
-  private List<Criteria<T>> criterias;
-
-  public CriteriaList() {
-    criterias = new ArrayList<Criteria<T>>();
-  }
-
-  public void add(Criteria<T> criteria) {
-    criterias.add(criteria);
-  }
-
-  public boolean match(T item) {
-    if (criterias.size() == 0) {
-      return true;
-    }
-    if (criterias.size() == 1) {
-      return criterias.get(0).match(item);
-    }
-    boolean matched = true;
-    for (int i = criterias.size() - 1; i > 0; i--) {
-      Criteria<T> one = criterias.get(i);
-      Criteria<T> other = criterias.get(i - 1);
-      matched = matched && one.specification().match(item, one, other);
-    }
-    return matched;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/Order.java

@@ -1,5 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-public enum Order {
-  ASC, DESC
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderComparator.java

@@ -1,30 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-import java.util.Comparator;
-
-public class OrderComparator<T> implements Comparator<T> {
-
-  private final String method;
-
-  public OrderComparator(String method) {
-    this.method = method;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public int compare(T one, T other) {
-    Object oneValue = Phanton.from(one).call(method);
-    Object otherValue = Phanton.from(other).call(method);
-    if (oneValue == null || otherValue == null) {
-      return 0;
-    }
-    if (oneValue instanceof Comparable) {
-      return ((Comparable<Object>) oneValue).compareTo(otherValue);
-    } else {
-      return 0;
-    }
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderCriteria.java

@@ -1,24 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import java.util.Collections;
-import java.util.List;
-
-public class OrderCriteria<T> {
-
-  private final String method;
-  private final Order order;
-
-  public OrderCriteria(String method, Order order) {
-    this.method = method;
-    this.order = order;
-  }
-
-  public List<T> sort(List<T> list) {
-    Collections.sort(list, new OrderComparator<T>(method));
-    if (order == Order.DESC) {
-      Collections.reverse(list);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/Specification.java

@@ -1,9 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-
-public interface Specification<T> {
-
-  boolean match(T item, Criteria<T> one, Criteria<T> other);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/AndSpecification.java

@@ -1,13 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class AndSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) && other.match(item);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/OrSpecification.java

@@ -1,14 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class OrSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) || other.match(item);
-  }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/reflection/Phanton.java

@@ -1,37 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.reflection;
-
-import java.lang.reflect.Field;
-
-public class Phanton<T> {
-
-  private final T target;
-  private Class<?> clazz;
-
-  private Phanton(T target) {
-    this.target = target;
-    clazz = target.getClass();
-  }
-
-  public static <T> Phanton<T> from(T target) {
-    return new Phanton<T>(target);
-  }
-
-  public Object call(String name) {
-    return invoke(name);
-  }
-
-  private Object invoke(String name) {
-    for (final Field field : clazz.getDeclaredFields()) {
-      try {
-        if (name.equals(field.getName())) {
-          field.setAccessible(Boolean.TRUE);
-          return field.get(target);
-        }
-      } catch (final IllegalAccessException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    throw new RuntimeException("No such property with name " + name);
-  }
-
-}

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

@@ -18,14 +18,12 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 4, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 8, exportSchema = false)
 @TypeConverters({
         DateConverter.class
 })
 public abstract class AppDatabase extends RoomDatabase {
 
-//    private AppDatabase mRoomInstance;
-
     public abstract ArticoloGrigliaDao articoloGrigliaDao();
 
     public abstract GrigliaDao grigliaDao();

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

@@ -4,9 +4,10 @@ import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.RawQuery;
 import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
@@ -21,10 +22,13 @@ public interface ArticoloGrigliaDao {
 
     @Insert
     void insertAll(List<ArticoloGriglia> articoli);
+
     @Insert
     Long insert(ArticoloGriglia articolo);
+
     @Update
     void updateAll(List<ArticoloGriglia> articoli);
+
     @Update
     void update(ArticoloGriglia articolo);
 
@@ -37,12 +41,18 @@ public interface ArticoloGrigliaDao {
     @Query("SELECT * FROM articoli_griglia WHERE cod_mart = :codMart AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByCodMartAndGriglia(String codMart, int idGriglia);
 
-    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan) AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByScanAndGriglia(String scan, int idGriglia);
 
-    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode) AND id_griglia = :idGriglia LIMIT 1")
     Integer getIdArticoloByGrigliaAndBarcodeAndCodMart(int idGriglia, String barCode, String codMart);
 
+    @RawQuery(observedEntities = ArticoloGriglia.class)
+    List<ArticoloGriglia> getArticoli(SupportSQLiteQuery query);
+
     @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId")
     List<ArticoloGriglia> getArticoliFromGriglia(int grigliaId);
+
+    @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId AND new_no_promo = 1")
+    List<ArticoloGriglia> getNewArticoliInGriglia(int grigliaId);
 }

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

@@ -6,6 +6,7 @@ import androidx.room.Insert;
 import androidx.room.Query;
 import androidx.room.Update;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
@@ -28,8 +29,14 @@ public interface MtbColtDao {
     @Delete
     void delete(SqlMtbColt mtbColt);
 
-    @Query("SELECT mtb_colt.*, count(mtb_colr.id) as countArticoli from mtb_colt left outer join mtb_colr on (mtb_colr.id_collo = mtb_colt.id) where cod_dtip_provv = :codDtip AND cod_mgrp = :codMgrp and cod_dtip is null group by mtb_colt.id")
-    List<DocInternoWrapper> getLocalDocumentsByCodDtipAndCodMgrp(String codDtip, String codMgrp);
+    @Query("SELECT mtb_colt.*, count(mtb_colr.id) as countArticoli from mtb_colt left outer join mtb_colr on (mtb_colr.id_collo = mtb_colt.id) where" +
+            " cod_dtip_provv = :codDtip " +
+            " AND ( cod_anag = :codAnag OR (cod_anag is null and :codAnag is null)) " +
+            " AND ( cod_vdes = :codVdes OR (cod_vdes is null and :codVdes is null)) " +
+            " 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);
 
     @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/entity/ArticoloGriglia.java

@@ -6,6 +6,8 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.math.BigDecimal;
+
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 @Entity(
@@ -25,7 +27,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 public class ArticoloGriglia {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_griglia_id")
-    private int articoloGrigliaId;
+    private Integer articoloGrigliaId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -54,14 +56,29 @@ public class ArticoloGriglia {
     @ColumnInfo(name = "qta_min_ordinabile")
     private float qtaMinOrdinabile;
 
+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza;
+
+    @ColumnInfo(name = "giacenza")
+    private float giacenza;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private float qtaPrevistaVendita;
+
+    @ColumnInfo(name = "qta_proposta")
+    private float qtaProposta;
+
     @ColumnInfo(name = "id_griglia")
     private int idGriglia;
 
-    public int getArticoloGrigliaId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo = false;
+
+    public Integer getArticoloGrigliaId() {
         return articoloGrigliaId;
     }
 
-    public void setArticoloGrigliaId(int articoloGrigliaId) {
+    public void setArticoloGrigliaId(Integer articoloGrigliaId) {
         this.articoloGrigliaId = articoloGrigliaId;
     }
 
@@ -145,6 +162,46 @@ public class ArticoloGriglia {
         this.idGriglia = idGriglia;
     }
 
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
     public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
         ArticoloOrdine articolo = new ArticoloOrdine();
 
@@ -160,6 +217,12 @@ public class ArticoloGriglia {
         articolo.setUntMis(this.getUntMis());
         articolo.setDescrizione(this.getDescrizione());
         articolo.setDataIns(UtilityDate.getDateInstance());
+        articolo.setGgScadenza(this.getGgScadenza());
+        articolo.setGiacenza(BigDecimal.valueOf(this.getGiacenza()));
+        articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
+        articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
+        articolo.setNewNoPromo(this.isNewNoPromo());
+
         articolo.setQtaOrd(0);
 
         return articolo;

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

@@ -3,16 +3,19 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
+import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 @Entity(
         tableName = "articoli_ordine",
         indices = {
                 @Index(value = "id_ordine"),
-                @Index(value = {"id_ordine","cod_mart"}, unique = true)
+                @Index(value = {"id_ordine", "cod_mart"}, unique = true)
         },
         foreignKeys = {
                 @ForeignKey(
@@ -22,11 +25,11 @@ import java.util.Date;
                         onDelete = ForeignKey.CASCADE
                 )
         }
-        )
+)
 public class ArticoloOrdine {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_ordine_id")
-    private int articoloOrdineId;
+    private Integer articoloOrdineId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -64,11 +67,27 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "data_ins")
     private Date dataIns;
 
-    public int getArticoloOrdineId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo;
+
+    @Ignore
+    private int ggScadenza = 0;
+
+    @Ignore
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+
+    public Integer getArticoloOrdineId() {
         return articoloOrdineId;
     }
 
-    public void setArticoloOrdineId(int articoloOrdineId) {
+    public void setArticoloOrdineId(Integer articoloOrdineId) {
         this.articoloOrdineId = articoloOrdineId;
     }
 
@@ -167,4 +186,64 @@ public class ArticoloOrdine {
     public void setDataIns(Date dataIns) {
         this.dataIns = dataIns;
     }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public ArticoloOrdine setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public ArticoloOrdine setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public ArticoloOrdine setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public ArticoloOrdine setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnfPrevistaVendita() {
+        return 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);
+    }
+
+    public BigDecimal getQtaCnfGiacenza() {
+        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
+    public float getCnfDaRic() {
+        return qtaCnf > 0.f ? merceDaRic / qtaCnf : 0;
+    }
 }

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

@@ -16,4 +16,6 @@ public interface ArticoloGrigliaRepository {
 
     void findArticoloByScanAndGriglia(String scan, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail);
 
+    void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail);
+
 }

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.data_store.db.repository;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
@@ -20,7 +21,7 @@ public interface MtbColtRepository {
 
     void delete(SqlMtbColt mtbColt, Runnable onSuccess, RunnableArgs<Exception> onError);
 
-    void getLocalDocumentsByCodDtipAndCodMgrp(String codDtip, String codMgrp, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError);
+    void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError);
 
     void getNextNumCollo(RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
 

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

@@ -5,7 +5,14 @@ import com.annimon.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
@@ -24,27 +31,21 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
         this.mArticoloGrigliaDao = articoloGrigliaDao;
     }
 
-    public void saveArticoliToGriglia(List<ArticoloGriglia> articoli, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
+    public void saveArticoliToGriglia(List<ArticoloGriglia> updatedArts, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {
-                List<ArticoloGriglia> toUpdate = new ArrayList<>();
-                List<ArticoloGriglia> toInsert = new ArrayList<>();
-                List<String> codMarts = new ArrayList<>();
-                for (ArticoloGriglia art : articoli) {
-                    Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(griglia.getGrigliaId(), art.getBarCode(), art.getCodMart());
-                    codMarts.add(art.getCodMart());
-                    if (id != null) {
-                        art.setArticoloGrigliaId(id);
-                        toUpdate.add(art);
-                    } else {
-                        toInsert.add(art);
-                    }
-                }
+                var tmp = calcItemsToInsertAndUpdate(updatedArts);
+                var toInsert = (List<ArticoloGriglia>) tmp.get("toInsert");
+                var toUpdate = (List<ArticoloGriglia>) tmp.get("toUpdate");
+                var codMarts = (List<String>) tmp.get("codMarts");
+
                 mArticoloGrigliaDao.insertAll(toInsert);
                 mArticoloGrigliaDao.updateAll(toUpdate);
+
                 List<ArticoloGriglia> articoliGriglia = mArticoloGrigliaDao.getArticoliFromGriglia(griglia.getGrigliaId());
                 List<ArticoloGriglia> toDelete = Stream.of(articoliGriglia).filter(articolo -> !codMarts.contains(articolo.getCodMart())).toList();
                 mArticoloGrigliaDao.deleteList(toDelete);
+
                 onSuccess.run();
             } catch (Exception e) {
                 onFail.run(e);
@@ -52,6 +53,52 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
         });
     }
 
+    private HashMap<String, Object> calcItemsToInsertAndUpdate(List<ArticoloGriglia> updatedArts) throws InterruptedException, ExecutionException {
+        var toInsert = new ArrayList<ArticoloGriglia>();
+        var toUpdate = new ArrayList<ArticoloGriglia>();
+        var codMarts = new ArrayList<String>();
+
+        int cores = Runtime.getRuntime().availableProcessors();
+        ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(cores);
+        List<Callable<ArticoloGriglia>> calls = new ArrayList<>();
+
+        for (int i = 0; i < updatedArts.size(); i++) {
+            int finalI = i;
+            Callable<ArticoloGriglia> callableTask = () -> {
+                var updatedArt = updatedArts.get(finalI);
+                Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(updatedArt.getIdGriglia(), updatedArt.getBarCode(), updatedArt.getCodMart());
+
+                if (id != null) {
+                    updatedArt.setArticoloGrigliaId(id);
+                }
+
+                return updatedArt;
+            };
+
+            calls.add(callableTask);
+        }
+
+        List<Future<ArticoloGriglia>> futures = executor.invokeAll(calls, Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+
+        for (Future<ArticoloGriglia> future : futures) {
+            if (future.isDone()) {
+                codMarts.add(future.get().getCodMart());
+                if (future.get().getArticoloGrigliaId() == null) toInsert.add(future.get());
+                else toUpdate.add(future.get());
+            } else {
+                future.cancel(true);
+            }
+        }
+
+        var tmp = new HashMap<String, Object>();
+
+        tmp.put("toInsert", toInsert);
+        tmp.put("toUpdate", toUpdate);
+        tmp.put("codMarts", codMarts);
+
+        return tmp;
+    }
+
     public void findArticoloByBarcodeAndGriglia(String barcode, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {
@@ -89,4 +136,14 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
             }
         });
     }
+
+    public void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail) {
+        execute(() -> {
+            try {
+                onSuccess.run(mArticoloGrigliaDao.getNewArticoliInGriglia(idGriglia));
+            } catch (Exception e) {
+                onFail.run(e);
+            }
+        });
+    }
 }

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

@@ -28,13 +28,15 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
                 List<ArticoloOrdine> toUpdate = new ArrayList<>();
                 List<ArticoloOrdine> toInsert = new ArrayList<>();
                 for (ArticoloOrdine art : articoli) {
-                    if (art.getArticoloOrdineId() > 0) {
+                    if (art.getArticoloOrdineId() != null && art.getArticoloOrdineId() > 0) {
                         toUpdate.add(art);
                     } else {
                         toInsert.add(art);
                     }
                 }
-                mArticoloOrdineDao.insertAll(toInsert);
+                for (ArticoloOrdine newArt : toInsert) {
+                    mArticoloOrdineDao.insert(newArt);
+                }
                 mArticoloOrdineDao.updateAll(toUpdate);
                 onSuccess.run();
 
@@ -48,7 +50,7 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
     public void saveArticoloToOrdine(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {
-                if (articolo.getArticoloOrdineId() > 0) {
+                if (articolo.getArticoloOrdineId() != null && articolo.getArticoloOrdineId() > 0) {
                     mArticoloOrdineDao.update(articolo);
                 } else {
                     mArticoloOrdineDao.insert(articolo);

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -65,10 +66,10 @@ public class SqlMtbColtDataSource extends Repository implements MtbColtRepositor
     }
 
     @Override
-    public void getLocalDocumentsByCodDtipAndCodMgrp(String codDtip, String codMgrp, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError) {
+    public void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError) {
         Runnable query = () -> {
             try {
-                onSuccess.run(mMtbColtDao.getLocalDocumentsByCodDtipAndCodMgrp(codDtip,codMgrp));
+                onSuccess.run(mMtbColtDao.getLocalDocumentsByCodDtip(codDtip,codAnag,codVdes,dataDoc,numDoc));
             } catch (Exception e) {
                 onError.run(e);
             }

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

@@ -4,31 +4,23 @@ import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 
 public class ArticoloDTO {
 
-    private String codMart;
+    public String codMart;
+    public String descrizione;
+    public String untMis;
+    public float qtaCnf;
+    public String barcode;
+    public float merceDaRic;
+    public float mediaSett;
+    public String flagQtaMultipla;
+    public String flagTracciabilita;
+    public float qtaMinOrdinabile;
+    public boolean newNoPromo;
+    private int ggScadenza;
+    private float giacenza;
+    private float qtaPrevistaVendita;
+    private float qtaProposta;
 
 
-    private String descrizione;
-
-
-    private String untMis;
-
-
-    private float qtaCnf;
-
-
-    private String barcode;
-
-
-    private float merceDaRic;
-
-
-    private float mediaSett;
-
-
-    private String flagQtaMultipla;
-
-    private float qtaMinOrdinabile;
-
     public String getCodMart() {
         return codMart;
     }
@@ -101,8 +93,65 @@ public class ArticoloDTO {
         this.qtaMinOrdinabile = qtaMinOrdinabile;
     }
 
+    public String getBarcode() {
+        return barcode;
+    }
 
-    public ArticoloGriglia toArticoloGriglia(){
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public String getFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public ArticoloDTO setFlagTracciabilita(String flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public ArticoloDTO setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+        return this;
+    }
+
+    public ArticoloGriglia toArticoloGriglia() {
         ArticoloGriglia result = new ArticoloGriglia();
         result.setBarCode(this.getBarCode());
         result.setDescrizione(this.getDescrizione());
@@ -113,6 +162,11 @@ public class ArticoloDTO {
         result.setMediaSett(this.getMediaSett());
         result.setFlagQtaMultipla(this.getFlagQtaMultipla());
         result.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
+        result.setGgScadenza(this.ggScadenza);
+        result.setNewNoPromo(this.newNoPromo);
+        result.setGiacenza(this.giacenza);
+        result.setQtaPrevistaVendita(this.qtaPrevistaVendita);
+        result.setQtaProposta(this.qtaProposta);
 
         return result;
     }

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

@@ -7,6 +7,8 @@ import androidx.databinding.PropertyChangeRegistry;
 
 import java.math.BigDecimal;
 
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
 public class BindableBigDecimal  implements Observable {
 
     BigDecimal mValue;
@@ -102,9 +104,24 @@ public class BindableBigDecimal  implements Observable {
     }
 
     public void set(BigDecimal value, boolean forceRefresh) {
-        if (!mValue.equals(value) || forceRefresh) {
+        if ((mValue == null)  || !mValue.equals(value) || forceRefresh) {
             this.mValue = value;
             notifyChange();
         }
     }
+
+    public static void registerListener(BindableBigDecimal bindableBigDecimal, RunnableArgs<BigDecimal> onValueChanged) {
+        bindableBigDecimal.addOnPropertyChangedCallback(new OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                if(onValueChanged != null) onValueChanged.run(bindableBigDecimal.get());
+            }
+        });
+    }
+
+    public static void resetListeners(BindableBigDecimal bindableBigDecimal){
+        BigDecimal oldValue = bindableBigDecimal.get();
+        bindableBigDecimal = new BindableBigDecimal();
+        bindableBigDecimal.set(oldValue);
+    }
 }

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

@@ -1,6 +1,9 @@
 package it.integry.integrywmsnative.core.di;
 
 import androidx.databinding.BaseObservable;
+import androidx.databinding.Observable;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
 public class BindableInteger  extends BaseObservable {
     Integer mValue;
@@ -34,4 +37,19 @@ public class BindableInteger  extends BaseObservable {
         return mValue == null;
     }
 
+    public static void registerListener(BindableInteger bindableInteger, RunnableArgs<Integer> onValueChanged) {
+        bindableInteger.addOnPropertyChangedCallback(new OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                if(onValueChanged != null) onValueChanged.run(bindableInteger.get());
+            }
+        });
+    }
+
+    public static void resetListeners(BindableInteger bindableInteger){
+        Integer oldValue = bindableInteger.get();
+        bindableInteger = new BindableInteger();
+        bindableInteger.set(oldValue);
+    }
+
 }

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

@@ -52,7 +52,7 @@ public class Converters {
 
     @BindingConversion
     public static String convertBindableToString(BindableString bindableString) {
-        if(bindableString != null) return bindableString.get();
+        if (bindableString != null) return bindableString.get();
         return "";
     }
 
@@ -76,7 +76,8 @@ public class Converters {
             TextWatcherAdapter watcher = new TextWatcherAdapter() {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if(bindableInteger != null) bindableInteger.set(Integer.parseInt(s.toString()));
+                    if (bindableInteger != null)
+                        bindableInteger.set(Integer.parseInt(s.toString()));
                 }
             };
             view.setTag(R.id.bound_observable, new Pair<>(bindableInteger, watcher));
@@ -98,7 +99,7 @@ public class Converters {
             TextWatcherAdapter watcher = new TextWatcherAdapter() {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if(observableField != null) observableField.set(s.toString());
+                    if (observableField != null) observableField.set(s.toString());
                 }
             };
             view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
@@ -210,7 +211,8 @@ 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());
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = new BigDecimal(s.toString());
                     observableBigDecimal.set(value);
                 }
             };
@@ -220,11 +222,65 @@ public class Converters {
         BigDecimal newValue = observableBigDecimal.get();
         BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
 
-        if(!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(TextInputEditText view, final BindableBigDecimal bindableBigDecimal) {
+        Pair<BindableBigDecimal, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != bindableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = new BigDecimal(s.toString());
+                    bindableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(bindableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = bindableBigDecimal.get();
+        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextInteger(TextInputEditText view, final BindableInteger bindableInteger) {
+        Pair<BindableInteger, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != bindableInteger) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    Integer value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = Integer.valueOf(s.toString());
+                    bindableInteger.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(bindableInteger, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        Integer newValue = bindableInteger.get();
+        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+
+        if (!(viewValue.compareTo(newValue) == 0)) {
+            view.setText(newValue.toString());
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindTextInputEditTextString(TextInputEditText view, final ObservableField<String> observableString) {
         Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -244,7 +300,7 @@ public class Converters {
         String newValue = observableString.get();
         String viewValue = view.getText().toString();
 
-        if(!viewValue.equalsIgnoreCase(newValue)) {
+        if (!viewValue.equalsIgnoreCase(newValue)) {
             view.setText(newValue);
         }
     }
@@ -268,7 +324,7 @@ public class Converters {
                 // Get Current Date
                 Calendar c = UtilityDate.getCalendarInstance();
 
-                if(observableDate.get() != null) {
+                if (observableDate.get() != null) {
                     c.setTime(observableDate.get());
                 }
 
@@ -279,8 +335,8 @@ public class Converters {
                 DatePickerDialog datePickerDialog = new DatePickerDialog(view.getContext(),
                         (cView, year, month, day) -> {
                             Date resultDate = new GregorianCalendar(year, month, day).getTime();
-                            
-                            if(parentFragment != null && warningOnOldDates && resultDate.before(new Date())) {
+
+                            if (parentFragment != null && warningOnOldDates && resultDate.before(new Date())) {
                                 DialogSimpleMessageView
                                         .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> {
                                             view.setText(UtilityDate.formatDate(resultDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
@@ -299,8 +355,8 @@ public class Converters {
 
             //Adding click-listener
             view.setOnClickListener(onClick::run);
-            if(view.getParent() != null && view.getParent().getParent() != null && view.getParent().getParent() instanceof TextInputLayout) {
-                ((FrameLayout)view.getParent()).setOnClickListener(onClick::run);
+            if (view.getParent() != null && view.getParent().getParent() != null && view.getParent().getParent() instanceof TextInputLayout) {
+                ((FrameLayout) view.getParent()).setOnClickListener(onClick::run);
                 ((TextInputLayout) view.getParent().getParent()).setOnClickListener(onClick::run);
             }
         }
@@ -495,6 +551,12 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibility")
+    public static void bindViewVisibility(View view, boolean bool) {
+        view.setVisibility(bool ? View.VISIBLE : View.GONE);
+    }
+
+
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_observable) != bindableBoolean) {

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

@@ -4,7 +4,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 
 public final class NoResultFromBarcodeException extends Exception {
-    public NoResultFromBarcodeException() {
-        super(UtilityResources.getString(R.string.no_result_from_barcode));
+    public NoResultFromBarcodeException(String barcode) {
+        super(UtilityResources.getString(R.string.no_result_from_barcode) + " (" + barcode + ")");
     }
 }

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

@@ -0,0 +1,8 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class NotValidLicenseException extends Exception {
+
+    public NotValidLicenseException() {
+        super("Licenza non valida");
+    }
+}

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

@@ -1,21 +1,39 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
+import android.content.Context;
+import android.util.AttributeSet;
 import android.view.KeyEvent;
+import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class BaseActivity extends AppCompatActivity {
 
+    @Inject
+    public DialogProgressView mCurrentProgress;
 
-    protected Dialog mCurrentProgress;
+    private boolean progressOpened;
 
-    public BaseActivity() {
-        //Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
+    @Nullable
+    @Override
+    public View onCreateView(@Nullable View parent, @NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
+        var v = super.onCreateView(parent, name, context, attrs);
+
+        MainApplication.appComponent
+                .baseActivityComponent()
+                .create()
+                .inject(this);
+
+        return v;
     }
 
     @Override
@@ -40,37 +58,38 @@ public class BaseActivity extends AppCompatActivity {
 
 
     protected void openProgress() {
-        runOnUiThread(() -> {
-            BarcodeManager.disable();
-            if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(this);
-            }
-        });
+        BarcodeManager.disable();
+        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
+            this.progressOpened = true;
+            runOnUiThread(() -> {
+                this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
+            });
+        }
     }
 
     protected void closeProgress() {
-        runOnUiThread(() -> {
-            BarcodeManager.enable();
-            if (mCurrentProgress != null) {
+        BarcodeManager.enable();
+        if (progressOpened) {
+            this.progressOpened = false;
+            runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
-                mCurrentProgress = null;
-            }
-        });
+            });
+        }
     }
 
 
     public void onLoadingStarted() {
-        new Thread(() -> {
+//        new Thread(() -> {
             BarcodeManager.disable();
             this.openProgress();
-        }).start();
+//        }).start();
     }
 
     public void onLoadingEnded() {
-        new Thread(() -> {
+//        new Thread(() -> {
             this.closeProgress();
             BarcodeManager.enable();
-        }).start();
+//        }).start();
     }
 
     public void onError(Exception ex) {

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseActivityComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseActivityComponent create();
+    }
+
+    void inject(BaseActivity baseActivity);
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseActivityComponent.class)
+public class BaseActivityModule {
+}

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -15,11 +14,12 @@ import androidx.fragment.app.FragmentTransaction;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class BaseDialogFragment extends DialogFragment {
 
     private boolean mBarcodeListener = false;
-    private Dialog mCurrentProgress;
+    private DialogProgressView mCurrentProgress;
 
     public BaseDialogFragment() {
         super();
@@ -82,7 +82,7 @@ public class BaseDialogFragment extends DialogFragment {
 //        new Thread(() -> {
         requireActivity().runOnUiThread(() -> {
             if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(requireActivity());
             }
         });
 //        }).start();

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

@@ -1,59 +1,70 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public abstract class BaseFragment extends Fragment {
 
-    protected Dialog mCurrentProgress;
+    @Inject
+    public DialogProgressView mCurrentProgress;
 
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
-
-
+    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
 
-
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
 
+        MainApplication.appComponent
+                .baseFragmentComponent()
+                .create()
+                .inject(this);
 
-
-
+        return view;
+    }
 
     public void onLoadingStarted() {
-        new Thread(() -> {
-            BarcodeManager.disable();
-            this.openProgress();
-        }).start();
+        BarcodeManager.disable();
+        this.openProgress();
     }
 
     public void onLoadingEnded() {
-        new Thread(() -> {
-            this.closeProgress();
-            BarcodeManager.enable();
-        }).start();
+        this.closeProgress();
+        BarcodeManager.enable();
     }
 
     public void onError(Exception ex) {
-        this.getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             this.closeProgress();
             UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
             BarcodeManager.enable();
@@ -71,23 +82,26 @@ public abstract class BaseFragment extends Fragment {
     }
 
     protected void openProgress() {
-            getActivity().runOnUiThread(() -> {
-                if (this.mCurrentProgress == null) {
-                    this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-                }
+        if (!progressOpened) {
+            this.progressOpened = true;
+            requireActivity().runOnUiThread(() -> {
+                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
             });
+        }
     }
 
     protected void closeProgress() {
-            getActivity().runOnUiThread(() -> {
-                if (mCurrentProgress != null) {
-                    mCurrentProgress.dismiss();
-                    mCurrentProgress = null;
-                }
+        if (progressOpened) {
+            this.progressOpened = false;
+            requireActivity().runOnUiThread(() -> {
+                mCurrentProgress.dismiss();
             });
+        }
     }
 
     protected void popMe() {
-        ((IPoppableActivity) requireActivity()).pop();
+        requireActivity().runOnUiThread(() -> {
+            ((IPoppableActivity) requireActivity()).pop();
+        });
     }
 }

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseFragmentComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseFragmentComponent create();
+    }
+
+    void inject(BaseFragment baseFragment);
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseFragmentComponent.class)
+public class BaseFragmentModule {
+}

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

@@ -1,28 +1,28 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
+import androidx.databinding.ObservableList.OnListChangedCallback;
 
-public abstract class OnListGeneralChangedCallback extends ObservableList.OnListChangedCallback {
+public abstract class OnListGeneralChangedCallback<T> extends OnListChangedCallback<ObservableList<T>> {
 
 
     @Override
-    public void onItemRangeChanged(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeChanged(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeInserted(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeInserted(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeMoved(ObservableList sender, int fromPosition, int toPosition, int itemCount) {
+    public void onItemRangeMoved(ObservableList<T> sender, int fromPosition, int toPosition, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeRemoved(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 

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

@@ -60,7 +60,7 @@ public class MtbColr extends EntityBase {
     public MtbColr() {
         type = "mtb_colr";
 
-        if(SettingsManager.i().isUserLoggedIn()) {
+        if (SettingsManager.i().isUserLoggedIn()) {
             setUtente(SettingsManager.i().getUser().getFullname());
         }
     }
@@ -82,7 +82,6 @@ public class MtbColr extends EntityBase {
     }
 
 
-
     public MtbColr setGestione(GestioneEnum gestione) {
         this.gestione = gestione.getText();
         return this;
@@ -124,6 +123,11 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
+    public MtbColr setDataCollo(Date dataCollo) {
+        setDataCollo(UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
+        return this;
+    }
+
 
     public Integer getRiga() {
         return riga;
@@ -301,8 +305,6 @@ public class MtbColr extends EntityBase {
     }
 
 
-
-
     public String getDatetimeRowS() {
         return datetimeRow;
     }
@@ -322,11 +324,6 @@ public class MtbColr extends EntityBase {
     }
 
 
-
-
-
-
-
     public String getCodJcom() {
         return codJcom;
     }
@@ -364,11 +361,6 @@ public class MtbColr extends EntityBase {
     }
 
 
-
-
-
-
-
     public String getDataScadPartitaS() {
         return dataScadPartita;
     }
@@ -398,7 +390,6 @@ public class MtbColr extends EntityBase {
     }
 
 
-
     public String getUntMis() {
         return untMis;
     }

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

@@ -22,7 +22,7 @@ public class MtbCols extends EntityBase {
         type = "mtb_cols";
         setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
         setModificatoDa(SettingsManager.i().getUser().getFullname());
-        setDataMove(UtilityDate.getDateInstance());
+        //setDataMove(UtilityDate.getDateInstance());
     }
 
     public String getDataCollo() {

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

@@ -2,12 +2,16 @@ package it.integry.integrywmsnative.core.model;
 
 import androidx.databinding.ObservableArrayList;
 
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
@@ -57,6 +61,7 @@ public class MtbColt extends EntityBase {
     private String codJcom;
 
     private List<MtbCols> mtbCols;
+    private MtbTCol mtbTCol;
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -83,7 +88,6 @@ public class MtbColt extends EntityBase {
     }
 
 
-
     private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
 
     public ObservableArrayList<MtbColr> getMtbColr() {
@@ -95,21 +99,50 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public MtbColt(){
+    public MtbColt() {
         type = "mtb_colt";
         setDataCollo(UtilityDate.getDateInstance());
         setSerCollo("/");
 
-        if(SettingsManager.i().isUserLoggedIn()) {
+        if (SettingsManager.i().isUserLoggedIn()) {
             setPreparatoDa(SettingsManager.i().getUser().getFullname());
         }
     }
 
-    public MtbColt initDefaultFields() {
+    public MtbColt initDefaultFields(GestioneEnum gestioneEnum) {
+        setGestione(gestioneEnum);
         setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
         setPreparatoDa(SettingsManager.i().getUser().getFullname());
         setOraInizPrep(UtilityDate.getDateInstance());
-        setCodAnag(SettingsManager.iDB().getDefaultCodAnag());
+
+        String codAnagToUse = null;
+        switch (gestioneEnum) {
+            case ACQUISTO:
+            case LAVORAZIONE:
+                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:
+                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);
 
         return this;
     }
@@ -137,11 +170,11 @@ public class MtbColt extends EntityBase {
         Date dataColloD = null;
         try {
             dataColloD = getDataColloD();
-        } catch (Exception ex){
+        } catch (Exception ex) {
             UtilityLogger.errorMe(ex);
         }
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG);
         } else return null;
     }
@@ -392,7 +425,7 @@ public class MtbColt extends EntityBase {
     public String getTimeVers() {
         Date dataColloD = getDataVersD();
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.TIME);
         } else return null;
     }
@@ -526,6 +559,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbTCol getMtbTCol() {
+        return mtbTCol;
+    }
+
+    public MtbColt setMtbTCol(MtbTCol mtbTCol) {
+        this.mtbTCol = mtbTCol;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";
@@ -533,9 +575,9 @@ public class MtbColt extends EntityBase {
 
         StringBuilder whereCond = new StringBuilder();
 
-        if(filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
+        if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
 
-            for(int i = 0; i < filtroOrdineDtos.size(); i++){
+            for (int i = 0; i < filtroOrdineDtos.size(); i++) {
                 FiltroOrdineDTO x = filtroOrdineDtos.get(i);
 
                 try {
@@ -545,13 +587,13 @@ public class MtbColt extends EntityBase {
                             UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
                             UtilityDB.valueToString(x.getNumOrd())));
 
-                    if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
+                    if (!UtilityString.isNullOrEmpty(x.getDataConsS())) {
                         whereCond.append(String.format(" AND dr.dc = %s",
                                 UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
                     }
 
                     whereCond.append(")");
-                    if(i < filtroOrdineDtos.size()-1) {
+                    if (i < filtroOrdineDtos.size() - 1) {
                         whereCond.append(" OR ");
                     }
                 } catch (Exception e) {

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

@@ -0,0 +1,273 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Created by ValerioC on 06/03/2018.
+ */
+
+public class MvwSitArtUdcDetInventario {
+
+    private String gestione;
+    private Date dataCollo;
+    private String serCollo;
+    private Integer numCollo;
+    private Integer segno;
+    private String codMdep;
+    private String posizione;
+    private Integer priorita;
+    private String codGruppo;
+    private String gruppo;
+    private String codSgruppo;
+    private String sottogruppo;
+    private String codMart;
+    private String diacod;
+    private String descrizioneEstesa;
+    private String partitaMag;
+    private String codJcom;
+    private String commessa;
+    private String untMis;
+    private BigDecimal qtaCol;
+    private BigDecimal numCnf;
+    private BigDecimal qtaCnf;
+    private BigDecimal pesoNettoKg;
+    private BigDecimal pesoLordoKg;
+    private String codJfas;
+    private MtbAart mtbAart;
+
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public MvwSitArtUdcDetInventario setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public MvwSitArtUdcDetInventario setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+        return this;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public MvwSitArtUdcDetInventario setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+        return this;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public MvwSitArtUdcDetInventario setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+        return this;
+    }
+
+    public Integer getSegno() {
+        return segno;
+    }
+
+    public MvwSitArtUdcDetInventario setSegno(Integer segno) {
+        this.segno = segno;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public MvwSitArtUdcDetInventario setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public MvwSitArtUdcDetInventario setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public Integer getPriorita() {
+        return priorita;
+    }
+
+    public MvwSitArtUdcDetInventario setPriorita(Integer priorita) {
+        this.priorita = priorita;
+        return this;
+    }
+
+    public String getCodGruppo() {
+        return codGruppo;
+    }
+
+    public MvwSitArtUdcDetInventario setCodGruppo(String codGruppo) {
+        this.codGruppo = codGruppo;
+        return this;
+    }
+
+    public String getGruppo() {
+        return gruppo;
+    }
+
+    public MvwSitArtUdcDetInventario setGruppo(String gruppo) {
+        this.gruppo = gruppo;
+        return this;
+    }
+
+    public String getCodSgruppo() {
+        return codSgruppo;
+    }
+
+    public MvwSitArtUdcDetInventario setCodSgruppo(String codSgruppo) {
+        this.codSgruppo = codSgruppo;
+        return this;
+    }
+
+    public String getSottogruppo() {
+        return sottogruppo;
+    }
+
+    public MvwSitArtUdcDetInventario setSottogruppo(String sottogruppo) {
+        this.sottogruppo = sottogruppo;
+        return this;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public MvwSitArtUdcDetInventario setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDiacod() {
+        return diacod;
+    }
+
+    public MvwSitArtUdcDetInventario setDiacod(String diacod) {
+        this.diacod = diacod;
+        return this;
+    }
+
+    public String getDescrizioneEstesa() {
+        return descrizioneEstesa;
+    }
+
+    public MvwSitArtUdcDetInventario setDescrizioneEstesa(String descrizioneEstesa) {
+        this.descrizioneEstesa = descrizioneEstesa;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public MvwSitArtUdcDetInventario setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public MvwSitArtUdcDetInventario setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
+    public String getCommessa() {
+        return commessa;
+    }
+
+    public MvwSitArtUdcDetInventario setCommessa(String commessa) {
+        this.commessa = commessa;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public MvwSitArtUdcDetInventario setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public BigDecimal getQtaCol() {
+        return qtaCol;
+    }
+
+    public MvwSitArtUdcDetInventario setQtaCol(BigDecimal qtaCol) {
+        this.qtaCol = qtaCol;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public MvwSitArtUdcDetInventario setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public MvwSitArtUdcDetInventario setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getPesoNettoKg() {
+        return pesoNettoKg;
+    }
+
+    public MvwSitArtUdcDetInventario setPesoNettoKg(BigDecimal pesoNettoKg) {
+        this.pesoNettoKg = pesoNettoKg;
+        return this;
+    }
+
+    public BigDecimal getPesoLordoKg() {
+        return pesoLordoKg;
+    }
+
+    public MvwSitArtUdcDetInventario setPesoLordoKg(BigDecimal pesoLordoKg) {
+        this.pesoLordoKg = pesoLordoKg;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public MvwSitArtUdcDetInventario setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public MtbAart getMtbAart() {
+        return mtbAart;
+    }
+
+    public MvwSitArtUdcDetInventario setMtbAart(MtbAart mtbAart) {
+        this.mtbAart = mtbAart;
+        return this;
+    }
+}

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

@@ -0,0 +1,35 @@
+package it.integry.integrywmsnative.core.model.dto;
+
+public class InternalCodAnagsDTO {
+
+    private String codAnag;
+    private boolean isCliente;
+    private boolean isFornitore;
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public InternalCodAnagsDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public boolean isCliente() {
+        return isCliente;
+    }
+
+    public InternalCodAnagsDTO setCliente(boolean cliente) {
+        isCliente = cliente;
+        return this;
+    }
+
+    public boolean isFornitore() {
+        return isFornitore;
+    }
+
+    public InternalCodAnagsDTO setFornitore(boolean fornitore) {
+        isFornitore = fornitore;
+        return this;
+    }
+}

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

@@ -83,7 +83,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
             @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()) {
+                    if (response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) {
                         onComplete.run(response.body().getEntityList().get(0));
                     } else onComplete.run(null);
 
@@ -107,9 +107,10 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                 })
                 .toList();
 
-        var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
+        var whereCond = whereCondMap.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {}.getType();
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {
+        }.getType();
         this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
 
     }

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.databinding.ObservableArrayList;
 
+import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -32,6 +33,7 @@ import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 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.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -102,10 +104,9 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     public void createColloLavorazione(int segno, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToCreate = new MtbColt()
-                .setSegno(segno)
-                .setGestione(GestioneEnum.LAVORAZIONE);
+                .setSegno(segno);
 
-        mtbColtToCreate.initDefaultFields();
+        mtbColtToCreate.initDefaultFields(GestioneEnum.LAVORAZIONE);
 
         mtbColtToCreate
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
@@ -121,9 +122,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColloScaricoDaCarico(MtbColt sourceMtbColt, MtbDepoPosizione posizione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
-                .initDefaultFields()
+                .initDefaultFields(GestioneEnum.LAVORAZIONE)
                 .setCodAnag(null)
-                .setGestione(GestioneEnum.LAVORAZIONE)
                 .setSegno(-1)
                 .setCodTcol(sourceMtbColt.getCodTcol())
                 .setPesoKg(sourceMtbColt.getPesoKg())
@@ -153,7 +153,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
             mtbColrClone
                     .setNumCollo(null)
-                    .setDataCollo(null)
+                    .setDataCollo((String) null)
                     .setRiga(null)
                     .setGestione(GestioneEnum.LAVORAZIONE)
 
@@ -174,9 +174,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
-                .initDefaultFields()
+                .initDefaultFields(GestioneEnum.LAVORAZIONE)
                 .setCodAnag(null)
-                .setGestione(GestioneEnum.LAVORAZIONE)
                 .setSegno(-1)
                 .setCodTcol(sourceMtbColt.getCodTcol())
 //                .setPesoKg(sourceMtbColt.getPesoKg())
@@ -207,7 +206,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColr mtbColrClone = new MtbColr();
         mtbColrClone
                 .setNumCollo(null)
-                .setDataCollo(null)
+                .setDataCollo((String) null)
                 .setRiga(null)
                 .setGestione(GestioneEnum.LAVORAZIONE)
                 .setDataColloRif(sourceMtbColt.getDataColloD())
@@ -237,7 +236,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(newMtbColt, onComplete, onFailed);
     }
 
-
     public void createColloFromEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         createColloFromEtichettaAnonima(barcodeScanDTO.getStringValue(), gestione, onComplete, onFailed);
     }
@@ -245,9 +243,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColloFromEtichettaAnonima(String barcode, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt mtbColtToCreate = new MtbColt()
-                .setGestione(gestione);
-
-        mtbColtToCreate.initDefaultFields();
+                .initDefaultFields(gestione);
 
         Integer customNumCollo = UtilityBarcode.getNumColloFromULAnonima(barcode);
         String customSerCollo = CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE;
@@ -397,7 +393,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }, onFailed);
     }
 
-
     private void cyclicGetMultipleByTestate(@NotNull Iterator<MtbColt> sourceMtbColts, boolean onlyResiduo, ArrayList<MtbColt> resultMtbColt, Runnable onComplete, RunnableArgs<Exception> onAbort) {
         if (sourceMtbColts.hasNext()) {
             getByTestata(sourceMtbColts.next(), onlyResiduo, false, mtbColt -> {
@@ -447,7 +442,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
     public void changePosizione(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         String codMdep = posizione.getCodMdep();
@@ -543,7 +537,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }, onFailed);
     }
 
-
     public static void retrieveBasketColli(RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService.getColliInBasket(SettingsManager.i().getUserSession().getDepo().getCodMdep()).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
@@ -620,7 +613,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
     public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
 
@@ -646,4 +638,57 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void versamentoAutomaticoUL(MtbColt sourceMtbColt, RunnableArgs<VersamentoAutomaticoULResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
+
+        for (int i = 0; i < sourceMtbColtClone.getMtbColr().size(); i++) {
+            sourceMtbColtClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
+        }
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Response<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> response) {
+                analyzeAnswer(response, "versamentoAutomaticoUL", data -> {
+                    var result = response.body().getDto();
+
+                    List<MtbColr> allMtbColr = new ArrayList<>();
+                    allMtbColr.addAll(result.getSuccess());
+                    allMtbColr.addAll(result.getFailed());
+
+                    List<String> codMarts = Stream.of(allMtbColr)
+                            .map(x -> x.getCodMart().trim())
+                            .toList();
+
+                    mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                        for (var mtbColr : allMtbColr) {
+
+                            MtbAart foundMtbAart = null;
+
+                            Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                    .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                                    .findFirst();
+
+                            if (mtbAartOpt.isPresent()) {
+                                foundMtbAart = mtbAartOpt.get();
+                            }
+
+                            mtbColr.setMtbAart(foundMtbAart);
+                        }
+
+                        onComplete.run(result);
+                    }, onFailed);
+
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Throwable t) {
+                if (onFailed != null) onFailed.run(new Exception(t));
+            }
+        });
+    }
+
 }

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

@@ -10,6 +10,7 @@ import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 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 retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -42,4 +43,7 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("wms/assegnaLottoSuColloScarico")
     Call<ServiceRESTResponse<MtbColt>> assegnaLottoSuColloScarico(@Body MtbColt mtbColt);
 
+    @POST("wms/versamentoAutomaticoUL")
+    Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> versamentoAutomaticoUL(@Body MtbColt mtbColt);
+
 }

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

@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
+
+@Singleton
+public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
+
+    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final ArticoloRESTConsumer mArticoloRESTConsumer;
+
+    public GiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
+
+    }
+
+    public void getGiacenzeInPosizione(MtbDepoPosizione posizione, RunnableArgs<List<MvwSitArtUdcDetInventario>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("posizione", posizione.getPosizione());
+        String whereCond = UtilityQuery.concatFieldsInWhereCond(params);
+        String query = "SELECT * from mvw_sitart_udc_det_inventario" +
+                "  WHERE " + whereCond;
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MvwSitArtUdcDetInventario>>() {
+        }.getType();
+        this.mSystemRESTConsumer.<ArrayList<MvwSitArtUdcDetInventario>>processSql(query, typeOfObjectsList, inventarioList -> {
+            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);
+        }, onFailed);
+    }
+
+
+}

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

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+public interface GiacenzaRESTConsumerService {
+}

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

@@ -125,7 +125,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
 
         service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
@@ -145,7 +145,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
-    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
                 .map(x -> new GetPickingListDTO()
                         .setData(x.getDataOrdS())
@@ -157,7 +157,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
 
-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);

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

@@ -16,7 +16,7 @@ import retrofit2.http.Query;
 public interface OrdiniRESTConsumerService {
 
     @POST("wms/getArticoliFromOrdini")
-    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Body List<GetPickingListDTO> pickingListDTO);
+    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Query("codMdep") String codMdep, @Body List<GetPickingListDTO> pickingListDTO);
 
     @POST("wms/getSuggestedPickingList")
     Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);

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

@@ -6,8 +6,11 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
@@ -27,37 +30,47 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
 
-    public static void getArticoliListino(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void getArticoliListino(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
+        getArticoliListinoStatic(codAlis, onSuccess, onFailed);
+    }
+
+    public static void getArticoliListinoStatic(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
         PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class);
         ordiniARestService
                 .getArticoliListino(codAlis)
-                .enqueue(new Callback<ServiceRESTResponse<GrigliaDTO>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<GrigliaDTO>> call, Response<ServiceRESTResponse<GrigliaDTO>> response) {
                         analyzeAnswer(response, "getArticoliListino", griglia -> {
 
                             UtilityThread.executeParallel(() -> {
+                                var startTime = new Date().getTime();
+
                                 List<ArticoloDTO> listaArticoli = new ArrayList<>();
+
                                 Stream.of(griglia.getGrigliaAcquistiChild())
-                                        .map(ArticoloDTO::getCodMart)
-                                        .distinct()
-                                        .withoutNulls()
-                                        .forEach(art -> {
-                                            List<ArticoloDTO> inList = Stream.of(griglia.getGrigliaAcquistiChild()).filter(x -> x.getCodMart().equalsIgnoreCase(art)).toList();
-                                            if (inList.size() > 1) {
-                                                for (ArticoloDTO articolo : inList) {
+                                        .groupBy(ArticoloDTO::getCodMart)
+                                        .forEach(entry -> {
+
+                                            if(entry.getValue().size() == 1) {
+                                                listaArticoli.add(entry.getValue().get(0));
+                                            } else {
+                                                for (ArticoloDTO articolo : entry.getValue()) {
                                                     if (!articolo.getBarCode().endsWith(articolo.getCodMart())) {
                                                         listaArticoli.add(articolo);
                                                     }
                                                 }
-                                            } else {
-                                                listaArticoli.add(inList.get(0));
                                             }
+
                                         });
+
                                 griglia.setGrigliaAcquistiChild(listaArticoli);
+
+                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
                                 onSuccess.run(griglia);
                             }, false);
                         }, onFailed);
@@ -72,7 +85,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
-    public static void saveOrdine(Ordine ordine, List<ArticoloOrdine> articoli, Griglia griglia, RunnableArgs<Ordine> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void saveOrdine(Ordine ordine, List<ArticoloOrdine> articoli, Griglia griglia, RunnableArgs<Ordine> onSuccess, RunnableArgs<Exception> onFailed) {
         SaveDTO saveDTO = new SaveDTO();
         OrdineDTO ordineDTO = new OrdineDTO();
         List<ArtDTO> artRows = new ArrayList<>();
@@ -126,7 +139,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
-    private static ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
+    private ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
         ArtDTO dto = new ArtDTO();
         dto.setRigaOrd(rigaOrd);
         dto.setCodMart(art.getCodMart());

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

@@ -53,7 +53,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
-        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<ServiceRESTResponse<List<MtbDepoPosizione>>>() {
+        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, Response<ServiceRESTResponse<List<MtbDepoPosizione>>> response) {
                 analyzeAnswer(response, "getAvailablePosizioni", (m) -> {

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

@@ -4,6 +4,9 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.orhanobut.logger.Logger;
 
@@ -13,20 +16,22 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -46,7 +51,17 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "ProcessSql", o -> {
-                    Gson gson = new Gson();
+                    Gson gson = new GsonBuilder()
+                            .registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> {
+                                try {
+                                    return UtilityDate.recognizeDate(json.getAsString());
+                                } catch (Exception e) {
+                                    throw new JsonParseException(e);
+                                }
+                            })
+                            .create();
+
+
                     String json = gson.toJson(o);
 
                     InputStream ims = new ByteArrayInputStream(json.getBytes());
@@ -100,7 +115,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
+        getAvailableCodMdepsStatic(onSuccess, onFailed);
+    }
+
+    public static void getAvailableCodMdepsStatic(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
 
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
         service.getAvailableCodMdeps().enqueue(new Callback<>() {

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

@@ -5,6 +5,7 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.exception.NotValidLicenseException;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
@@ -41,7 +42,9 @@ public class _BaseRESTConsumer {
             if (response.code() == 404) {
                 Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url().toString() + ")");
                 onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")"));
-            } else {
+            } else if (response.code() == 550)
+                onFailed.run(new NotValidLicenseException());
+            else {
                 Log.e(logTitle, "Status " + response.code() + ": " + response.message());
                 onFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
             }

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

@@ -19,6 +19,7 @@ public class SitArtOrdDTO {
     private String idViaggio;
     private String codMdep;
     private boolean flagEnablePickManuale;
+    private boolean flagEnableScanArt;
     private String codMgrp;
     private String descrizioneMgrp;
     private String codMsgr;
@@ -145,6 +146,14 @@ public class SitArtOrdDTO {
         return this;
     }
 
+    public boolean isFlagEnableScanArt() {
+        return flagEnableScanArt;
+    }
+
+    public SitArtOrdDTO setFlagEnableScanArt(boolean flagEnableScanArt) {
+        this.flagEnableScanArt = flagEnableScanArt;
+        return this;
+    }
 
     public String getCodMgrp() {
         return codMgrp;

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

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColr;
+
+public class VersamentoAutomaticoULResponseDTO {
+
+    private List<MtbColr> success;
+    private List<MtbColr> failed;
+
+    public List<MtbColr> getSuccess() {
+        return success;
+    }
+
+    public VersamentoAutomaticoULResponseDTO setSuccess(List<MtbColr> success) {
+        this.success = success;
+        return this;
+    }
+
+    public List<MtbColr> getFailed() {
+        return failed;
+    }
+
+    public VersamentoAutomaticoULResponseDTO setFailed(List<MtbColr> failed) {
+        this.failed = failed;
+        return this;
+    }
+}

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

@@ -30,23 +30,27 @@ public class ServerStatusChecker {
     private Runnable runnableCode = new Runnable() {
         @Override
         public void run() {
-            if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
-                UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback);
+            if (shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
+                UtilityServer.isEmsApiAvailable(
+                        SettingsManager.i().getServer().getHost(),
+                        SettingsManager.i().getServer().getPort(),
+                        () -> mInternalCallback.run(true),
+                        ex -> mInternalCallback.run(false));
                 handler.postDelayed(this, MILLIS_DELAY);
             }
         }
     };
 
-    public void addCallback(RunnableArgs<Boolean> callback){
+    public void addCallback(RunnableArgs<Boolean> callback) {
         this.mCallback.add(callback);
     }
 
-    public void removeCallback(RunnableArgs<Boolean> callback){
+    public void removeCallback(RunnableArgs<Boolean> callback) {
         this.mCallback.remove(callback);
     }
 
 
-    public static void init(){
+    public static void init() {
         instance.shouldExecute = true;
 
         instance.handler.post(instance.runnableCode);

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

@@ -0,0 +1,104 @@
+package it.integry.integrywmsnative.core.services.inventario;
+
+import androidx.databinding.ObservableArrayList;
+
+import com.annimon.stream.Stream;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+
+@Singleton
+public class InventarioService {
+
+    private final GiacenzaRESTConsumer mGiacenzaRESTConsumer;
+
+    public InventarioService(GiacenzaRESTConsumer giacenzaRESTConsumer) {
+        this.mGiacenzaRESTConsumer = giacenzaRESTConsumer;
+    }
+
+    public void getInventarioDaPosizione(MtbDepoPosizione posizione, RunnableArgs<List<MvwSitArtUdcDetInventario>> onSuccess, RunnableArgs<Exception> onError) {
+        mGiacenzaRESTConsumer.getGiacenzeInPosizione(posizione, onSuccess, onError);
+    }
+
+    public void getInventarioDaPosizionePerArticolo(MtbDepoPosizione posizione, MtbAart articolo, RunnableArgs<List<MvwSitArtUdcDetInventario>> onSuccess, RunnableArgs<Exception> onError) {
+        getInventarioDaPosizione(posizione, (inventario) -> {
+            List<MvwSitArtUdcDetInventario> inventarioArticolo = Stream.of(inventario).filter(
+                    x -> articolo.getCodMart().equalsIgnoreCase(x.getCodMart())
+            ).toList();
+            onSuccess.run(inventarioArticolo);
+        }, onError);
+    }
+
+    public MtbColt mapInventarioToMtbColt(MvwSitArtUdcDetInventario inventario) {
+        return mapInventarioToMtbColt(inventario, true);
+    }
+
+    public MtbColt mapInventarioToMtbColt(MvwSitArtUdcDetInventario inventario, boolean includeRows) {
+        MtbColt mtbColt = new MtbColt();
+
+        mtbColt.setGestione(inventario.getGestione());
+        mtbColt.setDataCollo(inventario.getDataCollo());
+        mtbColt.setSerCollo(inventario.getSerCollo());
+        mtbColt.setNumCollo(inventario.getNumCollo());
+        mtbColt.setSegno(inventario.getSegno());
+        mtbColt.setCodMdep(inventario.getCodMdep());
+        mtbColt.setPosizione(inventario.getPosizione());
+        mtbColt.setCodJcom(inventario.getCodJcom());
+        mtbColt.setPesoNettoKg(inventario.getPesoNettoKg());
+        mtbColt.setPesoKg(inventario.getPesoLordoKg());
+        mtbColt.setCodJfas(inventario.getCodJfas());
+
+        if (includeRows) {
+            ObservableArrayList<MtbColr> rows = new ObservableArrayList<>();
+            rows.add(mapInventarioToMtbColr(inventario));
+            mtbColt.setMtbColr(rows);
+        }
+        return mtbColt;
+    }
+
+    public MtbColr mapInventarioToMtbColr(MvwSitArtUdcDetInventario inventario) {
+        MtbColr mtbColr = new MtbColr();
+
+        mtbColr.setGestione(inventario.getGestione());
+        mtbColr.setDataCollo(inventario.getDataCollo());
+        mtbColr.setSerCollo(inventario.getSerCollo());
+        mtbColr.setNumCollo(inventario.getNumCollo());
+        mtbColr.setCodMart(inventario.getCodMart());
+        mtbColr.setDescrizione(inventario.getDescrizioneEstesa());
+        mtbColr.setPartitaMag(inventario.getPartitaMag());
+        mtbColr.setCodJcom(inventario.getCodJcom());
+        mtbColr.setUntMis(inventario.getUntMis());
+        mtbColr.setQtaCol(inventario.getQtaCol());
+        mtbColr.setNumCnf(inventario.getNumCnf());
+        mtbColr.setQtaCnf(inventario.getQtaCnf());
+        mtbColr.setPesoNettoKg(inventario.getPesoNettoKg());
+        mtbColr.setPesoLordoKg(inventario.getPesoLordoKg());
+        mtbColr.setMtbAart(inventario.getMtbAart());
+
+
+        return mtbColr;
+    }
+
+    public List<MtbColt> mapInventarioToMtbColtList(List<MvwSitArtUdcDetInventario> inventario) {
+        return new ArrayList<>(Stream.of(inventario).groupBy(x -> x.getNumCollo() + "-" + x.getDataCollo() + "-" + x.getSerCollo() + x.getGestione()).map(inv -> {
+            List<MvwSitArtUdcDetInventario> rows = inv.getValue();
+            MtbColt mtbColt = mapInventarioToMtbColt(rows.get(0), false);
+            ObservableArrayList<MtbColr> mtbColrs = new ObservableArrayList<>();
+            mtbColrs.addAll(Stream.of(rows).map(this::mapInventarioToMtbColr).toList());
+            mtbColt.setMtbColr(mtbColrs);
+            return mtbColt;
+        }).toList());
+    }
+
+
+}

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

@@ -1,11 +1,13 @@
 package it.integry.integrywmsnative.core.settings;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
-import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
+import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 
 public class DBSettingsModel {
 
@@ -14,14 +16,15 @@ public class DBSettingsModel {
     private List<MtbDepoPosizione> availablePosizioni = null;
 
     private Azienda datiAzienda = null;
+    private List<InternalCodAnagsDTO> internalCodAnags = null;
 
     private boolean enableCheckPartitaMagCheckPickingV;
     private boolean flagMultiClienteOrdV;
-    private String defaultCodAnag;
+    private boolean flagUseCodAnagAziendale;
     private String defaultCausaleRettificaGiacenze;
     private DistribuzioneColloDTO.CriterioDistribuzione defaultCriterioDistribuzione;
     private boolean flagAskClienteInPickingLibero;
-    private boolean flagAllowEmptyClienteInPickingLibero;
+    private boolean flagPickLiberoAllowEmptyCliente;
 
     private boolean flagCanAddExtraItemSpedizione;
     private boolean flagCanAutoOpenNewULAccettazione;
@@ -33,10 +36,15 @@ public class DBSettingsModel {
     private boolean flagForceAllToColli;
     private boolean flagSpedizioneEnableManualPick;
     private boolean flagSpedizioneCanSelectMultipleOrders;
+    private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
+    private boolean flagOrdinaNuoviArticoliInGriglia;
+    private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
     private int onNumCnfInputChanged = 1;
+    private boolean flagAccettazioneUseQtaOrd = false;
+    private boolean flagPickLiberoAllowEmptyDest = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -70,7 +78,16 @@ public class DBSettingsModel {
     }
 
     public DBSettingsModel setDatiAzienda(Azienda datiAzienda) {
-            this.datiAzienda = datiAzienda;
+        this.datiAzienda = datiAzienda;
+        return this;
+    }
+
+    public List<InternalCodAnagsDTO> getInternalCodAnags() {
+        return internalCodAnags;
+    }
+
+    public DBSettingsModel setInternalCodAnags(List<InternalCodAnagsDTO> internalCodAnags) {
+        this.internalCodAnags = internalCodAnags;
         return this;
     }
 
@@ -100,12 +117,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getDefaultCodAnag() {
-        return defaultCodAnag;
+    public boolean isFlagUseCodAnagAziendale() {
+        return flagUseCodAnagAziendale;
     }
 
-    public DBSettingsModel setDefaultCodAnag(String defaultCodAnag) {
-        this.defaultCodAnag = defaultCodAnag;
+    public DBSettingsModel setFlagUseCodAnagAziendale(boolean flagUseCodAnagAziendale) {
+        this.flagUseCodAnagAziendale = flagUseCodAnagAziendale;
         return this;
     }
 
@@ -136,12 +153,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagAllowEmptyClienteInPickingLibero() {
-        return flagAllowEmptyClienteInPickingLibero;
+    public boolean isFlagPickLiberoAllowEmptyCliente() {
+        return flagPickLiberoAllowEmptyCliente;
     }
 
-    public DBSettingsModel setFlagAllowEmptyClienteInPickingLibero(boolean flagAllowEmptyClienteInPickingLibero) {
-        this.flagAllowEmptyClienteInPickingLibero = flagAllowEmptyClienteInPickingLibero;
+    public DBSettingsModel setFlagPickLiberoAllowEmptyCliente(boolean flagPickLiberoAllowEmptyCliente) {
+        this.flagPickLiberoAllowEmptyCliente = flagPickLiberoAllowEmptyCliente;
         return this;
     }
 
@@ -245,6 +262,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public DBSettingsModel setFlagOrdinaNuoviArticoliInGriglia(boolean flagOrdinaNuoviArticoliInGriglia) {
+        this.flagOrdinaNuoviArticoliInGriglia = flagOrdinaNuoviArticoliInGriglia;
+        return this;
+    }
+
+    public boolean getFlagOrdinaNuoviArticoliInGriglia() {
+        return this.flagOrdinaNuoviArticoliInGriglia;
+    }
+
     public String getProduzioneDefaultCodAnag() {
         return produzioneDefaultCodAnag;
     }
@@ -271,4 +297,40 @@ public class DBSettingsModel {
         this.onNumCnfInputChanged = onNumCnfInputChanged;
         return this;
     }
+
+    public List<String> getNotePerditaDocInterni() {
+        return notePerditaDocInterni;
+    }
+
+    public DBSettingsModel setNotePerditaDocInterni(List<String> notePerditaDocInterni) {
+        this.notePerditaDocInterni = notePerditaDocInterni;
+        return this;
+    }
+
+    public String getDocInterniCheckFornitore() {
+        return docInterniCheckFornitore;
+    }
+
+    public DBSettingsModel setDocInterniCheckFornitore(String docInterniCheckFornitore) {
+        this.docInterniCheckFornitore = docInterniCheckFornitore;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneUseQtaOrd() {
+        return flagAccettazioneUseQtaOrd;
+    }
+
+    public DBSettingsModel setFlagAccettazioneUseQtaOrd(boolean flagAccettazioneUseQtaOrd) {
+        this.flagAccettazioneUseQtaOrd = flagAccettazioneUseQtaOrd;
+        return this;
+    }
+
+    public boolean isFlagPickLiberoAllowEmptyDest() {
+        return flagPickLiberoAllowEmptyDest;
+    }
+
+    public DBSettingsModel setFlagPickLiberoAllowEmptyDest(boolean flagPickLiberoAllowEmptyDest) {
+        this.flagPickLiberoAllowEmptyDest = flagPickLiberoAllowEmptyDest;
+        return this;
+    }
 }

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

@@ -4,14 +4,18 @@ import android.content.Context;
 
 import com.annimon.stream.Stream;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
@@ -87,21 +91,19 @@ public class SettingsManager {
                 onFailed.run(new Exception("Errore durante il caricamento dei dati. Riavviare l'applicazione!"));
         };
 
-        onProgress.run("dati azienda");
-        loadDatiAzienda(() -> {
 
-            onProgress.run("profili");
-            loadAvailableProfiles(() -> {
 
-                onProgress.run("depositi");
-                loadAvailableCodMdeps(() -> {
+        onProgress.run("depositi");
+        loadAvailableCodMdeps(() -> {
 
-                    onProgress.run("posizioni");
-                    loadAvailablePosizioni(() -> {
+            onProgress.run("posizioni");
+            loadAvailablePosizioni(() -> {
 
-                        onProgress.run("impostazioni");
-                        loadGestSetupValues(tmpOnComplete, tmpOnFailed);
-                    }, tmpOnFailed);
+                onProgress.run("impostazioni");
+                loadGestSetupValues(() -> {
+
+                    onProgress.run("dati azienda");
+                    loadDatiAzienda(tmpOnComplete, tmpOnFailed);
                 }, tmpOnFailed);
             }, tmpOnFailed);
         }, tmpOnFailed);
@@ -112,7 +114,26 @@ public class SettingsManager {
         SystemRESTConsumer.getAzienda(datiAzienda -> {
             SettingsManager.iDB().setDatiAzienda(datiAzienda);
 
-            if (onComplete != null) onComplete.run();
+            if(!SettingsManager.iDB().isFlagUseCodAnagAziendale()) {
+                onComplete.run();
+                return;
+            }
+
+            String internalCodAnagsQuery = "SELECT ga.cod_anag,\n" +
+                    "       CAST(CASE WHEN vc.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_cliente,\n" +
+                    "       CAST(CASE WHEN af.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_fornitore\n" +
+                    "FROM azienda\n" +
+                    "INNER JOIN gtb_anag ga on azienda.part_iva = ga.part_iva\n" +
+                    "LEFT OUTER JOIN vtb_clie vc on ga.cod_anag = vc.cod_anag AND vc.flag_stato = 'A'\n" +
+                    "LEFT OUTER JOIN atb_forn af on ga.cod_anag = af.cod_anag AND af.flag_stato = 'A'";
+
+            Type type = new TypeToken<List<InternalCodAnagsDTO>>() {}.getType();
+            SystemRESTConsumer.<List<InternalCodAnagsDTO>>processSqlStatic(internalCodAnagsQuery, type, internalCodAnagsList -> {
+                SettingsManager.iDB().setInternalCodAnags(internalCodAnagsList);
+
+                if (onComplete != null) onComplete.run();
+            }, onFailed);
+
         }, onFailed);
     }
 
@@ -129,7 +150,7 @@ public class SettingsManager {
     }
 
     private static void loadAvailableCodMdeps(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
+        SystemRESTConsumer.getAvailableCodMdepsStatic(availableCodMdeps -> {
             dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
 
             if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
@@ -192,7 +213,7 @@ public class SettingsManager {
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SETUP")
-                .setKeySection("COD_ANAG_DEFAULT"));
+                .setKeySection("FLAG_USE_COD_ANAG_AZIENDALE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SETUP")
@@ -265,16 +286,36 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SETUP")
                 .setKeySection("ON_NUM_CNF_INPUT_CHANGED"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("NOTE_PERDITA"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("ORDINI_A")
+                .setKeySection("ORDINA_NUOVI_ARTICOLI"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("CHECK_FORNITORE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_USE_QTA_ORD"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("FLAG_ALLOW_EMPTY_DEST"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
             dbSettingsModelIstance.setDefaultCausaleRettificaGiacenze(getValueFromList(list, "SETUP", "DEFAULT_CAUSALE_RETTIFICA_GIACENZE", String.class));
             dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(getValueFromList(list, "SETUP", "ENABLE_CHECK_PARTITA_MAG_PICKING_V", Boolean.class));
             dbSettingsModelIstance.setFlagMultiClienteOrdV(getValueFromList(list, "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", Boolean.class));
-            dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "SETUP", "COD_ANAG_DEFAULT", String.class));
+            dbSettingsModelIstance.setFlagUseCodAnagAziendale(getValueFromList(list, "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE", Boolean.class));
             dbSettingsModelIstance.setDefaultCriterioDistribuzione(getValueFromList(list, "SETUP", "DEFAULT_CRITERIO_DISTRIBUZIONE", String.class));
             dbSettingsModelIstance.setFlagAskClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ASK_CLIENTE", Boolean.class));
-            dbSettingsModelIstance.setFlagAllowEmptyClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_CLIENTE", Boolean.class));
+            dbSettingsModelIstance.setFlagPickLiberoAllowEmptyCliente(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_CLIENTE", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraItemSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_ITEMS", Boolean.class));
             dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
@@ -289,6 +330,15 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
             dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
+            dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
+            dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
+            dbSettingsModelIstance.setFlagAccettazioneUseQtaOrd(getValueFromList(list, "ACCETTAZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
+            dbSettingsModelIstance.setFlagPickLiberoAllowEmptyDest(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_DEST", Boolean.class));
+
+            String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
+            if (notePerdita != null) {
+                dbSettingsModelIstance.setNotePerditaDocInterni(Arrays.asList(notePerdita.split("\\|")));
+            }
 
             Integer onNumCnfInputChanged = getValueFromList(list, "SETUP", "ON_NUM_CNF_INPUT_CHANGED", Integer.class);
             if (onNumCnfInputChanged != null) {

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

@@ -13,13 +13,19 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Set;
 
+/**
+ * Created by akshay on 01/03/18.
+ */
+
 public class Stash {
 
     private static Stash stash;
+    private static Context instance;
     private SharedPreferences sp;
 
     public static void init(Context context) {
         stash = new Stash();
+        instance = context;
         if (stash.sp == null) {
             stash.sp = PreferenceManager.getDefaultSharedPreferences(context);
         }
@@ -34,7 +40,7 @@ public class Stash {
     public static void put(String key, String value) {
         checkfornull();
         try {
-            stash.sp.edit().putString(key, value).apply();
+            stash.sp.edit().putString(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -44,7 +50,7 @@ public class Stash {
     public static void put(String key, Set<String> value) {
         checkfornull();
         try {
-            stash.sp.edit().putStringSet(key, value).apply();
+            stash.sp.edit().putStringSet(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -54,7 +60,7 @@ public class Stash {
     public static void put(String key, int value) {
         checkfornull();
         try {
-            stash.sp.edit().putInt(key, value).apply();
+            stash.sp.edit().putInt(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -64,7 +70,7 @@ public class Stash {
     public static void put(String key, long value) {
         checkfornull();
         try {
-            stash.sp.edit().putLong(key, value).apply();
+            stash.sp.edit().putLong(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -74,7 +80,7 @@ public class Stash {
     public static void put(String key, float value) {
         checkfornull();
         try {
-            stash.sp.edit().putFloat(key, value).apply();
+            stash.sp.edit().putFloat(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -84,7 +90,7 @@ public class Stash {
     public static void put(String key, boolean value) {
         checkfornull();
         try {
-            stash.sp.edit().putBoolean(key, value).apply();
+            stash.sp.edit().putBoolean(key, value).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -95,7 +101,7 @@ public class Stash {
         checkfornull();
         try {
             Gson gson = new GsonBuilder().create();
-            stash.sp.edit().putString(key, gson.toJson(value).toString()).apply();
+            stash.sp.edit().putString(key, gson.toJson(value)).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -112,18 +118,26 @@ public class Stash {
         }
     }
 
+    public static String getString(String key) {
+        return getString(key, "");
+    }
+
 
     //getStringSet
     public static Set<String> getStringSet(String key, Set<String> defaultvalue) {
         checkfornull();
         try {
-            return getStringSet(key, defaultvalue);
+            return stash.sp.getStringSet(key, defaultvalue);
         } catch (Exception e) {
             e.printStackTrace();
             return defaultvalue;
         }
     }
 
+    public static Set<String> getStringSet(String key) {
+        return getStringSet(key, null);
+    }
+
     //getInt
     public static int getInt(String key, int defaultvalue) {
         checkfornull();
@@ -135,6 +149,10 @@ public class Stash {
         }
     }
 
+    public static int getInt(String key) {
+        return getInt(key, 0);
+    }
+
     //getLong
     public static long getLong(String key, long defaultvalue) {
         checkfornull();
@@ -146,6 +164,10 @@ public class Stash {
         }
     }
 
+    public static long getLong(String key) {
+        return getLong(key, (long) 0);
+    }
+
     //getFloat
     public static float getFloat(String key, float defaultvalue) {
         checkfornull();
@@ -157,6 +179,10 @@ public class Stash {
         }
     }
 
+    public static float getFloat(String key) {
+        return getFloat(key, 0.0f);
+    }
+
     //getBoolean
     public static boolean getBoolean(String key, boolean defaultvalue) {
         checkfornull();
@@ -168,6 +194,10 @@ public class Stash {
         }
     }
 
+    public static boolean getBoolean(String key) {
+        return getBoolean(key, false);
+    }
+
     //getObject
     public static <T> Object getObject(String key, Class<?> tClass) {
         checkfornull();
@@ -196,7 +226,7 @@ public class Stash {
     public static void clear(String key) {
         checkfornull();
         try {
-            stash.sp.edit().remove(key).apply();
+            stash.sp.edit().remove(key).commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -206,12 +236,22 @@ public class Stash {
     public static void clearAll() {
         checkfornull();
         try {
-            stash.sp.edit().clear().apply();
+            stash.sp.edit().clear().commit();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    public static void addListener(StashListener listener){
+        checkfornull();
+        stash.sp.registerOnSharedPreferenceChangeListener(listener);
+    }
+
+    public static void removeListener(StashListener listener){
+        checkfornull();
+        stash.sp.unregisterOnSharedPreferenceChangeListener(listener);
+    }
+
     private static class GenericType implements ParameterizedType {
 
         private Type type;
@@ -238,4 +278,7 @@ public class Stash {
         // implement equals method too! (as per javadoc)
     }
 
-}
+    public interface StashListener extends SharedPreferences.OnSharedPreferenceChangeListener {
+
+    }
+}

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

@@ -1,60 +0,0 @@
-package it.integry.integrywmsnative.core.update;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Environment;
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class UpdateApp extends AsyncTask<String,Void,Void> {
-    private Context context;
-    public void setContext(Context contextf){
-        context = contextf;
-    }
-
-    @Override
-    protected Void doInBackground(String... arg0) {
-        try {
-            URL url = new URL(arg0[0]);
-            HttpURLConnection c = (HttpURLConnection) url.openConnection();
-            c.setRequestMethod("GET");
-            c.setDoOutput(true);
-            c.connect();
-
-            File file = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-            file.mkdirs();
-            File outputFile = new File(file, "update.apk");
-            if(outputFile.exists()){
-                outputFile.delete();
-            }
-            FileOutputStream fos = new FileOutputStream(outputFile);
-
-            InputStream is = c.getInputStream();
-
-            byte[] buffer = new byte[1024];
-            int len1 = 0;
-            while ((len1 = is.read(buffer)) != -1) {
-                fos.write(buffer, 0, len1);
-            }
-            fos.close();
-            is.close();
-
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.fromFile(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)), "application/vnd.android.package-archive");
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // without this flag android returned a intent error!
-            context.startActivity(intent);
-
-
-        } catch (Exception e) {
-            Log.e("UpdateAPP", "Update error! " + e.getMessage());
-        }
-        return null;
-    }
-}

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

@@ -1,30 +1,35 @@
 package it.integry.integrywmsnative.core.update;
 
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.enums.Display;
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
 
 import java.io.File;
 
-import it.integry.integrywmsnative.R;
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.FileDownloader;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
+@Singleton
 public class UpdatesManager {
 
-    public static void init(Activity context) {
+    private AppCompatActivity mContext;
+
+    public void init(AppCompatActivity activityContext) {
+        this.mContext = activityContext;
+
         String suffix;
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
         try {
@@ -40,64 +45,67 @@ public class UpdatesManager {
         String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release" + suffix + ".apk";
 
 
-        AppUpdater appUpdater = new AppUpdater(context)
+        AppUpdater appUpdater = new AppUpdater(mContext)
                 .setDisplay(Display.DIALOG)
                 .setUpdateFrom(UpdateFrom.JSON)
                 .setUpdateJSON(currentVersionUrl)
                 .setButtonDoNotShowAgain(null)
                 .setButtonUpdateClickListener((dialog, which) -> {
-                    installAPK(context, currentDownloadUrl);
+                    installAPK(currentDownloadUrl);
                 });
         appUpdater.start();
     }
 
 
-    private static void installAPK(Activity context, String downloadURL) {
+    private void installAPK(String downloadURL) {
+
         String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
-        String fileName = context.getResources().getString(R.string.app_name) + ".apk";
-        destination += fileName;
-        final Uri uri = Uri.parse("file://" + destination);
 
-        //Delete update file if exists
-        final File file = new File(destination);
-        if (file.exists())
-            file.delete();
+        var progressDialog = DialogProgressView.newInstance("Download", null, false);
+        progressDialog.show(mContext.getSupportFragmentManager(), "tag");
 
-        //set downloadmanager
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(downloadURL));
-        request.setDescription(context.getString(R.string.notification_update_download));
-        request.setTitle(context.getString(R.string.app_name));
 
-        //set destination
-        request.setDestinationUri(uri);
+        var fileDownloader = new FileDownloader()
+                .setDestFolder(destination)
+                .setUrlString(downloadURL)
+                .setOnProgressUpdate(progress -> {
+                    mContext.runOnUiThread(() -> {
+                        progressDialog.setProgress(progress);
+                    });
+                })
+                .setOnDownloadCompleted(destPath -> {
 
-        // get download service and enqueue file
-        final DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        manager.enqueue(request);
+                    mContext.runOnUiThread(() -> {
+                        progressDialog.dismiss();
 
-        //set BroadcastReceiver to install app when .apk is downloaded
-        BroadcastReceiver onComplete = new BroadcastReceiver() {
-            public void onReceive(Context ctxt, Intent i) {
+                        Uri fileLoc;
+                        Intent intent;
 
-                Uri fileLoc;
-                Intent intent;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+                            fileLoc = GenericFileProvider.getUriForFile(mContext,
+                                    mContext.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
+                                    new File(destPath));
+                        } else {
+                            intent = new Intent(Intent.ACTION_VIEW);
+                            fileLoc = Uri.fromFile(new File(destPath));
+                        }
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-                    fileLoc = GenericFileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider", file);
-                } else {
-                    intent = new Intent(Intent.ACTION_VIEW);
-                    fileLoc = Uri.fromFile(file);
-                }
+                        intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
+                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-                intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
-                intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                        mContext.startActivity(intent);
+                    });
 
-                context.startActivity(intent);
+                });
+
+
+        new Thread(() -> {
+            try {
+                fileDownloader.download();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        };
-
-        //register receiver for when .apk download is compete
-        context.registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+        }).start();
     }
 }

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

@@ -0,0 +1,113 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.webkit.URLUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class FileDownloader {
+
+    private String urlString;
+    private String destFolder;
+
+    private RunnableArgs<Integer> onProgressUpdate;
+    private RunnableArgs<String> onDownloadCompleted;
+
+
+    public void download() throws Exception {
+        InputStream input = null;
+        OutputStream output = null;
+        HttpURLConnection connection = null;
+        String destPathFile;
+
+        try {
+            File direct = new File(destFolder);
+            if (!direct.exists()) {
+                direct.mkdirs();
+            }
+
+            URL url = new URL(urlString);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.connect();
+            connection.setConnectTimeout(120 * 1000);
+
+            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+                throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
+
+            input = connection.getInputStream();
+            int totalBytesToDownload = connection.getContentLength();
+            int downloadedBytes = 0;
+
+            String title = URLUtil.guessFileName(String.valueOf(url), null, null);
+
+            destPathFile = destFolder + title;
+
+            if (new File(destPathFile).exists())
+                new File(destPathFile).delete();
+
+            output = new FileOutputStream(destPathFile);
+
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = input.read(buf)) > 0) {
+                output.write(buf, 0, len);
+
+                downloadedBytes += len;
+                if (onProgressUpdate != null)
+                    onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
+            }
+
+        } catch (Exception e) {
+            throw e;
+
+        } finally {
+            try {
+                if (output != null)
+                    output.close();
+                if (input != null)
+                    input.close();
+            } catch (IOException ignored) {
+            }
+            if (connection != null)
+                connection.disconnect();
+        }
+
+        if (onDownloadCompleted != null) onDownloadCompleted.run(destPathFile);
+    }
+
+
+    public String getUrlString() {
+        return urlString;
+    }
+
+    public FileDownloader setUrlString(String urlString) {
+        this.urlString = urlString;
+        return this;
+    }
+
+    public String getDestFolder() {
+        return destFolder;
+    }
+
+    public FileDownloader setDestFolder(String destFolder) {
+        this.destFolder = destFolder;
+        return this;
+    }
+
+    public FileDownloader setOnProgressUpdate(RunnableArgs<Integer> onProgressUpdate) {
+        this.onProgressUpdate = onProgressUpdate;
+        return this;
+    }
+
+    public FileDownloader setOnDownloadCompleted(RunnableArgs<String> onDownloadCompleted) {
+        this.onDownloadCompleted = onDownloadCompleted;
+        return this;
+    }
+}

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.utility;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.text.Html;
 
@@ -13,6 +12,7 @@ import com.orhanobut.logger.Logger;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
@@ -21,9 +21,9 @@ public class UtilityExceptions {
 
     };
 
-    public static void defaultException(Context context, Exception ex, Dialog progressDialog) {
+    public static void defaultException(Context context, Exception ex, DialogProgressView progressDialog) {
         defaultException(context, ex);
-        if (progressDialog != null) progressDialog.dismiss();
+        if (progressDialog != null && progressDialog.isVisible()) progressDialog.dismiss();
     }
 
     public static void defaultException(Context context, Exception ex) {

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

@@ -8,7 +8,8 @@ public class UtilityFocus {
 
     public static void focusTextBox(Context context, EditText editTextToFocus) {
         editTextToFocus.requestFocus();
-
+        editTextToFocus.setSelectAllOnFocus(true);
+        editTextToFocus.selectAll();
         InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.showSoftInput(editTextToFocus, InputMethodManager.SHOW_IMPLICIT);
     }

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

@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.utility;
 
-import com.google.android.gms.common.internal.service.Common;
-
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;

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

@@ -31,10 +31,13 @@ public class UtilityPosizione {
     }
 
     public static MtbDepoPosizione getFromCache(String posizione) {
-        List<MtbDepoPosizione> tmpList = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+        var availablePosizioni = SettingsManager.iDB().getAvailablePosizioni();
+        if(availablePosizioni == null) return null;
+
+        List<MtbDepoPosizione> tmpList = Stream.of(availablePosizioni)
                 .filter(x -> x.getPosizione().equalsIgnoreCase(posizione)).toList();
 
-        if(tmpList != null && tmpList.size() > 0) return tmpList.get(0);
+        if(tmpList.size() > 0) return tmpList.get(0);
         else return null;
     }
 

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

@@ -1,25 +1,21 @@
 package it.integry.integrywmsnative.core.utility;
 
-import android.app.Dialog;
-import android.content.Context;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
 
-import it.integry.integrywmsnative.view.dialogs.DialogProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class UtilityProgress {
 
-    public static Dialog createDefaultProgressDialog(Context mContext) {
-//        final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting),
-//                mContext.getText(R.string.loading) + " ...", true);
-//
-//        return progress;
-
-        Dialog progress = DialogProgress.make(mContext);
-        progress.show();
+    public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) {
+        var progress = DialogProgressView.newInstance();
+        progress.show(mContext.getSupportFragmentManager(), "tag");
         return progress;
     }
-    public static Dialog createDefaultProgressDialog(Context mContext,String subtitle) {
-        Dialog progress = DialogProgress.make(mContext,subtitle);
-        progress.show();
+
+    public static DialogProgressView createDefaultProgressDialog(AppCompatActivity mContext, String title, String subtitle) {
+        DialogProgressView progress = DialogProgressView.newInstance(title, subtitle, true);
+        progress.show(mContext.getSupportFragmentManager(), "tag");
         return progress;
     }
 

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

@@ -5,14 +5,16 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 
+import it.integry.integrywmsnative.core.exception.NotValidLicenseException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.gest.login.exception.ServerNotReachableException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
 public class UtilityServer {
 
-    public static void isHostReachable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback){
+    public static void isHostReachable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback) {
         new Thread(() -> {
 
             boolean connected = false;
@@ -36,7 +38,7 @@ public class UtilityServer {
         }).start();
     }
 
-    public static void isEmsApiAvailable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback) {
+    public static void isEmsApiAvailable(final String serverAddress, final int serverTCPport, final Runnable onComplete, final RunnableArgs<Exception> onFailed) {
         new Thread(() -> {
             OkHttpClient client = new OkHttpClient();
 
@@ -46,11 +48,16 @@ public class UtilityServer {
 
             try {
                 Response response = client.newCall(request).execute();
-                boolean status = response.isSuccessful();
                 response.close();
-                callback.run(status);
+
+                if (response.code() == 200) onComplete.run();
+                else if (response.code() == 404)
+                    onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, null));
+                else if (response.code() == 550)
+                    onFailed.run(new NotValidLicenseException());
+                else onFailed.run(new Exception("Errore non identificato (STATUS: " + response.code() + ")"));
             } catch (IOException e) {
-                callback.run(false);
+                onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, e));
             }
 
         }).start();

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java

@@ -21,6 +21,8 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -33,14 +35,17 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 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.MtbTCol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -50,20 +55,28 @@ import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.ActivityAccettazioneOrdineInevasoBinding;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
-import it.integry.integrywmsnative.gest.accettazione_picking.ui.AccettazioneListAdapter;
-import it.integry.integrywmsnative.gest.accettazione_picking.ui.AccettazioneListModel;
 import it.integry.integrywmsnative.gest.accettazione_picking.dto.AccettazioneOrdineInevasoOrderBy;
 import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.AccettazionePickingFiltroOrdineViewModel;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterCodArtLayoutView;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterDescrLayoutView;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterPosizioneLayoutView;
 import it.integry.integrywmsnative.gest.accettazione_picking.rest.RecoverMtbColt;
+import it.integry.integrywmsnative.gest.accettazione_picking.ui.AccettazioneListAdapter;
+import it.integry.integrywmsnative.gest.accettazione_picking.ui.AccettazioneListModel;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
+import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
 
 public class AccettazionePickingActivity extends BaseActivity implements AccettazionePickingViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
 
@@ -72,6 +85,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Inject
     AccettazionePickingViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
+    private final AccettazionePickingFiltroOrdineViewModel mAppliedFilterViewModel = new AccettazionePickingFiltroOrdineViewModel();
+
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
     private final ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
@@ -123,11 +141,169 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
+        this.initFilters();
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
 
         mViewModel.setListeners(this);
-        mViewModel.init(mOrders, mSitArts, codMdep);
+        mViewModel.init(
+                mOrders,
+                mSitArts,
+                codMdep,
+                useQtaOrd);
+    }
+
+    private void initFilters() {
+
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList();
+            }
+        };
+
+        mAppliedFilterViewModel.getCurrentCodArtPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+        mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+        mAppliedFilterViewModel.getCurrentPosPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        List<FilterChipDTO> filterList = Stream.of(AccettazionePickingBindings.AVAILABLE_FILTERS.entrySet())
+                .map(Map.Entry::getValue)
+                .sortBy(FilterChipDTO::getPosizione)
+                .toList();
+
+        for (FilterChipDTO filterChipDTO : filterList) {
+
+            FilterChipView filterChipView = new FilterChipView(
+                    this,
+                    filterChipDTO.getFilterChipText(),
+                    v -> initBottomSheetDialogFilter(filterChipDTO));
+
+            switch (filterChipDTO.getID()) {
+                case AccettazionePickingBindings.COD_ART_FILTER_ID:
+                    mAppliedFilterViewModel.getCurrentCodArtPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                        @Override
+                        public void run() {
+                            if (mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null) {
+                                mViewModel.resetMatchedRows();
+                                filterChipView.disableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            } else {
+                                filterChipView.enableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            }
+                        }
+                    });
+                    filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentCodArtPredicate().set(null));
+                    break;
+                case AccettazionePickingBindings.DESCR_FILTER_ID:
+                    mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                        @Override
+                        public void run() {
+                            if (mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null) {
+                                mViewModel.resetMatchedRows();
+                                filterChipView.disableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            } else {
+                                filterChipView.enableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            }
+                        }
+                    });
+                    filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDescrPredicate().set(null));
+                    break;
+                case AccettazionePickingBindings.POS_FILTER_ID:
+                    mAppliedFilterViewModel.getCurrentPosPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                        @Override
+                        public void run() {
+                            if (mAppliedFilterViewModel.getCurrentPosPredicate().get() == null) {
+                                mViewModel.resetMatchedRows();
+                                filterChipView.disableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            } else {
+                                filterChipView.enableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            }
+                        }
+                    });
+                    filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentPosPredicate().set(null));
+                    break;
+            }
+
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+
+        filterChipDTO
+                .getFilterLayoutView()
+                .setFilterName(filterChipDTO.getFilterChipText())
+                .setContext(this);
+
+        var filterLayoutView = filterChipDTO
+                .getFilterLayoutView();
+
+        switch (filterChipDTO.getID()) {
+            case AccettazionePickingBindings.COD_ART_FILTER_ID:
+                ((FilterCodArtLayoutView) filterLayoutView)
+                        .setAll(mAppliedFilterViewModel.getAllCodArts())
+                        .setAvailable(mAppliedFilterViewModel.getAvailableCodArts())
+                        .setOnFilterApplied(mAppliedFilterViewModel::setCodArtFilter)
+                        .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                .filter(mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null ?
+                                        x -> false :
+                                        mAppliedFilterViewModel.getCurrentCodArtPredicate().get())
+                                .map(x -> x.getSitArtOrdDTO().getCodMart())
+                                .toList());
+                break;
+            case AccettazionePickingBindings.DESCR_FILTER_ID:
+                ((FilterDescrLayoutView) filterLayoutView)
+                        .setAll(mAppliedFilterViewModel.getAllDescrs())
+                        .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
+                        .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
+                        .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ?
+                                        x -> false :
+                                        mAppliedFilterViewModel.getCurrentDescrPredicate().get())
+                                .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
+                                .toList());
+                break;
+            case AccettazionePickingBindings.POS_FILTER_ID:
+                ((FilterPosizioneLayoutView) filterLayoutView)
+                        .setAll(mAppliedFilterViewModel.getAllPos())
+                        .setAvailable(mAppliedFilterViewModel.getAvailablePos())
+                        .setOnFilterApplied(mAppliedFilterViewModel::setPosFilter)
+                        .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                .filter(mAppliedFilterViewModel.getCurrentPosPredicate().get() == null ?
+                                        x -> false :
+                                        mAppliedFilterViewModel.getCurrentPosPredicate().get())
+                                .map(x -> x.getMtbAart().getPosizione())
+                                .toList());
+                break;
+
+        }
+
+        filterLayoutView.show(getSupportFragmentManager(), "TAG");
     }
 
     @Override
@@ -162,7 +338,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         // Handle item selection
         switch (item.getItemId()) {
             case R.id.action_filter:
-                showOrderDialog();
+                showOrderByDialog();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -179,7 +355,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
     }
 
@@ -189,6 +365,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
 
         this.mViewModel.getPickingList().observe(this, updatedData -> {
+            mAppliedFilterViewModel.init(updatedData);
+
             refreshList();
         });
 
@@ -198,9 +376,28 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     private void refreshList() {
-        this.mAccettazioneMutableData.clear();
-        this.mAccettazioneMutableData.addAll(convertDataModelToListModel(this.mViewModel.getPickingList().getValue()));
-        this.noItemsToPick.set(!isThereAnyItemToPick(this.mViewModel.getPickingList().getValue()));
+        //this.onLoadingStarted();
+
+        //new Thread(() -> {
+
+        runOnUiThread(() -> {
+            List<PickingObjectDTO> tmpList;
+
+            if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
+                tmpList = mViewModel.getPickingList().getValue();
+            }
+
+            var list = convertDataModelToListModel(tmpList);
+
+            this.mAccettazioneMutableData.clear();
+            this.mAccettazioneMutableData.addAll(list);
+            this.noItemsToPick.set(!isThereAnyItemToPick(tmpList));
+
+            //this.onLoadingEnded();
+        });
     }
 
     private List<AccettazioneListModel> convertDataModelToListModel(List<PickingObjectDTO> dataList) {
@@ -228,17 +425,21 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     private List<AccettazioneListModel> convertDataModelToListModel__CodArtForn(List<PickingObjectDTO> dataList) {
         ArrayList<AccettazioneListModel> list = new ArrayList<>();
         Stream.of(dataList)
-                .sortBy(x -> x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()))
+                .sortBy(x -> UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
+                        (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()))
                 .forEach(x -> {
                     AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
                     accettazioneListModel.setActive(true);
 
-                    accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+                    accettazioneListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
+                            (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
 
                     accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+                    if (x.getMtbAart() != null)
+                        accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
 
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
@@ -295,12 +496,15 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
                     accettazioneListModel.setActive(true);
 
-                    accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+                    accettazioneListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart())
+                            + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
 
                     accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+                    if (x.getMtbAart() != null)
+                        accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
 
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
@@ -361,7 +565,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
 
-                    accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
+                    accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
                     //Calc Num CNF
@@ -405,6 +609,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     if (x.getMtbAart() != null) {
                         accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+                        accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
                     }
 
                     accettazioneListModel.setOriginalModel(x);
@@ -420,7 +625,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
 
-                    accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
+                    accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
 
@@ -514,8 +719,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         this.mViewModel.retrieveExistentLU(this::startListaBancaliRegistratiActivity);
     }
 
-    private void showOrderDialog() {
-
+    private void showOrderByDialog() {
         AlertDialog dialog = new AlertDialog.Builder(this)
                 .setTitle(this.getText(R.string.action_orderBy))
                 .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
@@ -527,7 +731,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         dialog.show();
     }
 
-
     public void startListaBancaliRegistratiActivity(ArrayList<RecoverMtbColt> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
@@ -560,7 +763,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 null,
                 R.string.button_ignore_print,
                 onComplete)
-            .show(getSupportFragmentManager(), "tag");
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -589,8 +792,18 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     @Override
-    public void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
-        NoteAggiuntiveLUDialog.make(this, onComplete::run, () -> onComplete.run(null)).show();
+    public void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete) {
+        runOnUiThread(() -> {
+            DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete)
+                    .show(getSupportFragmentManager(), "tag");
+        });
+    }
+
+    @Override
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+        runOnUiThread(() -> {
+            InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
+        });
     }
 
     @Override
@@ -628,8 +841,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity);
 
-        DialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+        mDialogInputQuantityV2View
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -637,52 +851,79 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                             .setPartitaMag(resultDTO.getPartitaMag())
                             .setDataScad(resultDTO.getDataScad());
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
-                    this.mViewModel.resetMatchedRows();
                 })
+                .setOnAbort(() -> this.mViewModel.resetMatchedRows())
                 .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        runOnUiThread(() -> {
+            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        });
     }
 
     @Override
-    public void onFilterApplied(String newValue) {
-        this.mBindings.filteredArtsInListExpandableLayout.expand(true);
-        this.mBindings.descriptionFilterText.setText(!UtilityString.isNullOrEmpty(newValue) ? newValue : "");
+    public void onFilterCodMartApplied(String codMartToFilter) {
+        runOnUiThread(() -> {
+            var codMarts = new ArrayList<String>();
+            codMarts.add(codMartToFilter);
+
+            this.mAppliedFilterViewModel.setCodArtFilter(codMarts);
+        });
     }
 
     @Override
-    public void onFilterRemoved() {
-        mBindings.filteredArtsInListExpandableLayout.collapse(true);
+    public void onFilterPosizioneApplied(String posizioneToFilter) {
+        runOnUiThread(() -> {
+            var posizioni = new ArrayList<String>();
+            posizioni.add(posizioneToFilter);
+
+            this.mAppliedFilterViewModel.setPosFilter(posizioni);
+        });
+    }
+
+    @Override
+    public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+
+        runOnUiThread(() -> {
+            DialogVersamentoAutomaticoULDoneView
+                    .newInstance(versamentoAutomaticoULResponseDTO, onComplete)
+                    .show(getSupportFragmentManager(), "tag");
+        });
+
     }
 
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
-        String text = getResources().getString(R.string.alert_delete_mtb_colr);
-        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
-                null,
-                () -> onComplete.run(true),
-                () -> onComplete.run(false)
-        ).show(getSupportFragmentManager(), "tag");
+        runOnUiThread(() -> {
+            String text = getResources().getString(R.string.alert_delete_mtb_colr);
+            DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
+                    null,
+                    () -> onComplete.run(true),
+                    () -> onComplete.run(false)
+            ).show(getSupportFragmentManager(), "tag");
+        });
     }
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        noLUPresent.set(false);
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        runOnUiThread(() -> {
+            noLUPresent.set(false);
+            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
 
-        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
+            this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
+        });
     }
 
     @Override
     public void onLUClosed() {
-        noLUPresent.set(true);
-        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+        runOnUiThread(() -> {
+            noLUPresent.set(true);
+            this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
 
-        if (this.mShouldCloseActivity) super.onBackPressed();
+            if (this.mShouldCloseActivity) super.onBackPressed();
+        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingBindings.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.gest.accettazione_picking;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterCodArtLayoutView;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterDescrLayoutView;
+import it.integry.integrywmsnative.gest.accettazione_picking.filters.FilterPosizioneLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+
+public class AccettazionePickingBindings {
+
+    public static final int COD_ART_FILTER_ID = 0;
+    public static final int DESCR_FILTER_ID = 1;
+    public static final int POS_FILTER_ID = 2;
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {
+        {
+            put(COD_ART_FILTER_ID, new FilterChipDTO()
+                    .setID(COD_ART_FILTER_ID)
+                    .setPosizione(0)
+                    .setFilterChipText("Codice articolo")
+                    .setFilterLayoutView(new FilterCodArtLayoutView()));
+
+            put(DESCR_FILTER_ID, new FilterChipDTO()
+                    .setID(DESCR_FILTER_ID)
+                    .setPosizione(1)
+                    .setFilterChipText("Descrizione articolo")
+                    .setFilterLayoutView(new FilterDescrLayoutView()));
+
+            put(POS_FILTER_ID, new FilterChipDTO()
+                    .setID(POS_FILTER_ID)
+                    .setPosizione(1)
+                    .setFilterChipText("Posizione")
+                    .setFilterLayoutView(new FilterPosizioneLayoutView()));
+        }};
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java

@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 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.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
@@ -42,11 +43,13 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
+import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.accettazione_picking.dto.HistoryMtbAartDTO;
@@ -70,6 +73,7 @@ public class AccettazionePickingViewModel {
 
     private List<OrdineAccettazioneInevasoDTO> mOrders;
     private List<SitArtOrdDTO> mSitArts;
+    private boolean mUseQtaOrd;
     private final MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
 
     private MtbColt mCurrentMtbColt = null;
@@ -94,9 +98,10 @@ public class AccettazionePickingViewModel {
     }
 
 
-    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep) {
+    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep, boolean useQtaOrd) {
         this.mOrders = orders;
         this.mDefaultCodMdep = codMdep;
+        this.mUseQtaOrd = useQtaOrd;
 
         this.mSitArts = Stream.of(sitArts)
                 .filter(x -> UtilityBigDecimal.greaterThan(x.getNumCnfDaEvadere(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
@@ -243,6 +248,10 @@ public class AccettazionePickingViewModel {
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
 
+        } else if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO)) {
+            //Applico filtro per posizione
+            this.executeEtichettaPosizione(barcodeScanDTO, onComplete);
+
         } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
@@ -293,18 +302,28 @@ public class AccettazionePickingViewModel {
         }, this::sendError);
     }
 
+    private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+        var optionalPos = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+                .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue()))
+                .findFirst();
+
+        this.sendFilterPosizioneApplied(optionalPos.get().getPosizione());
+        onComplete.run();
+    }
 
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
         if (barcodeProd.length() == 14) {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
+        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);
@@ -332,21 +351,19 @@ public class AccettazionePickingViewModel {
         } else if (matchedRows.size() == 1) {
             this.dispatchOrdineRow(matchedRows.get(0));
         } else {
-            List<PickingObjectDTO> pickingList = mPickingList.getValue();
+            //So che il codMart sarà solo 1
+            var firstCodMart = Stream.of(matchedRows)
+                    .map(x -> x.getSitArtOrdDTO().getCodMart())
+                    .distinct()
+                    .findFirst()
+                    .get();
 
-            for (int i = 0; i < pickingList.size(); i++) {
-                if (!matchedRows.contains(pickingList.get(i))) {
-                    pickingList.get(i).setHidden(true);
-                }
-            }
-
-            this.sendFilterApplied(null);
-            this.getPickingList().postValue(pickingList);
+            this.sendFilterCodMartApplied(firstCodMart);
         }
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, boolean disablePrint, Runnable onComplete) {
-        this.sendOnNoteAggiuntiveRequest(additionalNotes -> {
+        this.sendOnInfoAggiuntiveRequest((additionalNotes, tCol) -> {
 
             this.mGestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> {
 
@@ -356,12 +373,16 @@ public class AccettazionePickingViewModel {
 
                 MtbColt mtbColt = new MtbColt();
                 mtbColt
-                        .initDefaultFields()
-                        .setGestione(defaultGestioneOfUL)
+                        .initDefaultFields(defaultGestioneOfUL)
                         .setAnnotazioni(additionalNotes)
                         .setPosizione(defaultPosAccettazione)
                         .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
+                if (tCol != null) {
+                    mtbColt.setCodTcol(tCol.getCodTcol());
+                    mtbColt.setMtbTCol(tCol);
+                }
+
                 if (customNumCollo != null) {
                     mtbColt.setNumCollo(customNumCollo);
                 }
@@ -517,7 +538,9 @@ public class AccettazionePickingViewModel {
             initialQtaTot = totalQtaOrd;
         }
 
-        if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+        if (!this.mUseQtaOrd &&
+                UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
+                UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
             initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
             initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
         }
@@ -571,64 +594,67 @@ public class AccettazionePickingViewModel {
     public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
-        String gestioneRif = pickingObjectDTO.getSitArtOrdDTO().getGestioneEnum() == GestioneEnum.PRODUZIONE ? "L" : pickingObjectDTO.getSitArtOrdDTO().getGestione();
+        UtilityThread.executeParallel(() -> {
 
-        final MtbColr mtbColr = new MtbColr()
-                .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
-                .setPartitaMag(partitaMag)
-                .setDataScadPartita(dataScad)
-                .setQtaCol(qtaTot)
-                .setQtaCnf(qtaCnf)
-                .setNumCnf(numCnf)
-                .setGestioneRif(gestioneRif)
-                .setCodJcom(pickingObjectDTO.getSitArtOrdDTO().getCodJcom())
-                .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
-                .setDatetimeRow(UtilityDate.getDateInstance())
-                .setDataOrd(pickingObjectDTO.getSitArtOrdDTO().getDataOrd())
-                .setNumOrd(pickingObjectDTO.getSitArtOrdDTO().getNumOrd())
-                .setRigaOrd(pickingObjectDTO.getSitArtOrdDTO().getRigaOrd());
+            String gestioneRif = pickingObjectDTO.getSitArtOrdDTO().getGestioneEnum() == GestioneEnum.PRODUZIONE ? "L" : pickingObjectDTO.getSitArtOrdDTO().getGestione();
+
+            final MtbColr mtbColr = new MtbColr()
+                    .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
+                    .setPartitaMag(partitaMag)
+                    .setDataScadPartita(dataScad)
+                    .setQtaCol(qtaTot)
+                    .setQtaCnf(qtaCnf)
+                    .setNumCnf(numCnf)
+                    .setGestioneRif(gestioneRif)
+                    .setCodJcom(pickingObjectDTO.getSitArtOrdDTO().getCodJcom())
+                    .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
+                    .setDatetimeRow(UtilityDate.getDateInstance())
+                    .setDataOrd(pickingObjectDTO.getSitArtOrdDTO().getDataOrd())
+                    .setNumOrd(pickingObjectDTO.getSitArtOrdDTO().getNumOrd())
+                    .setRigaOrd(pickingObjectDTO.getSitArtOrdDTO().getRigaOrd());
 
 
-        this.addHistoryItem(mtbColr);
+            this.addHistoryItem(mtbColr);
 
-        mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+            mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
-        MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
-        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
+            MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
+            cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
 
-        cloneMtbColt.setMtbColr(new ObservableArrayList<>());
-        cloneMtbColt.getMtbColr().add((MtbColr) mtbColr.clone());
+            cloneMtbColt.setMtbColr(new ObservableArrayList<>());
+            cloneMtbColt.getMtbColr().add((MtbColr) mtbColr.clone());
 
-        if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
-            resetMatchedRows();
-            this.sendOnLoadingEnded();
+            if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
+                resetMatchedRows();
+                this.sendOnLoadingEnded();
 
-            if (shouldCloseLU) closeLU();
-            return;
-        }
+                if (shouldCloseLU) closeLU();
+                return;
+            }
 
-        mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
+            mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
 
-            mtbColr
-                    .setDataCollo(value.getDataColloS())
-                    .setNumCollo(value.getNumCollo())
-                    .setGestione(value.getGestione())
-                    .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
-                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
-                    .setMtbAart(pickingObjectDTO.getMtbAart());
+                mtbColr
+                        .setDataCollo(value.getDataColloS())
+                        .setNumCollo(value.getNumCollo())
+                        .setGestione(value.getGestione())
+                        .setSerCollo(value.getSerCollo())
+                        .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
+                        .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
+                        .setMtbAart(pickingObjectDTO.getMtbAart());
 
-            pickingObjectDTO.getWithdrawMtbColrs().add(mtbColr);
-            mCurrentMtbColt.getMtbColr().add(mtbColr);
+                pickingObjectDTO.getWithdrawMtbColrs().add(mtbColr);
+                mCurrentMtbColt.getMtbColr().add(mtbColr);
 
-            //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
-            resetMatchedRows();
+                //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
+                resetMatchedRows();
 
-            this.sendOnRowSaved();
-            this.sendOnLoadingEnded();
+                this.sendOnRowSaved();
+                this.sendOnLoadingEnded();
 
-            if (shouldCloseLU) closeLU();
-        }, this::sendError);
+                if (shouldCloseLU) closeLU();
+            }, this::sendError);
+        }, false);
     }
 
 
@@ -772,19 +798,40 @@ public class AccettazionePickingViewModel {
             } else {
                 mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
 
-                    if (!mCurrentMtbColt.getDisablePrint()) {
-                        printCollo(this::postCloseOperations);
-                    } else {
-                        postCloseOperations();
-                    }
+                    Runnable onVersamentoCompleted = () -> {
+                        if (!mCurrentMtbColt.getDisablePrint()) {
+                            printCollo(this::postCloseOperations);
+                        } else {
+                            postCloseOperations();
+                        }
+
+                        this.sendLUClosed();
+                        this.sendOnLoadingEnded();
+                    };
+
+                    sendVersamentoAutomaticoULRequest(response -> {
+                        if (response) {
+                            versaAutomaticamenteUL(onVersamentoCompleted);
+                        } else {
+                            onVersamentoCompleted.run();
+                        }
+                    });
+
 
-                    this.sendLUClosed();
-                    this.sendOnLoadingEnded();
                 }, this::sendError);
             }
         }, this::sendError);
     }
 
+    public void versaAutomaticamenteUL(Runnable onComplete) {
+        if (mCurrentMtbColt == null) return;
+
+        mColliMagazzinoRESTConsumer.versamentoAutomaticoUL(mCurrentMtbColt, versamentoResult -> {
+            this.notifyVersamentoAutomaticoResult(versamentoResult, onComplete);
+        }, this::sendError);
+    }
+
+
     private void printCollo(Runnable onComplete) {
         MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
         cloneMtbColt.setGestione(cloneMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE ? GestioneEnum.PRODUZIONE : cloneMtbColt.getGestioneEnum());
@@ -816,12 +863,10 @@ public class AccettazionePickingViewModel {
     public void resetMatchedRows() {
         for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
             pickingObjectDTO
-                    .setTempPickData(null)
-                    .setHidden(false);
+                    .setTempPickData(null);
         }
 
         this.mPickingList.postValue(this.mPickingList.getValue());
-        this.sendFilterRemoved();
     }
 
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
@@ -857,8 +902,12 @@ public class AccettazionePickingViewModel {
         if (this.mListener != null) mListener.onLoadingEnded();
     }
 
-    private void sendOnNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
-        if (this.mListener != null) this.mListener.onNoteAggiuntiveRequest(onComplete);
+    private void sendVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete) {
+        if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
+    }
+
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+        if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
     private void sendError(Exception ex) {
@@ -925,27 +974,33 @@ public class AccettazionePickingViewModel {
         if (this.mListener != null) mListener.onRowSaved();
     }
 
-    private void sendFilterApplied(String newValue) {
-        if (this.mListener != null) mListener.onFilterApplied(newValue);
+    private void sendFilterCodMartApplied(String codMart) {
+        if (this.mListener != null) mListener.onFilterCodMartApplied(codMart);
     }
 
-    private void sendFilterRemoved() {
-        if (this.mListener != null) mListener.onFilterRemoved();
+    private void sendFilterPosizioneApplied(String posizione) {
+        if (this.mListener != null) mListener.onFilterPosizioneApplied(posizione);
     }
 
     private void sendMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
         if (this.mListener != null) mListener.onMtbColrDeleteRequest(onComplete);
     }
 
-    public AccettazionePickingViewModel setListeners(AccettazionePickingViewModel.Listener
-                                                             listener) {
+    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+        if (this.mListener != null)
+            mListener.onULVersata(versamentoAutomaticoULResponseDTO, onComplete);
+    }
+
+    public AccettazionePickingViewModel setListeners(AccettazionePickingViewModel.Listener listener) {
         this.mListener = listener;
         return this;
     }
 
     public interface Listener extends ILoadingListener, ILUPrintListener, ILUBaseOperationsListener {
 
-        void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete);
+        void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
+
+        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
 
         void onError(Exception ex);
 
@@ -969,9 +1024,11 @@ public class AccettazionePickingViewModel {
                               boolean canOverflowQuantity,
                               RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
-        void onFilterApplied(String newValue);
+        void onFilterCodMartApplied(String codMartToFilter);
 
-        void onFilterRemoved();
+        void onFilterPosizioneApplied(String posizioneToFilter);
+
+        void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete);
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/filters/AccettazionePickingFiltroOrdineViewModel.java

@@ -0,0 +1,174 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.filters;
+
+import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.Predicate;
+
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+
+public class AccettazionePickingFiltroOrdineViewModel {
+
+    private final ObservableField<Predicate<PickingObjectDTO>> currentCodArtPredicate = new ObservableField<>();
+    private final ObservableField<Predicate<PickingObjectDTO>> currentDescrPredicate = new ObservableField<>();
+    private final ObservableField<Predicate<PickingObjectDTO>> currentPosPredicate = new ObservableField<>();
+
+
+    private List<PickingObjectDTO> initialOrderList;
+    private final MutableLiveData<List<PickingObjectDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<PickingObjectDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<PickingObjectDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+
+    public void setCodArtFilter(List<String> codArts) {
+        if (codArts == null || codArts.isEmpty()) currentCodArtPredicate.set(null);
+        else {
+            currentCodArtPredicate.set(o -> codArts.contains(o.getSitArtOrdDTO().getCodMart()));
+        }
+    }
+
+
+    public void setDescrFilter(List<String> descrs) {
+        if (descrs == null || descrs.isEmpty()) currentDescrPredicate.set(null);
+        else {
+            currentDescrPredicate.set(o -> descrs.contains(o.getSitArtOrdDTO().getDescrizioneEstesaArt()));
+        }
+    }
+
+
+    public void setPosFilter(List<String> pos) {
+        if (pos == null || pos.isEmpty()) currentPosPredicate.set(null);
+        else {
+            currentPosPredicate.set(o -> o.getMtbAart() != null && o.getMtbAart().getPosizione() == null ? pos.contains(null) : pos.contains(o.getMtbAart().getPosizione()));
+        }
+    }
+
+
+    public void applyAllTests() {
+
+        List<PickingObjectDTO> returnList = null;
+
+        if (currentCodArtPredicate.get() == null &&
+                currentDescrPredicate.get() == null &&
+                currentPosPredicate.get() == null) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<PickingObjectDTO> tmpStream = Stream.of(this.initialOrderList)
+                    .filter(x ->
+                            (currentCodArtPredicate.get() == null || (currentCodArtPredicate.get().test(x))) &&
+                                    (currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x))) &&
+                                    (currentPosPredicate.get() == null || (currentPosPredicate.get().test(x)))
+                    );
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentCodArtPredicate() {
+        return currentCodArtPredicate;
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentDescrPredicate() {
+        return currentDescrPredicate;
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentPosPredicate() {
+        return currentPosPredicate;
+    }
+
+    public List<String> getAllCodArts() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getSitArtOrdDTO().getCodMart() != null)
+                .sortBy(x -> x.getSitArtOrdDTO().getCodMart())
+                .map(x -> x.getSitArtOrdDTO().getCodMart() != null ? x.getSitArtOrdDTO().getCodMart() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailableCodArts() {
+
+        if (currentDescrPredicate.get() == null &&
+                currentPosPredicate.get() == null) {
+            return getAllCodArts();
+        } else {
+            return Stream.of(this.initialOrderList)
+                    .filter(x ->
+                            (currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x))) &&
+                                    (currentPosPredicate.get() == null || (currentPosPredicate.get().test(x)))
+                    )
+                    .map(x -> x.getSitArtOrdDTO().getCodMart())
+                    .distinct()
+                    .toList();
+        }
+    }
+
+    public List<String> getAllDescrs() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt() != null)
+                .sortBy(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
+                .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt() != null ? x.getSitArtOrdDTO().getDescrizioneEstesaArt() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailableDescrs() {
+
+        if (currentCodArtPredicate.get() == null &&
+                currentPosPredicate.get() == null) {
+            return getAllDescrs();
+        } else {
+            return Stream.of(this.initialOrderList)
+                    .filter(x ->
+                            (currentCodArtPredicate.get() == null || (currentCodArtPredicate.get().test(x))) &&
+                                    (currentPosPredicate.get() == null || (currentPosPredicate.get().test(x)))
+                    )
+                    .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
+                    .distinct()
+                    .toList();
+        }
+    }
+
+    public List<String> getAllPos() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getMtbAart() != null && x.getMtbAart().getPosizione() != null)
+                .sortBy(x -> UtilityString.isNull(x.getMtbAart().getPosizione(), "000000"))
+                .map(x -> x.getMtbAart().getPosizione() != null ? x.getMtbAart().getPosizione() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailablePos() {
+
+        if (currentCodArtPredicate.get() == null &&
+                currentDescrPredicate.get() == null) {
+            return getAllPos();
+        } else {
+            return Stream.of(this.initialOrderList)
+                    .filter(x ->
+                            (currentCodArtPredicate.get() == null || (currentCodArtPredicate.get().test(x))) &&
+                                    (currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x)))
+                    )
+                    .map(x -> x.getMtbAart().getPosizione())
+                    .distinct()
+                    .toList();
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/filters/FilterCodArtLayoutView.java

@@ -0,0 +1,184 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.filters;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.ComparatorCompat;
+import com.annimon.stream.Stream;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityBoolean;
+import it.integry.integrywmsnative.databinding.LayoutFilterCodArtBinding;
+import it.integry.integrywmsnative.ui.filter_chips.FilterLayoutView;
+
+public class FilterCodArtLayoutView extends FilterLayoutView {
+
+    protected LayoutFilterCodArtBinding mBindings;
+
+    private List<String> all;
+    private List<String> available;
+    private List<String> preselected = new ArrayList<>();
+    private List<String> hidden = new ArrayList<>();
+    private final MutableLiveData<List<ListModel>> listModel = new MutableLiveData<>();
+
+    private RunnableArgs<List<String>> onFilterApplied;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.layout_filter_cod_art, container, false);
+        this.mBindings.setView(this);
+
+        refreshList();
+
+        this.setSearchView(this.mBindings.searchView, newFilter -> {
+            hidden = Stream.of(all)
+                    .filter(x -> !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)) &&
+                            !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)))
+                    .toList();
+
+            refreshList();
+        });
+
+
+        new LiveAdapter(listModel, getViewLifecycleOwner(), BR.item)
+                .map(ListModel.class, R.layout.layout_filter_cod_art__list_item)
+                .into(this.mBindings.recyclerview);
+
+        return mBindings.getRoot();
+    }
+
+
+    public void onConfirm() {
+        if (onFilterApplied == null) return;
+
+        this.onFilterApplied.run(Stream.of(Objects.requireNonNull(listModel.getValue()))
+                .filter(x -> x.selected.get())
+                .map(x -> x.originalModel)
+                .toList());
+
+        dismiss();
+    }
+
+    private void refreshList() {
+        ComparatorCompat<ListModel> c =
+                ComparatorCompat
+                        .chain(new ComparatorCompat<ListModel>((x, y) -> UtilityBoolean.toInt(x.getSelected().get()) - UtilityBoolean.toInt(y.getSelected().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) -> UtilityBoolean.toInt(x.getEnabled().get()) - UtilityBoolean.toInt(y.getEnabled().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) -> y.getOriginalModel().compareToIgnoreCase(x.getOriginalModel())))
+                        .reversed();
+
+
+        listModel.setValue(Stream.of(getAll())
+                .filter(x -> !hidden.contains(x))
+                .map(x -> {
+                    var selectedBoolean = new BindableBoolean(preselected.contains(x));
+                    selectedBoolean.addOnPropertyChangedCallback(() -> {
+                        if (selectedBoolean.get()) preselected.add(x);
+                        else preselected.remove(x);
+                    });
+
+                    return new ListModel()
+                            .setSelected(selectedBoolean)
+                            .setEnabled(new BindableBoolean(available.contains(x)))
+                            .setOriginalModel(x);
+                })
+                .sorted(c)
+                .toList());
+    }
+
+    public List<String> getAll() {
+        return all;
+    }
+
+    public FilterCodArtLayoutView setAll(List<String> all) {
+        this.all = all;
+        return this;
+    }
+
+    public List<String> getAvailable() {
+        return available;
+    }
+
+    public FilterCodArtLayoutView setAvailable(List<String> available) {
+        this.available = available;
+        return this;
+    }
+
+    public List<String> getPreselected() {
+        return preselected;
+    }
+
+    public FilterCodArtLayoutView setPreselected(List<String> preselected) {
+        this.preselected = preselected;
+        return this;
+    }
+
+    public RunnableArgs<List<String>> getOnFilterApplied() {
+        return onFilterApplied;
+    }
+
+    public FilterCodArtLayoutView setOnFilterApplied(RunnableArgs<List<String>> onFilterApplied) {
+        this.onFilterApplied = onFilterApplied;
+        return this;
+    }
+
+    public List<String> getHidden() {
+        return hidden;
+    }
+
+    public FilterCodArtLayoutView setHidden(List<String> hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+
+    public static class ListModel {
+        private BindableBoolean selected = new BindableBoolean();
+        private BindableBoolean enabled = new BindableBoolean();
+        private String originalModel;
+
+        public BindableBoolean getSelected() {
+            return selected;
+        }
+
+        public ListModel setSelected(BindableBoolean selected) {
+            this.selected = selected;
+            return this;
+        }
+
+        public BindableBoolean getEnabled() {
+            return enabled;
+        }
+
+        public ListModel setEnabled(BindableBoolean enabled) {
+            this.enabled = enabled;
+            return this;
+        }
+
+        public String getOriginalModel() {
+            return originalModel;
+        }
+
+        public ListModel setOriginalModel(String originalModel) {
+            this.originalModel = originalModel;
+            return this;
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/filters/FilterDescrLayoutView.java

@@ -0,0 +1,184 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.filters;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.ComparatorCompat;
+import com.annimon.stream.Stream;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityBoolean;
+import it.integry.integrywmsnative.databinding.LayoutFilterDescrBinding;
+import it.integry.integrywmsnative.ui.filter_chips.FilterLayoutView;
+
+public class FilterDescrLayoutView extends FilterLayoutView {
+
+    protected LayoutFilterDescrBinding mBindings;
+
+    private List<String> all;
+    private List<String> available;
+    private List<String> preselected = new ArrayList<>();
+    private List<String> hidden = new ArrayList<>();
+    private final MutableLiveData<List<ListModel>> listModel = new MutableLiveData<>();
+
+    private RunnableArgs<List<String>> onFilterApplied;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.layout_filter_descr, container, false);
+        this.mBindings.setView(this);
+
+        refreshList();
+
+        this.setSearchView(this.mBindings.searchView, newFilter -> {
+            hidden = Stream.of(all)
+                    .filter(x -> !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)) &&
+                            !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)))
+                    .toList();
+
+            refreshList();
+        });
+
+
+        new LiveAdapter(listModel, getViewLifecycleOwner(), BR.item)
+                .map(ListModel.class, R.layout.layout_filter_descr__list_item)
+                .into(this.mBindings.recyclerview);
+
+        return mBindings.getRoot();
+    }
+
+
+    public void onConfirm() {
+        if (onFilterApplied == null) return;
+
+        this.onFilterApplied.run(Stream.of(Objects.requireNonNull(listModel.getValue()))
+                .filter(x -> x.selected.get())
+                .map(x -> x.originalModel)
+                .toList());
+
+        dismiss();
+    }
+
+    private void refreshList() {
+        ComparatorCompat<ListModel> c =
+                ComparatorCompat
+                        .chain(new ComparatorCompat<ListModel>((x, y) -> UtilityBoolean.toInt(x.getSelected().get()) - UtilityBoolean.toInt(y.getSelected().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) -> UtilityBoolean.toInt(x.getEnabled().get()) - UtilityBoolean.toInt(y.getEnabled().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) -> y.getOriginalModel().compareToIgnoreCase(x.getOriginalModel())))
+                        .reversed();
+
+
+        listModel.setValue(Stream.of(getAll())
+                .filter(x -> !hidden.contains(x))
+                .map(x -> {
+                    var selectedBoolean = new BindableBoolean(preselected.contains(x));
+                    selectedBoolean.addOnPropertyChangedCallback(() -> {
+                        if (selectedBoolean.get()) preselected.add(x);
+                        else preselected.remove(x);
+                    });
+
+                    return new ListModel()
+                            .setSelected(selectedBoolean)
+                            .setEnabled(new BindableBoolean(available.contains(x)))
+                            .setOriginalModel(x);
+                })
+                .sorted(c)
+                .toList());
+    }
+
+    public List<String> getAll() {
+        return all;
+    }
+
+    public FilterDescrLayoutView setAll(List<String> all) {
+        this.all = all;
+        return this;
+    }
+
+    public List<String> getAvailable() {
+        return available;
+    }
+
+    public FilterDescrLayoutView setAvailable(List<String> available) {
+        this.available = available;
+        return this;
+    }
+
+    public List<String> getPreselected() {
+        return preselected;
+    }
+
+    public FilterDescrLayoutView setPreselected(List<String> preselected) {
+        this.preselected = preselected;
+        return this;
+    }
+
+    public RunnableArgs<List<String>> getOnFilterApplied() {
+        return onFilterApplied;
+    }
+
+    public FilterDescrLayoutView setOnFilterApplied(RunnableArgs<List<String>> onFilterApplied) {
+        this.onFilterApplied = onFilterApplied;
+        return this;
+    }
+
+    public List<String> getHidden() {
+        return hidden;
+    }
+
+    public FilterDescrLayoutView setHidden(List<String> hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+
+    public static class ListModel {
+        private BindableBoolean selected = new BindableBoolean();
+        private BindableBoolean enabled = new BindableBoolean();
+        private String originalModel;
+
+        public BindableBoolean getSelected() {
+            return selected;
+        }
+
+        public ListModel setSelected(BindableBoolean selected) {
+            this.selected = selected;
+            return this;
+        }
+
+        public BindableBoolean getEnabled() {
+            return enabled;
+        }
+
+        public ListModel setEnabled(BindableBoolean enabled) {
+            this.enabled = enabled;
+            return this;
+        }
+
+        public String getOriginalModel() {
+            return originalModel;
+        }
+
+        public ListModel setOriginalModel(String originalModel) {
+            this.originalModel = originalModel;
+            return this;
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/filters/FilterPosizioneLayoutView.java

@@ -0,0 +1,186 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.filters;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.ComparatorCompat;
+import com.annimon.stream.Stream;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityBoolean;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.LayoutFilterPosizioneBinding;
+import it.integry.integrywmsnative.ui.filter_chips.FilterLayoutView;
+
+public class FilterPosizioneLayoutView extends FilterLayoutView {
+
+    protected LayoutFilterPosizioneBinding mBindings;
+
+    private List<String> all;
+    private List<String> available;
+    private List<String> preselected = new ArrayList<>();
+    private List<String> hidden = new ArrayList<>();
+    private final MutableLiveData<List<ListModel>> listModel = new MutableLiveData<>();
+
+    private RunnableArgs<List<String>> onFilterApplied;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.layout_filter_posizione, container, false);
+        this.mBindings.setView(this);
+
+        refreshList();
+
+        this.setSearchView(this.mBindings.searchView, newFilter -> {
+            hidden = Stream.of(all)
+                    .filter(x -> !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)) &&
+                            !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)))
+                    .toList();
+
+            refreshList();
+        });
+
+
+        new LiveAdapter(listModel, getViewLifecycleOwner(), BR.item)
+                .map(ListModel.class, R.layout.layout_filter_posizione__list_item)
+                .into(this.mBindings.recyclerview);
+
+        return mBindings.getRoot();
+    }
+
+
+    public void onConfirm() {
+        if (onFilterApplied == null) return;
+
+        this.onFilterApplied.run(Stream.of(Objects.requireNonNull(listModel.getValue()))
+                .filter(x -> x.selected.get())
+                .map(x -> x.originalModel)
+                .toList());
+
+        dismiss();
+    }
+
+    private void refreshList() {
+        ComparatorCompat<ListModel> c =
+                ComparatorCompat
+                        .chain(new ComparatorCompat<ListModel>((x, y) -> UtilityBoolean.toInt(x.getSelected().get()) - UtilityBoolean.toInt(y.getSelected().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) -> UtilityBoolean.toInt(x.getEnabled().get()) - UtilityBoolean.toInt(y.getEnabled().get())))
+                        .thenComparing(new ComparatorCompat<>((x, y) ->
+                                UtilityString.isNull(y.getOriginalModel(), "000000").compareToIgnoreCase(UtilityString.isNull(x.getOriginalModel(), "000000"))))
+                        .reversed();
+
+
+        listModel.setValue(Stream.of(getAll())
+                .filter(x -> !hidden.contains(x))
+                .map(x -> {
+                    var selectedBoolean = new BindableBoolean(preselected.contains(x));
+                    selectedBoolean.addOnPropertyChangedCallback(() -> {
+                        if (selectedBoolean.get()) preselected.add(x);
+                        else preselected.remove(x);
+                    });
+
+                    return new ListModel()
+                            .setSelected(selectedBoolean)
+                            .setEnabled(new BindableBoolean(available.contains(x)))
+                            .setOriginalModel(x);
+                })
+                .sorted(c)
+                .toList());
+    }
+
+    public List<String> getAll() {
+        return all;
+    }
+
+    public FilterPosizioneLayoutView setAll(List<String> all) {
+        this.all = all;
+        return this;
+    }
+
+    public List<String> getAvailable() {
+        return available;
+    }
+
+    public FilterPosizioneLayoutView setAvailable(List<String> available) {
+        this.available = available;
+        return this;
+    }
+
+    public List<String> getPreselected() {
+        return preselected;
+    }
+
+    public FilterPosizioneLayoutView setPreselected(List<String> preselected) {
+        this.preselected = preselected;
+        return this;
+    }
+
+    public RunnableArgs<List<String>> getOnFilterApplied() {
+        return onFilterApplied;
+    }
+
+    public FilterPosizioneLayoutView setOnFilterApplied(RunnableArgs<List<String>> onFilterApplied) {
+        this.onFilterApplied = onFilterApplied;
+        return this;
+    }
+
+    public List<String> getHidden() {
+        return hidden;
+    }
+
+    public FilterPosizioneLayoutView setHidden(List<String> hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+
+    public static class ListModel {
+        private BindableBoolean selected = new BindableBoolean();
+        private BindableBoolean enabled = new BindableBoolean();
+        private String originalModel;
+
+        public BindableBoolean getSelected() {
+            return selected;
+        }
+
+        public ListModel setSelected(BindableBoolean selected) {
+            this.selected = selected;
+            return this;
+        }
+
+        public BindableBoolean getEnabled() {
+            return enabled;
+        }
+
+        public ListModel setEnabled(BindableBoolean enabled) {
+            this.enabled = enabled;
+            return this;
+        }
+
+        public String getOriginalModel() {
+            return originalModel;
+        }
+
+        public ListModel setOriginalModel(String originalModel) {
+            this.originalModel = originalModel;
+            return this;
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListAdapter.java

@@ -114,7 +114,7 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
@@ -125,6 +125,9 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
         holder.mBinding.badge2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getBadge2()) ? View.GONE : View.VISIBLE);
 
+        holder.mBinding.badge3.setText(pickingObjectDTO.getPosizione());
+        holder.mBinding.badge3Layout.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getPosizione()) ? View.GONE : View.VISIBLE);
+
 
         holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
         holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListModel.java

@@ -23,6 +23,8 @@ public class AccettazioneListModel implements Cloneable {
     private BigDecimal secQtaTot;
     private String secUntMis;
 
+    private String posizione;
+
     private boolean active;
 
     private PickingObjectDTO mOriginalModel;
@@ -154,6 +156,15 @@ public class AccettazioneListModel implements Cloneable {
         return this;
     }
 
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public AccettazioneListModel setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
     public boolean isActive() {
         return active;
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,17 +27,15 @@ import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentDocInterniBinding;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairView;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairViewModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormActivity;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity;
-import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListAdapter;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
 public class DocInterniFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, DocInterniViewModel.Listener {
@@ -47,7 +46,7 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
     private final ObservableArrayList<DocInterniListModel> mDocInterniMutableData = new ObservableArrayList<>();
     private ElevatedToolbar mToolbar;
     private FragmentDocInterniBinding mBinding;
-    private TipiDocAndGruppiArtDTO mTipiDocAndGruppiArtDTO;
+    private DocInterniSetupDTO mDocInterniSetupDTO;
     private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private boolean dialogInitialized = false;
 
@@ -82,6 +81,8 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
         mBinding.setLifecycleOwner(this);
         mBinding.setView(this);
         mBinding.setViewModel(mViewModel);
+        mViewModel.mtbGrup.observe(getViewLifecycleOwner(),mtbGrup-> mViewModel.fetchProducts());
+        mViewModel.dtbTipi.observe(getViewLifecycleOwner(),dtbTipi-> mViewModel.fetchDocuments());
         this.initRecyclerView();
 
         return mBinding.getRoot();
@@ -106,17 +107,41 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
     }
 
     @Override
-    public void onGruppiArtAndTipiDocFetch(TipiDocAndGruppiArtDTO tipiDocAndGruppiArtDTO) {
-        this.mTipiDocAndGruppiArtDTO = tipiDocAndGruppiArtDTO;
+    public void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO) {
+        this.mDocInterniSetupDTO = docInterniSetupDTO;
         this.dialogInitialized = true;
-        this.selectCodMgrpAndCodDtip();
+        this.selectDocInfo();
     }
 
     @Override
-    public void onDocDetailsChanged(DialogSelectMgrpDtipPairViewModel selection) {
+    public void onDocDetailsChanged(DialogSelectDocInfoViewModel selection) {
+        if(selection.isInputValid()){
+            mViewModel.setSelectedDocDetails(selection);
+            mBinding.mainFab.setVisibility(View.VISIBLE);
+        }else{
+            mBinding.mainFab.setVisibility(View.GONE);
+        }
+
+        if (selection.requiresFornitore()){
+            mBinding.codAnagContainer.setVisibility(View.VISIBLE);
+        }else{
+            mBinding.codAnagContainer.setVisibility(View.GONE);
+        }
+
+
+        if (selection.getSelectedGruppoArt() != null){
+            mBinding.mtbGrpContainer.setVisibility(View.VISIBLE);
+        }else{
+            mBinding.mtbGrpContainer.setVisibility(View.GONE);
+        }
+
+        if (selection.requiresDocData()){
+            mBinding.docContainer.setVisibility(View.VISIBLE);
+            mBinding.document.setText(Html.fromHtml(getString(R.string.doc_testata, String.valueOf(selection.getNumDoc()), UtilityDate.formatDate(selection.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))));
+        }else{
+            mBinding.docContainer.setVisibility(View.GONE);
+        }
 
-        this.mViewModel.setSelectedDocDetails(selection);
-        this.mBinding.mainFab.setVisibility(View.VISIBLE);
     }
 
     @Override
@@ -129,12 +154,16 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
-    public void selectCodMgrpAndCodDtip() {
+    public void selectDocInfo() {
         if (this.dialogInitialized){
-            DialogSelectMgrpDtipPairView.newInstance(
-                    mTipiDocAndGruppiArtDTO,
+            DialogSelectDocInfoView.newInstance(
+                    mDocInterniSetupDTO,
                     this.mViewModel.dtbTipi.getValue(),
                     this.mViewModel.mtbGrup.getValue(),
+                    this.mViewModel.fornitore.getValue(),
+                    this.mViewModel.dataDoc.getValue(),
+                    this.mViewModel.numDoc.getValue(),
+                    this.mViewModel.note.getValue(),
                     this::onDocDetailsChanged
             ).show(requireActivity().getSupportFragmentManager(), "tag");
         }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import androidx.lifecycle.MutableLiveData;
 
+import com.annimon.stream.Stream;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -14,29 +16,33 @@ import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper
 import it.integry.integrywmsnative.core.di.BindableInteger;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairViewModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 
 public class DocInterniViewModel {
 
+    @Inject
+    MtbColtRepository documentRepository;
     private Listener mListener;
     private final DocInterniRESTConsumer mDocInterniRESTConsumer;
     private boolean productsFetched = true;
     private boolean docsFetched = true;
     private int nextNumCollo = 0;
     private GrigliaAcquistiDTO productsList;
-
+    private final MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
 
     public final MutableLiveData<TipiDocDTO> dtbTipi = new MutableLiveData<>();
     public final MutableLiveData<GruppiArticoloDTO> mtbGrup = new MutableLiveData<>();
-    private final MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
+    public final MutableLiveData<FornitoreDTO> fornitore = new MutableLiveData<>();
+    public final MutableLiveData<Date> dataDoc = new MutableLiveData<>();
+    public final MutableLiveData<String> numDoc = new MutableLiveData<>();
+    public final MutableLiveData<String> note = new MutableLiveData<>();
     public final BindableInteger artsSize = new BindableInteger(0);
-    @Inject
-    MtbColtRepository documentRepository;
 
     @Inject
     public DocInterniViewModel(DocInterniRESTConsumer docInterniRESTConsumer, MtbColtRepository documentRepository) {
@@ -49,9 +55,9 @@ public class DocInterniViewModel {
     public void init() {
         this.sendOnLoadingStarted();
 //        new Thread(() -> {
-        mDocInterniRESTConsumer.getDocTypesAndGroupArts(returnDto -> {
+        mDocInterniRESTConsumer.getDocInterniSetup(returnDto -> {
             this.sendOnLoadingEnded();
-            this.mListener.onGruppiArtAndTipiDocFetch(returnDto);
+            this.mListener.onDocInterniSetupFetched(returnDto);
         }, this::sendError);
 //        }).start();
     }
@@ -77,20 +83,23 @@ public class DocInterniViewModel {
         return mDocsList;
     }
 
-    public void setSelectedDocDetails(DialogSelectMgrpDtipPairViewModel selection) {
-        if (selection.getSelectedGruppoArt() != null && selection.getSelectedTipoDoc() != null) {
-            if (this.dtbTipi.getValue() == null || this.mtbGrup.getValue() == null || !this.dtbTipi.getValue().equals(selection.getSelectedTipoDoc()) || !this.mtbGrup.getValue().equals(selection.getSelectedGruppoArt())) {
-                this.dtbTipi.setValue(selection.getSelectedTipoDoc());
-                this.mtbGrup.setValue(selection.getSelectedGruppoArt());
-                this.fetchProducts();
-                this.fetchDocuments();
-            }
+    public void setSelectedDocDetails(DialogSelectDocInfoViewModel selection) {
+
+        this.fornitore.postValue(selection.getSelectedFornitore());
+        this.mtbGrup.postValue(selection.getSelectedGruppoArt());
+        this.dataDoc.postValue(selection.getDataDoc());
+        this.numDoc.postValue(selection.getNumDoc());
+        this.note.postValue(selection.getNote());
+
+        if (selection.getSelectedTipoDoc() != null ) {
+            this.dtbTipi.postValue(selection.getSelectedTipoDoc());
         }
     }
 
     public void fetchProducts() {
         this.productsFetched = false;
-        mDocInterniRESTConsumer.fetchProducts(this.dtbTipi.getValue().getCodDtip(), this.mtbGrup.getValue().getCodMgrp(), returnDto -> {
+        this.sendOnLoadingStarted();
+        mDocInterniRESTConsumer.fetchProducts(this.getCodDtip(), this.getCodMgrp(), returnDto -> {
             this.productsFetched = true;
             this.productsList = returnDto;
             this.artsSize.set(returnDto.getGrigliaAcquistiChild().size());
@@ -103,16 +112,22 @@ public class DocInterniViewModel {
     public void fetchDocuments() {
         this.docsFetched = false;
         this.sendOnLoadingStarted();
-        documentRepository.getLocalDocumentsByCodDtipAndCodMgrp(this.getCodDtip(), this.getCodMgrp(), list -> {
-            documentRepository.getNextNumCollo(nextNumCollo->{
+        String codAnag = null, codVdes = null;
+        FornitoreDTO fornitore = this.fornitore.getValue();
+        if (fornitore != null){
+            codAnag = fornitore.getCodAnag();
+            codVdes = fornitore.getCodVdes();
+        }
+        documentRepository.getLocalDocumentsByCodDtip(this.getCodDtip(), codAnag, codVdes, dataDoc.getValue(),numDoc.getValue(), list -> {
+            documentRepository.getNextNumCollo(nextNumCollo -> {
                 this.mDocsList.postValue(list);
                 this.setNextNumCollo(nextNumCollo);
                 this.docsFetched = true;
                 if (this.productsFetched) {
                     this.sendOnLoadingEnded();
                 }
-            },this::sendError);
-        },this::sendError);
+            }, this::sendError);
+        }, this::sendError);
     }
 
     private void setNextNumCollo(Integer nextNumCollo) {
@@ -147,28 +162,36 @@ public class DocInterniViewModel {
         document.setCodMgrp(this.getCodMgrp());
         document.setDataCollo(new Date());
         document.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
-        document.setAnnotazioni("");
+        document.setAnnotazioni(this.note.getValue());
         document.setSegno(-1);
         document.setSerCollo("/");
         document.setNumCollo(this.nextNumCollo);
         document.setGestione("L");
-        documentRepository.insert(document,id->{
+        document.setDataDoc(this.dataDoc.getValue());
+        if (this.numDoc.getValue() != null){
+            document.setNumDoc(Integer.parseInt(this.numDoc.getValue()));
+        }
+        if (this.fornitore.getValue() != null){
+            document.setCodAnag(this.fornitore.getValue().getCodAnag());
+            document.setCodVdes(this.fornitore.getValue().getCodVdes());
+        }
+        documentRepository.insert(document, id -> {
             document.setId(id);
             this.editDocument(document);
         }, this::sendError);
     }
 
     public boolean hasDocDetails() {
-        return this.dtbTipi.getValue() != null && this.mtbGrup.getValue() != null;
+        return this.dtbTipi.getValue() != null;
     }
 
     public interface Listener extends ILoadingListener {
 
         void onError(Exception ex);
 
-        void onGruppiArtAndTipiDocFetch(TipiDocAndGruppiArtDTO tipiDocAndGruppiArtDTO);
+        void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO);
 
-        void onDocDetailsChanged(DialogSelectMgrpDtipPairViewModel selection);
+        void onDocDetailsChanged(DialogSelectDocInfoViewModel selection);
 
         void onDocumentEditRequest(SqlMtbColt document, GrigliaAcquistiDTO arts);