Finish v1.16.13(195)

Rivista implementazione di destroy fragment.

app/build.gradle

@@ -2,13 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 174
-    def appVersionName = '1.13.28'
+    def appVersionCode = 195
+    def appVersionName = '1.16.13'
 
     signingConfigs {
         release {
@@ -21,7 +20,7 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            output.outputFileName = "android-release_v2.apk"
+            output.outputFileName = "android-release.apk"
         }
     }
 
@@ -60,8 +59,8 @@ android {
 
     build {
         doLast {
-            delete "$projectDir/build/outputs/apk/release/version_v2.txt"
-            file("$projectDir/build/outputs/apk/release/version_v2.txt").text = appVersionCode + '\n' + appVersionName
+            delete "$projectDir/build/outputs/apk/release/version.txt"
+            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName
         }
     }
 
@@ -91,18 +90,18 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.0.0')
+    implementation platform('com.google.firebase:firebase-bom:26.3.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.5.0'
+    implementation 'com.google.android.gms:play-services-basement:17.6.0'
 
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha04'
+    implementation 'com.google.android.material:material:1.3.0-rc01'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
@@ -111,15 +110,13 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
     def dagger2_version = '2.29.1'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -139,7 +136,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.2.5"
+    def room_version = "2.2.6"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"

app/src/main/AndroidManifest.xml

@@ -17,18 +17,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
         <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
-        <activity
-            android:name=".gest.picking_resi_OLD.PickingResiActivity"
-            android:label="@string/activity_ultime_consegne_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
             android:screenOrientation="portrait"

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

@@ -277,6 +277,11 @@ public class MainActivity extends BaseActivity
                 mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
                 return false;
             });
+
+            ((ISearcableFragment) fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainSearch.setIconified(true);
+                mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
+            });
         } else {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener(null);
             mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
@@ -289,6 +294,10 @@ public class MainActivity extends BaseActivity
             mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE);
             mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
             ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this);
+            ((ITitledFragment) fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
+                mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
+            });
         } else {
             mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
             mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
@@ -296,12 +305,12 @@ public class MainActivity extends BaseActivity
 
         if(fragment instanceof IScrollableFragment) {
             ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar);
-            ((IScrollableFragment) fragment).setOnPreDestroy(() -> {
+            ((IScrollableFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.elevatedToolbar.resetAll();
             });
         }
 
-        if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) {
+        if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isSelectAllButtonEnabled()) {
             mBinding.appBarMain.mainSelectAll.setVisibility(View.VISIBLE);
             mBinding.appBarMain.mainSelectAll.setOnClickListener(new OnSingleClickListener() {
                 @Override
@@ -309,9 +318,10 @@ public class MainActivity extends BaseActivity
                     ((ISelectAllFragment)fragment).onSelectAll();
                 }
             });
-        } else {
+            ((ISelectAllFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
                 mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
+            });
         }
 
         if(fragment instanceof IFilterableFragment) {
@@ -322,6 +332,11 @@ public class MainActivity extends BaseActivity
                     ((IFilterableFragment)fragment).onFilterClick();
                 }
             });
+
+            ((IFilterableFragment)fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
+                mBinding.appBarMain.mainFilter.setOnClickListener(null);
+            });
         } else {
             mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
             mBinding.appBarMain.mainFilter.setOnClickListener(null);

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

@@ -7,10 +7,16 @@ import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoComponent;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoModule;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoComponent;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoModule;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiComponent;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiModule;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdComponent;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule;
 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_ordini_acquisto.PVOrdineAcquistoGrigliaComponent;
@@ -19,8 +25,12 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComp
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
+import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
+import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 
 // Definition of the Application graph
 @Singleton
@@ -35,7 +45,12 @@ import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQua
         SpedizioneModule.class,
         AccettazionePickingModule.class,
         PickingResiModule.class,
-        DialogInputQuantityV2Module.class})
+        OrdiniUscitaElencoModule.class,
+        DialogInputQuantityV2Module.class,
+        DialogScanArtModule.class,
+        ProdFabbisognoLineeProdModule.class,
+        DialogAskMagazzinoProssimitaModule.class,
+        DialogRowInfoProdFabbisognoLineeProdModule.class})
 public interface MainApplicationComponent {
 
     MainActivityComponent.Factory mainActivityComponent();
@@ -46,8 +61,12 @@ public interface MainApplicationComponent {
     SpedizioneComponent.Factory spedizioneComponent();
     AccettazionePickingComponent.Factory accettazionePickingComponent();
     PickingResiComponent.Factory pickingResiComponent();
+    OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
-
+    DialogScanArtComponent.Factory dialogScanArtComponent();
+    ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+    DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+    DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
 
 
     void inject(AppContext appContext);

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

@@ -13,8 +13,10 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 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.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 @Module
 public class MainApplicationModule {
@@ -41,8 +43,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer() {
-        return new OrdiniRESTConsumer();
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new OrdiniRESTConsumer(systemRESTConsumer);
     }
 
     @Provides
@@ -59,8 +61,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer() {
-        return new ColliMagazzinoRESTConsumer();
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+        return new ColliMagazzinoRESTConsumer(articoloRESTConsumer);
     }
 
     @Provides
@@ -81,5 +83,18 @@ public class MainApplicationModule {
         return new SystemRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    PosizioniRESTConsumer providesPosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new PosizioniRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
+    }
+
+
 
 }

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

@@ -3,15 +3,15 @@ package it.integry.integrywmsnative.core.class_router.configs;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
-import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
+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_versamento_materiale.ProdVersamentoMaterialeFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
-import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
-import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfiguration extends BaseMenuConfiguration {
@@ -48,7 +48,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.vendita_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_spedizione)
                                 .setDrawerIcon(R.drawable.ic_black_upload)
-                                .setFragmentFactory(MainVenditaFragment::newInstance))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_picking)
@@ -79,7 +79,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                         .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                         .setDrawerIcon(R.drawable.ic_black_external)
-                        .setFragmentFactory(ProdOrdineLavorazioneElencoFragment::newInstance))
+                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
 
                 .addItem(new MenuItem()
                         .setID(R.id.nav_free_lav_picking)
@@ -88,6 +88,13 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
                         .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
 
+                .addItem(new MenuItem()
+                        .setID(R.id.nav_prod_posizionamento_da_ord)
+                        .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
+                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
+                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                        .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))
+
                 .addItem(new MenuItem()
                         .setID(R.id.nav_prod_versamento_materiale)
                         .setTitleText(R.string.prod_versamento_materiale_title_fragment)

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java

@@ -1,16 +1,13 @@
 package it.integry.integrywmsnative.core.class_router.interfaces;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
-
 import java.util.List;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 
 public interface IOrdiniVendita {
 
-    void distribuisciCollo(MtbColt mtbColt, List<OrdineVenditaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed);
+    void distribuisciCollo(MtbColt mtbColt, List<OrdineUscitaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed);
 
 }

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

@@ -8,12 +8,8 @@ import com.google.android.gms.common.util.IOUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -22,8 +18,8 @@ import java.util.Random;
 
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 
 public class ColliDataRecover {
 
@@ -35,7 +31,7 @@ public class ColliDataRecover {
         private String gestioneCollo;
         private String filtro;
 
-        private List<OrdineVenditaInevasoDTO> testateOrdini;
+        private List<OrdineUscitaInevasoDTO> testateOrdini;
 
         public int getId() {
             return id;
@@ -91,11 +87,11 @@ public class ColliDataRecover {
             return this;
         }
 
-        public List<OrdineVenditaInevasoDTO> getTestateOrdini() {
+        public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
             return testateOrdini;
         }
 
-        public RecoverDTO setTestateOrdini(List<OrdineVenditaInevasoDTO> testateOrdini) {
+        public RecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
             this.testateOrdini = testateOrdini;
             return this;
         }
@@ -153,7 +149,7 @@ public class ColliDataRecover {
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
     }
 
-    public static int startNewSession(MtbColt mtbColtSession, List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public static int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
         Integer newId = null;
 
         while(newId == null) {

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

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.data_recover;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 
 public class ColliDataRecoverDTO {
 
@@ -14,7 +14,7 @@ public class ColliDataRecoverDTO {
     private String gestioneCollo;
     private String filtro;
 
-    private List<OrdineVenditaInevasoDTO> testateOrdini;
+    private List<OrdineUscitaInevasoDTO> testateOrdini;
 
     public int getId() {
         return id;
@@ -70,11 +70,11 @@ public class ColliDataRecoverDTO {
         return this;
     }
 
-    public List<OrdineVenditaInevasoDTO> getTestateOrdini() {
+    public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
         return testateOrdini;
     }
 
-    public ColliDataRecoverDTO setTestateOrdini(List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public ColliDataRecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
         this.testateOrdini = testateOrdini;
         return this;
     }

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

@@ -21,8 +21,8 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 
 @Singleton
 public class ColliDataRecoverService {
@@ -72,7 +72,7 @@ public class ColliDataRecoverService {
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
     }
 
-    public int startNewSession(MtbColt mtbColtSession, List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
         Integer newId = null;
 
         while(newId == null) {

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

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

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

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

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

@@ -5,6 +5,6 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 
 public class NoPrintersFoundException extends Exception {
     public NoPrintersFoundException() {
-        super(UtilityResources.getString(R.string.exception_printer_not_found));
+        super(UtilityResources.getString(R.string.exception_no_printer_found));
     }
 }

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

@@ -6,7 +6,6 @@ import android.view.KeyEvent;
 import androidx.appcompat.app.AppCompatActivity;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.integrywmsnative.core.exception.MyExceptionHandler;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 
 public class BaseActivity extends AppCompatActivity {
@@ -15,7 +14,7 @@ public class BaseActivity extends AppCompatActivity {
     protected Dialog mCurrentProgress;
 
     public BaseActivity() {
-        Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
+        //Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
     }
 
     @Override

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

@@ -0,0 +1,64 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
+
+public class BaseDialogFragment extends DialogFragment {
+
+    private boolean mBarcodeListener = false;
+    private Dialog mCurrentProgress;
+
+    public BaseDialogFragment() {
+        super();
+    }
+
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) {
+            getDialog().setOnKeyListener((dialog, keyCode, event) -> {
+                if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) {
+                    return BarcodeManager.onKeyDown(event.getKeyCode(), event);
+                }
+                return false;
+            });
+        }
+    }
+
+    private boolean isControlKey(KeyEvent keyEvent) {
+        int keyCode = keyEvent.getKeyCode();
+        return (
+                keyCode == KeyEvent.KEYCODE_BACK ||
+                        keyCode == KeyEvent.KEYCODE_SHIFT_LEFT ||
+                        keyCode == KeyEvent.KEYCODE_DEL
+        );
+    }
+
+    public void setBarcodeListener(boolean listen) {
+        this.mBarcodeListener = listen;
+    }
+
+    protected void openProgress() {
+        if (this.mCurrentProgress == null) {
+            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+        }
+    }
+
+    protected void closeProgress() {
+        if (mCurrentProgress != null) {
+            mCurrentProgress.dismiss();
+            mCurrentProgress = null;
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.app.Dialog;
+
+import androidx.fragment.app.Fragment;
+
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
+
+public class BaseFragment extends Fragment {
+
+    protected Dialog mCurrentProgress;
+
+
+    protected void openProgress() {
+        if (this.mCurrentProgress == null) {
+            getActivity().runOnUiThread(() -> {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            });
+        }
+    }
+
+    protected void closeProgress() {
+        if (mCurrentProgress != null) {
+            getActivity().runOnUiThread(() -> {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            });
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+public interface RunnableArgsWithReturn<T, R> {
+
+    R run(T data);
+
+}

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

@@ -0,0 +1,6 @@
+package it.integry.integrywmsnative.core.expansion;
+
+public interface RunnableArgssss<S, T, U, V> {
+
+    void run(S data1, T data2, U data3, V data4);
+}

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.interfaces;
+
+public interface IDestroyableFragment {
+
+    void addOnPreDestroy(Runnable onPreDestroy);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java

@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface IFilterableFragment {
+public interface IFilterableFragment extends IDestroyableFragment {
 
     void onFilterClick();
 

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java

@@ -2,10 +2,8 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
-public interface IScrollableFragment {
+public interface IScrollableFragment extends IDestroyableFragment {
 
     void setScrollToolbar(ElevatedToolbar toolbar);
 
-    void setOnPreDestroy(Runnable onPreDestroy);
-
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java

@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import androidx.appcompat.widget.SearchView;
 
-public interface ISearcableFragment extends SearchView.OnQueryTextListener {
+public interface ISearcableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {
 
     void onSearchEnabled();
 

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java

@@ -1,8 +1,8 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface ISelectAllFragment {
+public interface ISelectAllFragment extends IDestroyableFragment {
 
-    boolean isEnabled();
+    boolean isSelectAllButtonEnabled();
 
     void onSelectAll();
 

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java

@@ -2,14 +2,13 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import android.content.Context;
 
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.AppCompatTextView;
 
 /**
  * Created by GiuseppeS on 07/03/2018.
  */
 
-public interface ITitledFragment {
+public interface ITitledFragment extends IDestroyableFragment {
 
     void onCreateActionBar(AppCompatTextView titleText, Context context);
 

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

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class GtbAnag {
+public class GtbAnag extends EntityBase {
 
     private String codAnag;
     private String ragSoc;
@@ -45,6 +45,10 @@ public class GtbAnag {
     private String precode;
     private Boolean insDestinatario;
 
+    public GtbAnag() {
+        this.type = "gtb_anag";
+    }
+
     public String getCodAnag() {
         return codAnag;
     }

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

@@ -0,0 +1,180 @@
+package it.integry.integrywmsnative.core.model;
+
+import androidx.annotation.NonNull;
+
+import java.math.BigDecimal;
+
+public class JtbFasi extends EntityBase {
+
+    private String codJfas;
+    private String codJfasParent;
+    private String descrizione;
+    private String descrizEstesa;
+    private String codMfas;
+    private String pathIcona;
+    private String umAllocazione;
+    private BigDecimal maxAllocazione;
+    private String codJCal;
+    private String idJfas;
+    private String flagAttivo;
+    private String flagCheck;
+    private String umProd;
+    private BigDecimal prodStd;
+    private String codMdepLav;
+    private String tipoProd;
+
+    public JtbFasi() {
+        this.type = "jtb_fasi";
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public JtbFasi setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getCodJfasParent() {
+        return codJfasParent;
+    }
+
+    public JtbFasi setCodJfasParent(String codJfasParent) {
+        this.codJfasParent = codJfasParent;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public JtbFasi setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getDescrizEstesa() {
+        return descrizEstesa;
+    }
+
+    public JtbFasi setDescrizEstesa(String descrizEstesa) {
+        this.descrizEstesa = descrizEstesa;
+        return this;
+    }
+
+    public String getCodMfas() {
+        return codMfas;
+    }
+
+    public JtbFasi setCodMfas(String codMfas) {
+        this.codMfas = codMfas;
+        return this;
+    }
+
+    public String getPathIcona() {
+        return pathIcona;
+    }
+
+    public JtbFasi setPathIcona(String pathIcona) {
+        this.pathIcona = pathIcona;
+        return this;
+    }
+
+    public String getUmAllocazione() {
+        return umAllocazione;
+    }
+
+    public JtbFasi setUmAllocazione(String umAllocazione) {
+        this.umAllocazione = umAllocazione;
+        return this;
+    }
+
+    public BigDecimal getMaxAllocazione() {
+        return maxAllocazione;
+    }
+
+    public JtbFasi setMaxAllocazione(BigDecimal maxAllocazione) {
+        this.maxAllocazione = maxAllocazione;
+        return this;
+    }
+
+    public String getCodJCal() {
+        return codJCal;
+    }
+
+    public JtbFasi setCodJCal(String codJCal) {
+        this.codJCal = codJCal;
+        return this;
+    }
+
+    public String getIdJfas() {
+        return idJfas;
+    }
+
+    public JtbFasi setIdJfas(String idJfas) {
+        this.idJfas = idJfas;
+        return this;
+    }
+
+    public String getFlagAttivo() {
+        return flagAttivo;
+    }
+
+    public JtbFasi setFlagAttivo(String flagAttivo) {
+        this.flagAttivo = flagAttivo;
+        return this;
+    }
+
+    public String getFlagCheck() {
+        return flagCheck;
+    }
+
+    public JtbFasi setFlagCheck(String flagCheck) {
+        this.flagCheck = flagCheck;
+        return this;
+    }
+
+    public String getUmProd() {
+        return umProd;
+    }
+
+    public JtbFasi setUmProd(String umProd) {
+        this.umProd = umProd;
+        return this;
+    }
+
+    public BigDecimal getProdStd() {
+        return prodStd;
+    }
+
+    public JtbFasi setProdStd(BigDecimal prodStd) {
+        this.prodStd = prodStd;
+        return this;
+    }
+
+    public String getCodMdepLav() {
+        return codMdepLav;
+    }
+
+    public JtbFasi setCodMdepLav(String codMdepLav) {
+        this.codMdepLav = codMdepLav;
+        return this;
+    }
+
+    public String getTipoProd() {
+        return tipoProd;
+    }
+
+    public JtbFasi setTipoProd(String tipoProd) {
+        this.tipoProd = tipoProd;
+        return this;
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return String.format("%s - %s", getCodJfas(), getDescrizione());
+    }
+}

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

@@ -9,7 +9,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
  * Created by GiuseppeS on 06/03/2018.
  */
 
-public class MtbAart extends EntityBase{
+public class MtbAart extends EntityBase {
 
     private String codMart;
     private String descrizione;

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

@@ -54,6 +54,7 @@ public class MtbColt extends EntityBase {
     private BigDecimal lunghezzaCm;
     private BigDecimal larghezzaCm;
     private BigDecimal altezzaCm;
+    private String codJcom;
 
     private List<MtbCols> mtbCols;
 
@@ -500,6 +501,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public MtbColt setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";

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

@@ -0,0 +1,60 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.util.Date;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class OrdineInevasoDTO {
+
+    private String data;
+    private Integer numero;
+    private String gestione;
+    private String codMdep;
+
+    public String getDataOrdS() {
+        return data;
+    }
+
+    public Date getDataOrdD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
+    }
+
+    public OrdineInevasoDTO setData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numero;
+    }
+
+    public OrdineInevasoDTO setNumero(Integer numero) {
+        this.numero = numero;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public GestioneEnum getGestioneEnum() {
+        return GestioneEnum.fromString(getGestione());
+    }
+
+
+    public OrdineInevasoDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public OrdineInevasoDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+}

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

@@ -40,7 +40,11 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void getByCodMart(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getByCodMart(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+        getByCodMartStatic(codMartToFind, onComplete, onFailed);
+    }
+
+    public static void getByCodMartStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String joinedCods = Stream.of(codMartToFind)
                 .collect(Collectors.joining(","));

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

@@ -45,6 +45,13 @@ import retrofit2.Response;
 @Singleton
 public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private ArticoloRESTConsumer mArticoloRESTConsumer;
+
+    public ColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
+    }
+
+
     public static void saveColloStatic(MtbColt mtbColtToSave, final ISimpleOperationCallback<MtbColt> callback) {
 
         for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) {
@@ -88,8 +95,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+    public void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        saveColliStatic(mtbColtsToSave, onComplete, onFailed);
+    }
 
-    public static void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void saveColliStatic(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
 
         for (MtbColt mtbColt : mtbColtsToSave) {
             mtbColt.setMtbCols(null);
@@ -375,7 +385,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                                 }
                             }
 
-
                             onComplete.run(newList);
                         }, onFailed);
                     }
@@ -430,7 +439,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
 
-        ArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+        ArticoloRESTConsumer.getByCodMartStatic(codMarts, arts -> {
 
             if (arts != null && arts.size() > 0) {
                 for (MtbColt mtbColt : mtbColts) {

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

@@ -1,18 +1,28 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
 import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+import com.orhanobut.logger.Logger;
 
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -21,31 +31,10 @@ import retrofit2.Response;
 @Singleton
 public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
-    public static void retrieveListaArticoliFromOrdiniUscita(List<OrdineVenditaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    private final SystemRESTConsumer mSystemRESTConsumer;
 
-        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
-                .map(x -> new GetPickingListDTO()
-                        .setData(x.getDataOrdS())
-                        .setGestione(x.getGestione())
-                        .setNumero(x.getNumOrd())
-                        .setDataConsegna(x.getDataConsS())
-                        .setIdViaggio(x.getIdViaggio()))
-                .toList();
-
-        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
-
-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
-                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniVendita", onComplete, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
-                onFailed.run(new Exception(t));
-            }
-        });
+    public OrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
     }
 
     public void getSuggestedPickingList(String codMdep, List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -69,4 +58,96 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+    public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs<List<OrdineUscitaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
+
+        service.getOrdiniInevasi(codMdep, gestione.getText())
+                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
+                        analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
+                            if(responseDtoList == null) responseDtoList = new ArrayList<>();
+                            onComplete.run(responseDtoList);
+                        }, ex -> {
+                            Logger.e(ex, "Errore durante il caricamento degli ordini di lavorazione");
+                            if(onFailed != null) onFailed.run(ex);
+                        });
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Throwable t) {
+                        Logger.e(t, "Errore durante il caricamento degli ordini di lavorazione");
+                        if(onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
+                .map(x -> new GetPickingListDTO()
+                        .setData(x.getDataOrdS())
+                        .setGestione(x.getGestione())
+                        .setNumero(x.getNumOrd())
+                        .setDataConsegna(x.getDataConsS())
+                        .setIdViaggio(x.getIdViaggio()))
+                .toList();
+
+        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
+
+        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
+                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
+                UtilityLogger.errorMe(new Exception(t));
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        String whereCondGestione = "";
+
+        if(gestione != null) {
+            whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " ";
+        } else {
+            whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') ";
+        }
+
+        String baseSql = "SELECT DISTINCT mtb_colt.* " +
+                "FROM mtb_colt, " +
+                "     mtb_colr " +
+                "WHERE mtb_colt.gestione = mtb_colr.gestione " +
+                "  AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
+                "  AND mtb_colt.data_collo = mtb_colr.data_collo " +
+                "  AND mtb_colt.num_collo = mtb_colr.num_collo " +
+                "  AND " + whereCondGestione +
+                "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
+                "  AND mtb_colt.data_doc IS NULL AND ";
+
+        List<HashMap<String, Object>> whereCondMapList = new ArrayList<>();
+        for (OrdineInevasoDTO ordineInevaso : orders) {
+            HashMap<String, Object> whereCondMap = new HashMap<>();
+            whereCondMap.put("mtb_colr.data_ord", ordineInevaso.getDataOrdD());
+            whereCondMap.put("mtb_colr.num_ord", ordineInevaso.getNumOrd());
+            whereCondMap.put("mtb_colr.gestione", ordineInevaso.getGestione());
+
+            whereCondMapList.add(whereCondMap);
+        }
+
+        baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")";
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
+        this.mSystemRESTConsumer.<List<MtbColt>>processSql(baseSql, typeOfObjectsList, value -> {
+                if(onComplete != null) onComplete.run(value);
+            }, ex -> {
+                if(onFailed != null) onFailed.run(ex);
+            });
+    }
+
 }

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

@@ -4,10 +4,12 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
 
@@ -18,4 +20,7 @@ public interface OrdiniRESTConsumerService {
 
     @POST("wms/getSuggestedPickingList")
     Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);
+
+    @GET("SM2GetOrdiniVenditaInevasi")
+    Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> getOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
 }

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

@@ -6,6 +6,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -17,8 +19,14 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class PosizioniRESTConsumer extends _BaseRESTConsumer{
 
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public PosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
 
     public static void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
@@ -39,12 +47,12 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         });
     }
 
+    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        getBancaliInPosizioneStatic(mtbDepoPosizione, onComplete, onFailed);
+    }
 
-
-    public static void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-
-
-        String sql = "SELECT * FROM mtb_colt WHERE cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
+    public static void getBancaliInPosizioneStatic(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "SELECT * FROM mtb_colt WHERE segno > 0 AND cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
 
 
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();

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

@@ -4,6 +4,7 @@ import android.util.Log;
 
 import com.annimon.stream.Stream;
 
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -11,6 +12,8 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.JasperDTO;
+import it.integry.integrywmsnative.core.rest.model.JasperPairDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -89,7 +92,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
-                analyzeAnswer(response, "GetAvailablePrinters", onComplete, onFailed);
+                analyzeAnswer(response, "GetAvailablePrinters", printerList -> {
+                    printerList = Stream.of(printerList).filter(x -> !UtilityString.isNullOrEmpty(x)).toList();
+                    onComplete.run(printerList);
+                }, onFailed);
             }
 
             @Override
@@ -130,7 +136,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new Callback<ServiceRESTResponse<Object>>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                        analyzeAnswer(response, "PrintCollo", data -> {
+                        analyzeAnswer(response, "printCollo", data -> {
                             onComplete.run();
                         }, onFailed);
                     }
@@ -142,7 +148,38 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                         } else onFailed.run(new Exception(t));
                     }
                 });
+    }
 
+    public void printReport(String printerName, String reportName, HashMap<String, Object> params, int quantity, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+//        if(BuildConfig.DEBUG) {
+//            onComplete.run();
+//            return;
+//        }
+
+        JasperDTO jasperDTO = new JasperDTO();
+        jasperDTO.setReportName(reportName);
+
+        Stream.of(params)
+                .forEach(x -> jasperDTO.getParams().add(new JasperPairDTO(x.getKey(), x.getValue())));
+
+        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        printerService
+                .processPrintReport(printerName, quantity, jasperDTO)
+                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                        analyzeAnswer(response, "printReport", data -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                        if(t.getMessage().contains("Printer not found")) {
+                            onFailed.run(new NoPrintersFoundException());
+                        } else onFailed.run(new Exception(t));
+                    }
+        });
     }
 
 }

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

@@ -2,8 +2,10 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
+import it.integry.integrywmsnative.core.rest.model.JasperDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;
@@ -34,4 +36,11 @@ public interface PrinterRESTConsumerService {
     );
 
 
+    @POST("processPrintReport")
+    Call<ServiceRESTResponse<Object>> processPrintReport(
+            @Query("printerName") String printerName,
+            @Query("numberOfCopies") int printQuantity,
+            @Body JasperDTO jasperDTO
+    );
+
 }

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

@@ -5,6 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -59,14 +60,14 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
                     @Override
                     public void onFailed(Exception ex) {
-                        onFailed.run(ex);
+                        if(onFailed != null) onFailed.run(ex);
                     }
                 });
             }
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                Log.e("ProcessSql", t.toString());
+                Logger.e(t, "ProcessSQL");
                 onFailed.run(new Exception(t));
             }
         });
@@ -80,12 +81,8 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
     }
 
-    public <T> void processSql(String nativeSql, final Type clazz, final ISimpleOperationCallback<T> callback) {
-
-        processSqlStatic(nativeSql, clazz, data -> {
-            callback.onSuccess((T) data);
-        }, callback::onFailed);
-
+    public <T> void processSql(String nativeSql, final Type clazz, final RunnableArgs<T> onComplete, final RunnableArgs<Exception> onFailed) {
+        processSqlStatic(nativeSql, clazz, onComplete, onFailed);
     }
 
 

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

@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JasperDTO {
+
+    private String reportName;
+    private List<JasperPairDTO> params = new ArrayList<>();
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public JasperDTO setReportName(String reportName) {
+        this.reportName = reportName;
+        return this;
+    }
+
+    public List<JasperPairDTO> getParams() {
+        return params;
+    }
+
+    public JasperDTO setParams(List<JasperPairDTO> params) {
+        this.params = params;
+        return this;
+    }
+}

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

@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+public class JasperPairDTO {
+
+    private String name;
+    private Object value;
+
+    public JasperPairDTO(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public JasperPairDTO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public JasperPairDTO setValue(Object value) {
+        this.value = value;
+        return this;
+    }
+}

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

@@ -1,23 +1,18 @@
-package it.integry.integrywmsnative.gest.vendita.dto;
+package it.integry.integrywmsnative.core.rest.model;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.di.BindableBoolean;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
-public class OrdineVenditaInevasoDTO {
+public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
 
-    private String data;
-    private Integer numero;
     private Integer idViaggio;
-    private String gestione;
     private String listino;
     private String termCons;
     private String codAuto;
-    private String codMdep;
     private String descrizioneAuto;
     private String codVvet;
     private String descrizioneVettore;
@@ -49,64 +44,25 @@ public class OrdineVenditaInevasoDTO {
     private String nomeAgente;
     private String codJfas;
 
-    public BindableBoolean selected;
 
 
-    public OrdineVenditaInevasoDTO() {
-        this.selected = new BindableBoolean(false);
-    }
-
-
-    public String getDataOrdS() {
-        return data;
-    }
-
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
-    }
-
-    public OrdineVenditaInevasoDTO setData(String data) {
-        this.data = data;
-        return this;
-    }
-
-    public Integer getNumOrd() {
-        return numero;
-    }
-
-    public OrdineVenditaInevasoDTO setNumero(Integer numero) {
-        this.numero = numero;
-        return this;
-    }
 
     public Integer getIdViaggio() {
         return idViaggio;
     }
 
-    public OrdineVenditaInevasoDTO setIdViaggio(Integer idViaggio) {
+    public OrdineUscitaInevasoDTO setIdViaggio(Integer idViaggio) {
         this.idViaggio = idViaggio;
         return this;
     }
 
-    public String getGestione() {
-        return gestione;
-    }
 
-    public GestioneEnum getGestioneEnum() {
-        return GestioneEnum.fromString(getGestione());
-    }
-
-
-    public OrdineVenditaInevasoDTO setGestione(String gestione) {
-        this.gestione = gestione;
-        return this;
-    }
 
     public String getListino() {
         return listino;
     }
 
-    public OrdineVenditaInevasoDTO setListino(String listino) {
+    public OrdineUscitaInevasoDTO setListino(String listino) {
         this.listino = listino;
         return this;
     }
@@ -115,7 +71,7 @@ public class OrdineVenditaInevasoDTO {
         return termCons;
     }
 
-    public OrdineVenditaInevasoDTO setTermCons(String termCons) {
+    public OrdineUscitaInevasoDTO setTermCons(String termCons) {
         this.termCons = termCons;
         return this;
     }
@@ -124,25 +80,16 @@ public class OrdineVenditaInevasoDTO {
         return codAuto;
     }
 
-    public OrdineVenditaInevasoDTO setCodAuto(String codAuto) {
+    public OrdineUscitaInevasoDTO setCodAuto(String codAuto) {
         this.codAuto = codAuto;
         return this;
     }
 
-    public String getCodMdep() {
-        return codMdep;
-    }
-
-    public OrdineVenditaInevasoDTO setCodMdep(String codMdep) {
-        this.codMdep = codMdep;
-        return this;
-    }
-
     public String getDescrizioneAuto() {
         return descrizioneAuto;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneAuto(String descrizioneAuto) {
+    public OrdineUscitaInevasoDTO setDescrizioneAuto(String descrizioneAuto) {
         this.descrizioneAuto = descrizioneAuto;
         return this;
     }
@@ -151,7 +98,7 @@ public class OrdineVenditaInevasoDTO {
         return codVvet;
     }
 
-    public OrdineVenditaInevasoDTO setCodVvet(String codVvet) {
+    public OrdineUscitaInevasoDTO setCodVvet(String codVvet) {
         this.codVvet = codVvet;
         return this;
     }
@@ -160,7 +107,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizioneVettore;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneVettore(String descrizioneVettore) {
+    public OrdineUscitaInevasoDTO setDescrizioneVettore(String descrizioneVettore) {
         this.descrizioneVettore = descrizioneVettore;
         return this;
     }
@@ -173,7 +120,7 @@ public class OrdineVenditaInevasoDTO {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
     }
 
-    public OrdineVenditaInevasoDTO setDataInizTrasp(String dataInizTrasp) {
+    public OrdineUscitaInevasoDTO setDataInizTrasp(String dataInizTrasp) {
         this.dataInizTrasp = dataInizTrasp;
         return this;
     }
@@ -182,7 +129,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizionePaga;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizionePaga(String descrizionePaga) {
+    public OrdineUscitaInevasoDTO setDescrizionePaga(String descrizionePaga) {
         this.descrizionePaga = descrizionePaga;
         return this;
     }
@@ -191,7 +138,7 @@ public class OrdineVenditaInevasoDTO {
         return rifOrd;
     }
 
-    public OrdineVenditaInevasoDTO setRifOrd(String rifOrd) {
+    public OrdineUscitaInevasoDTO setRifOrd(String rifOrd) {
         this.rifOrd = rifOrd;
         return this;
     }
@@ -200,7 +147,7 @@ public class OrdineVenditaInevasoDTO {
         return codAnagOrd;
     }
 
-    public OrdineVenditaInevasoDTO setCodAnagOrd(String codAnagOrd) {
+    public OrdineUscitaInevasoDTO setCodAnagOrd(String codAnagOrd) {
         this.codAnagOrd = codAnagOrd;
         return this;
     }
@@ -209,7 +156,7 @@ public class OrdineVenditaInevasoDTO {
         return codJcom;
     }
 
-    public OrdineVenditaInevasoDTO setCodJcom(String codJcom) {
+    public OrdineUscitaInevasoDTO setCodJcom(String codJcom) {
         this.codJcom = codJcom;
         return this;
     }
@@ -218,7 +165,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizioneCom;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneCom(String descrizioneCom) {
+    public OrdineUscitaInevasoDTO setDescrizioneCom(String descrizioneCom) {
         this.descrizioneCom = descrizioneCom;
         return this;
     }
@@ -227,7 +174,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocCom;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocCom(String ragSocCom) {
+    public OrdineUscitaInevasoDTO setRagSocCom(String ragSocCom) {
         this.ragSocCom = ragSocCom;
         return this;
     }
@@ -236,7 +183,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocOrd;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocOrd(String ragSocOrd) {
+    public OrdineUscitaInevasoDTO setRagSocOrd(String ragSocOrd) {
         this.ragSocOrd = ragSocOrd;
         return this;
     }
@@ -245,7 +192,7 @@ public class OrdineVenditaInevasoDTO {
         return destinatario;
     }
 
-    public OrdineVenditaInevasoDTO setDestinatario(String destinatario) {
+    public OrdineUscitaInevasoDTO setDestinatario(String destinatario) {
         this.destinatario = destinatario;
         return this;
     }
@@ -254,7 +201,7 @@ public class OrdineVenditaInevasoDTO {
         return citta;
     }
 
-    public OrdineVenditaInevasoDTO setCitta(String citta) {
+    public OrdineUscitaInevasoDTO setCitta(String citta) {
         this.citta = citta;
         return this;
     }
@@ -263,7 +210,7 @@ public class OrdineVenditaInevasoDTO {
         return provincia;
     }
 
-    public OrdineVenditaInevasoDTO setProvincia(String provincia) {
+    public OrdineUscitaInevasoDTO setProvincia(String provincia) {
         this.provincia = provincia;
         return this;
     }
@@ -272,7 +219,7 @@ public class OrdineVenditaInevasoDTO {
         return indirizzo;
     }
 
-    public OrdineVenditaInevasoDTO setIndirizzo(String indirizzo) {
+    public OrdineUscitaInevasoDTO setIndirizzo(String indirizzo) {
         this.indirizzo = indirizzo;
         return this;
     }
@@ -281,7 +228,7 @@ public class OrdineVenditaInevasoDTO {
         return pesoTotale;
     }
 
-    public OrdineVenditaInevasoDTO setPesoTotale(BigDecimal pesoTotale) {
+    public OrdineUscitaInevasoDTO setPesoTotale(BigDecimal pesoTotale) {
         this.pesoTotale = pesoTotale;
         return this;
     }
@@ -290,7 +237,7 @@ public class OrdineVenditaInevasoDTO {
         return numCnfdaEvadere;
     }
 
-    public OrdineVenditaInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) {
+    public OrdineUscitaInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) {
         this.numCnfdaEvadere = numCnfdaEvadere;
         return this;
     }
@@ -299,7 +246,7 @@ public class OrdineVenditaInevasoDTO {
         return numCnfDisp;
     }
 
-    public OrdineVenditaInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) {
+    public OrdineUscitaInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) {
         this.numCnfDisp = numCnfDisp;
         return this;
     }
@@ -312,7 +259,7 @@ public class OrdineVenditaInevasoDTO {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS());
     }
 
-    public OrdineVenditaInevasoDTO setDataCons(String dataCons) {
+    public OrdineUscitaInevasoDTO setDataCons(String dataCons) {
         this.dataCons = dataCons;
         return this;
     }
@@ -321,7 +268,7 @@ public class OrdineVenditaInevasoDTO {
         return barcode;
     }
 
-    public OrdineVenditaInevasoDTO setBarcode(String barcode) {
+    public OrdineUscitaInevasoDTO setBarcode(String barcode) {
         this.barcode = barcode;
         return this;
     }
@@ -330,7 +277,7 @@ public class OrdineVenditaInevasoDTO {
         return numRighe;
     }
 
-    public OrdineVenditaInevasoDTO setNumRighe(Integer numRighe) {
+    public OrdineUscitaInevasoDTO setNumRighe(Integer numRighe) {
         this.numRighe = numRighe;
         return this;
     }
@@ -339,7 +286,7 @@ public class OrdineVenditaInevasoDTO {
         return righeInPartenza;
     }
 
-    public OrdineVenditaInevasoDTO setRigheInPartenza(Integer righeInPartenza) {
+    public OrdineUscitaInevasoDTO setRigheInPartenza(Integer righeInPartenza) {
         this.righeInPartenza = righeInPartenza;
         return this;
     }
@@ -348,7 +295,7 @@ public class OrdineVenditaInevasoDTO {
         return saldoContabile;
     }
 
-    public OrdineVenditaInevasoDTO setSaldoContabile(BigDecimal saldoContabile) {
+    public OrdineUscitaInevasoDTO setSaldoContabile(BigDecimal saldoContabile) {
         this.saldoContabile = saldoContabile;
         return this;
     }
@@ -357,7 +304,7 @@ public class OrdineVenditaInevasoDTO {
         return codVzon;
     }
 
-    public OrdineVenditaInevasoDTO setCodVzon(String codVzon) {
+    public OrdineUscitaInevasoDTO setCodVzon(String codVzon) {
         this.codVzon = codVzon;
         return this;
     }
@@ -366,7 +313,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocOrdV;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocOrdV(String ragSocOrdV) {
+    public OrdineUscitaInevasoDTO setRagSocOrdV(String ragSocOrdV) {
         this.ragSocOrdV = ragSocOrdV;
         return this;
     }
@@ -375,7 +322,7 @@ public class OrdineVenditaInevasoDTO {
         return colliRiservati;
     }
 
-    public OrdineVenditaInevasoDTO setColliRiservati(int colliRiservati) {
+    public OrdineUscitaInevasoDTO setColliRiservati(int colliRiservati) {
         this.colliRiservati = colliRiservati;
         return this;
     }
@@ -384,7 +331,7 @@ public class OrdineVenditaInevasoDTO {
         return existColloBoolean;
     }
 
-    public OrdineVenditaInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
+    public OrdineUscitaInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
         this.existColloBoolean = existColloBoolean;
         return this;
     }
@@ -393,7 +340,7 @@ public class OrdineVenditaInevasoDTO {
         return flagEvaso;
     }
 
-    public OrdineVenditaInevasoDTO setFlagEvaso(boolean flagEvaso) {
+    public OrdineUscitaInevasoDTO setFlagEvaso(boolean flagEvaso) {
         this.flagEvaso = flagEvaso;
         return this;
     }
@@ -402,7 +349,7 @@ public class OrdineVenditaInevasoDTO {
         return nomeAgente;
     }
 
-    public OrdineVenditaInevasoDTO setNomeAgente(String nomeAgente) {
+    public OrdineUscitaInevasoDTO setNomeAgente(String nomeAgente) {
         this.nomeAgente = nomeAgente;
         return this;
     }
@@ -411,36 +358,27 @@ public class OrdineVenditaInevasoDTO {
         return codJfas;
     }
 
-    public OrdineVenditaInevasoDTO setCodJfas(String codJfas) {
+    public OrdineUscitaInevasoDTO setCodJfas(String codJfas) {
         this.codJfas = codJfas;
         return this;
     }
 
-    public boolean isSelected() {
-        return selected.get();
-    }
-
-    public OrdineVenditaInevasoDTO setSelected(boolean selected) {
-        this.selected.set(selected);
-        return this;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        OrdineVenditaInevasoDTO that = (OrdineVenditaInevasoDTO) o;
+        OrdineUscitaInevasoDTO that = (OrdineUscitaInevasoDTO) o;
 
-        if (!data.equals(that.data)) return false;
-        if (!numero.equals(that.numero)) return false;
+        if (!getDataOrdS().equals(that.getDataOrdS())) return false;
+        if (!getNumOrd().equals(that.getNumOrd())) return false;
         return getGestione().equals(that.getGestione());
     }
 
     @Override
     public int hashCode() {
-        int result = data.hashCode();
-        result = 31 * result + numero.hashCode();
+        int result = getDataOrdS().hashCode();
+        result = 31 * result + getNumOrd().hashCode();
         result = 31 * result + getGestione().hashCode();
         return result;
     }

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

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.rest.model;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 public class SitArtOrdDTO {
 
@@ -25,6 +26,8 @@ public class SitArtOrdDTO {
     private String codMsfa;
     private String descrizioneMsfa;
 
+    private final HashMap<String, Object> extraInfo = new HashMap<>();
+
     public String getCodJcom() {
         return codJcom;
     }
@@ -196,4 +199,8 @@ public class SitArtOrdDTO {
         this.descrizioneMsfa = descrizioneMsfa;
         return this;
     }
+
+    public HashMap<String, Object> getExtraInfo() {
+        return extraInfo;
+    }
 }

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

@@ -21,6 +21,7 @@ public class DBSettingsModel {
     private String defaultCausaleRettificaGiacenze;
     private DistribuzioneColloDTO.CriterioDistribuzione defaultCriterioDistribuzione;
     private boolean flagAskClienteInPickingLibero;
+    private boolean flagAllowEmptyClienteInPickingLibero;
 
     private boolean flagCanAddExtraItemSpedizione;
     private boolean flagCanAutoOpenNewULAccettazione;
@@ -33,6 +34,7 @@ public class DBSettingsModel {
     private boolean flagSpedizioneEnableManualPick;
     private boolean flagSpedizioneCanSelectMultipleOrders;
     private String produzioneDefaultCodAnag;
+    private String reportNameSpedizionChiudiOrdine;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -132,6 +134,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAllowEmptyClienteInPickingLibero() {
+        return flagAllowEmptyClienteInPickingLibero;
+    }
+
+    public DBSettingsModel setFlagAllowEmptyClienteInPickingLibero(boolean flagAllowEmptyClienteInPickingLibero) {
+        this.flagAllowEmptyClienteInPickingLibero = flagAllowEmptyClienteInPickingLibero;
+        return this;
+    }
+
     public boolean isFlagCanAddExtraItemSpedizione() {
         return flagCanAddExtraItemSpedizione;
     }
@@ -231,4 +242,13 @@ public class DBSettingsModel {
         this.produzioneDefaultCodAnag = produzioneDefaultCodAnag;
         return this;
     }
+
+    public String getReportNameSpedizionChiudiOrdine() {
+        return reportNameSpedizionChiudiOrdine;
+    }
+
+    public DBSettingsModel setReportNameSpedizionChiudiOrdine(String reportNameSpedizionChiudiOrdine) {
+        this.reportNameSpedizionChiudiOrdine = reportNameSpedizionChiudiOrdine;
+        return this;
+    }
 }

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

@@ -202,6 +202,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("PICKING_LIBERO")
                 .setKeySection("FLAG_ASK_CLIENTE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("FLAG_ALLOW_EMPTY_CLIENTE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -250,6 +254,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_CAN_SELECT_MULTIPLE_ORDERS"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("REPORT_PACKING_LIST"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -259,6 +267,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "SETUP","COD_ANAG_DEFAULT", String.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.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));
@@ -271,6 +280,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
+            dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
 
             if(onComplete != null) onComplete.run();
         }, onFailed);

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

@@ -27,17 +27,17 @@ public class UpdatesManager {
     public static void init(Activity context) {
         String suffix;
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
-        try{
+        try {
             suffix = customConfiguration.getConfig(BaseCustomConfiguration.Keys.CUSTOM_DYNAMIC_VERSION_PATH);
-             if (suffix == null){
+            if (suffix == null) {
                 suffix = "";
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             suffix = "";
         }
 
         String currentVersionUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/currentVersion";
-        String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release"+suffix+"_v2.apk";
+        String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release" + suffix + ".apk";
 
 
         AppUpdater appUpdater = new AppUpdater(context)

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

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.utility;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 public class UtilityBigDecimal {
 
@@ -50,23 +51,28 @@ public class UtilityBigDecimal {
 
 
     public static BigDecimal divide(BigDecimal input1, BigDecimal divisor) {
-        if(divisor == null || equalsTo(divisor, BigDecimal.ZERO)) return null;
+        return divide(input1, divisor, RoundingMode.HALF_EVEN);
+    }
 
-        return input1.divide(divisor, 3, BigDecimal.ROUND_HALF_EVEN);
+    public static BigDecimal divide(BigDecimal input1, BigDecimal divisor, RoundingMode roundingMode) {
+        if(divisor == null || equalsTo(divisor, BigDecimal.ZERO)) return null;
+        return input1.divide(divisor, 3, roundingMode);
     }
 
 
     public static BigDecimal divideToInteger(BigDecimal input1, BigDecimal divisor) {
         if(divisor == null || equalsTo(divisor, BigDecimal.ZERO)) return null;
-
         return new BigDecimal(input1.divide(divisor,3, BigDecimal.ROUND_HALF_EVEN).intValue());
     }
 
 
     public static BigDecimal divideAndRoundToInteger(BigDecimal input1, BigDecimal divisor) {
-        if(divisor == null || equalsTo(divisor, BigDecimal.ZERO)) return null;
+        return divideAndRoundToInteger(input1, divisor, RoundingMode.HALF_EVEN);
+    }
 
-        return new BigDecimal(input1.divide(divisor,0, BigDecimal.ROUND_HALF_EVEN).intValue());
+    public static BigDecimal divideAndRoundToInteger(BigDecimal input1, BigDecimal divisor, RoundingMode roundingMode) {
+        if(divisor == null || equalsTo(divisor, BigDecimal.ZERO)) return null;
+        return new BigDecimal(input1.divide(divisor,0, roundingMode).intValue());
     }
 
     public static BigDecimal multiply(BigDecimal input1, BigDecimal multiplier) {

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

@@ -0,0 +1,60 @@
+package it.integry.integrywmsnative.core.utility;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class UtilityReflections {
+
+
+    public static void copy(Object from, Object to) throws Exception {
+        UtilityReflections.copy(from, to, Object.class);
+    }
+
+    public static void copy(Object from, Object to, Class depth) throws Exception {
+        Class fromClass = from.getClass();
+        Class toClass = to.getClass();
+        List<Field> fromFields = collectFields(fromClass, depth);
+        List<Field> toFields = collectFields(toClass, depth);
+        Field target;
+        for (Field source : fromFields) {
+            if ((target = findAndRemove(source, toFields)) != null) {
+                source.setAccessible(true);
+                target.setAccessible(true);
+                target.set(to, source.get(from));
+            }
+        }
+    }
+
+    private static List<Field> collectFields(Class c, Class depth) {
+        List<Field> accessibleFields = new ArrayList<>();
+        do {
+            int modifiers;
+            for (Field field : c.getDeclaredFields()) {
+                modifiers = field.getModifiers();
+                if (!Modifier.isStatic(modifiers)/* && Modifier.isPublic(modifiers)*/) {
+                    accessibleFields.add(field);
+                }
+            }
+            c = c.getSuperclass();
+        } while (c != null && c != depth);
+        return accessibleFields;
+    }
+
+    private static Field findAndRemove(Field field, List<Field> fields) {
+        Field actual;
+        for (Iterator<Field> i = fields.iterator(); i.hasNext();) {
+            actual = i.next();
+            if (field.getName().equals(actual.getName())
+                    && field.getType().equals(actual.getType())) {
+                i.remove();
+                return actual;
+            }
+        }
+        return null;
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiStatusChecker.java

@@ -53,7 +53,7 @@ public class WiFiStatusChecker {
     };
 
     public WiFiStatusChecker(Context context){
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mWifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
     }
 
     public void startMonitoring(RunnableArgs<SIGNAL> callback){

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java

@@ -45,7 +45,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 
 public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment {
 
-    private Runnable mOnPreDestroy;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private FragmentMainAccettazioneBinding mBinding;
@@ -54,7 +54,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
     private MainListAccettazioneAdapter mAdapter;
 
     private List<OrdineAccettazioneInevasoDTO> mOriginalOrderList;
-    private List<OrdineAccettazioneInevasoDTO> mRenderedOrderList = new ArrayList<>();
+    private final List<OrdineAccettazioneInevasoDTO> mRenderedOrderList = new ArrayList<>();
 
     private AppCompatTextView mAppBarTitle;
 
@@ -81,20 +81,14 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         mAppBarTitle.setText(context.getText(R.string.accettazione_title_fragment).toString());
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-
-        init();
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_accettazione, container, false);
 
+        init();
+
         mBinding.setView(this);
         mBinding.accettazioneMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
         mBinding.accettazioneMainFab.hide();
@@ -110,7 +104,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
     @Override
     public void onDestroy() {
-        if(mOnPreDestroy != null) mOnPreDestroy.run();
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
         super.onDestroy();
     }
 
@@ -153,7 +149,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
 
 
-    private RunnableArgs<OrdineAccettazioneInevasoDTO> onSingleSelectionChanged = dto -> {
+    private final RunnableArgs<OrdineAccettazioneInevasoDTO> onSingleSelectionChanged = dto -> {
         List<OrdineAccettazioneInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
 
         if(dto.isSelected()) {
@@ -248,8 +244,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         mToolbar = toolbar;
     }
 
+
     @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

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

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_picking;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -10,6 +11,7 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
@@ -52,13 +54,14 @@ import it.integry.integrywmsnative.gest.accettazione_picking.core.AccettazioneLi
 import it.integry.integrywmsnative.gest.accettazione_picking.core.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.rest.RecoverMtbColt;
 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.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 
@@ -71,7 +74,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
-    private ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
+    private final ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -88,6 +91,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private final int PICK_UL_REQUEST = 1;
 
+    private boolean mShowSecondaryUntMis = true;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -114,11 +119,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
         setSupportActionBar(this.mBindings.toolbar);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        mShowSecondaryUntMis = sharedPreferences.getBoolean("picking_ingresso_enable_sec_unt_mis", true);
+
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
 
-
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         mViewModel.setListeners(this);
@@ -179,14 +186,14 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     private void initRecyclerView() {
+        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData, mShowSecondaryUntMis);
+        this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
+        this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
+
         this.mViewModel.getPickingList().observe(this, updatedData -> {
             refreshList();
         });
 
-        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData);
-        this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
-        this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
-
         accettazioneListAdapter.setOnItemClicked(clickedItem -> {
             this.mViewModel.dispatchOrdineRow(clickedItem);
         });
@@ -235,8 +242,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
 
-
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                    //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -245,10 +251,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
-                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    } else {
+                    //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -257,10 +260,26 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    } else {
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
                     }
 
                     accettazioneListModel.setOriginalModel(x);
@@ -286,7 +305,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
 
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                    //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -295,10 +314,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
-                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
-                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    } else {
+                    //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -307,14 +323,27 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    } else {
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
-                    }
 
-                    if (x.getMtbAart() != null)
-                        accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    }
 
                     accettazioneListModel.setOriginalModel(x);
 
@@ -339,8 +368,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
-
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                    //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -349,10 +377,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
-                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
-                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    } else {
+                    //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
                     if(x.getWithdrawMtbColrs().size() > 0) {
@@ -361,10 +386,25 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    } else {
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
                     }
 
                     if (x.getMtbAart() != null) {
@@ -388,8 +428,45 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
 
-                    accettazioneListModel.setQtaEvasa(BigDecimal.ZERO);
-                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+                    //Calc Num CNF
+                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getNumCnf)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+                    //Calc qta col
+                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getQtaCol)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    } else {
+                        accettazioneListModel.setQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    }
+
 
                     if (x.getMtbAart() != null) {
                         accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
@@ -455,8 +532,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
 
-    public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
-        Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, false, PrinterRESTConsumer.Type.SECONDARIA, ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
+    public void startListaBancaliRegistratiActivity(ArrayList<RecoverMtbColt> mtbColts) {
+
+        Intent myIntent = ListaBancaliActivity.createIntent(this,
+                Stream.of(mtbColts).map(x -> (MtbColt)x).toList(),
+                input -> ((RecoverMtbColt) input).isFlagCanBeRecovered(),
+                PrinterRESTConsumer.Type.SECONDARIA,
+                ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 
@@ -548,7 +630,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity);
 
-        DialogInputQuantityV2
+        DialogInputQuantityV2View
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.gest.accettazione_picking;
 
+import androidx.annotation.NonNull;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -50,8 +51,10 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 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;
 import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.accettazione_picking.rest.AccettazionePickingRESTConsumer;
+import it.integry.integrywmsnative.gest.accettazione_picking.rest.RecoverMtbColt;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
@@ -69,12 +72,14 @@ public class AccettazionePickingViewModel {
 
     private List<OrdineAccettazioneInevasoDTO> mOrders;
     private List<SitArtOrdDTO> mSitArts;
-    private MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
+    private final MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
 
     private MtbColt mCurrentMtbColt = null;
     private GestioneEnum defaultGestioneOfUL = null;
     private String mDefaultCodMdep = null;
 
+    private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
+
     @Inject
     public AccettazionePickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
                                         BarcodeRESTConsumer barcodeRESTConsumer,
@@ -135,7 +140,7 @@ public class AccettazionePickingViewModel {
                 .map(SitArtOrdDTO::getCodMart)
                 .toList();
 
-        ArticoloRESTConsumer.getByCodMart(codMarts, listMtbAarts -> {
+        this.mArticoloRESTConsumer.getByCodMart(codMarts, listMtbAarts -> {
             List<PickingObjectDTO> pickingList = Stream.of(sitArtOrdList)
                     .map(sitArtOrdDTO -> {
                         MtbAart mtbAart = null;
@@ -161,7 +166,7 @@ public class AccettazionePickingViewModel {
         return mPickingList;
     }
 
-    public void retrieveExistentLU(RunnableArgs<ArrayList<MtbColt>> onComplete) {
+    public void retrieveExistentLU(RunnableArgs<ArrayList<RecoverMtbColt>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mSitArts, mtbColtList -> {
@@ -421,7 +426,7 @@ public class AccettazionePickingViewModel {
 
 
     public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO) {
-        if(this.mCurrentMtbColt == null) return;
+        if (this.mCurrentMtbColt == null) return;
 
         BigDecimal totalQtaOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd();
         BigDecimal totalNumCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd();
@@ -477,7 +482,7 @@ public class AccettazionePickingViewModel {
 
 
             if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
-                numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
 
                 if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
                     if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
@@ -510,12 +515,12 @@ public class AccettazionePickingViewModel {
             initialQtaTot = totalQtaOrd;
         }
 
-        if(UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+        if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
             initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
             initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
         }
 
-        if(dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
+        if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
             dataScad = UtilityDate.getDateInstance();
             Calendar c = new GregorianCalendar();
             c.setTime(dataScad);
@@ -523,6 +528,15 @@ public class AccettazionePickingViewModel {
             dataScad = c.getTime();
         }
 
+        if(partitaMag == null && dataScad == null) {
+            HistoryMtbAartDTO historyMtbAartDTO = this.getHistoryItemIfExists(pickingObjectDTO.getMtbAart().getCodMart());
+
+            if(historyMtbAartDTO != null) {
+                partitaMag = historyMtbAartDTO.getPartitaMag();
+                dataScad = historyMtbAartDTO.getDataScad();
+            }
+        }
+
         this.sendOnItemDispatched(
                 pickingObjectDTO,
                 pickingObjectDTO.getMtbAart(),
@@ -573,6 +587,8 @@ public class AccettazionePickingViewModel {
                 .setRigaOrd(pickingObjectDTO.getSitArtOrdDTO().getRigaOrd());
 
 
+        this.addHistoryItem(mtbColr);
+
         mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
         MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
@@ -596,7 +612,7 @@ public class AccettazionePickingViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
@@ -668,6 +684,8 @@ public class AccettazionePickingViewModel {
 
         mtbColt.getMtbColr().add(mtbColr);
 
+        this.addHistoryItem(mtbColr);
+
         this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> {
 
             mtbColr.setNumCnf(numCnf)
@@ -678,7 +696,7 @@ public class AccettazionePickingViewModel {
                     .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToUpdate))
                     .findSingle();
 
-            if(pickingObjectDTO.isPresent()) {
+            if (pickingObjectDTO.isPresent()) {
                 pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToUpdate);
                 pickingObjectDTO.get().getWithdrawMtbColrs().add(mtbColr);
             }
@@ -813,6 +831,30 @@ public class AccettazionePickingViewModel {
         this.sendFilterRemoved();
     }
 
+    private void addHistoryItem(@NonNull MtbColr mtbColr) {
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
+                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                .findFirst();
+
+        if (optional.isPresent()) {
+            optional.get()
+                    .setPartitaMag(mtbColr.getPartitaMag())
+                    .setDataScad(mtbColr.getDataScadPartitaD());
+        } else {
+            this.mHistoryUsedAarts.add(new HistoryMtbAartDTO()
+                    .setCodMart(mtbColr.getCodMart())
+                    .setPartitaMag(mtbColr.getPartitaMag())
+                    .setDataScad(mtbColr.getDataScadPartitaD()));
+        }
+    }
+
+    private HistoryMtbAartDTO getHistoryItemIfExists(@NonNull String codMart) {
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
+                .filter(x -> x.getCodMart().equalsIgnoreCase(codMart))
+                .findFirst();
+
+        return optional.isPresent() ? optional.get() : null;
+    }
 
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -28,8 +29,9 @@ import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDT
 
 public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<AccettazioneListAdapter.SubheaderHolder, AccettazioneListAdapter.SingleItemViewHolder> {
 
-    private Context mContext;
-    private List<AccettazioneListModel> mDataset = new ArrayList<>();
+    private final Context mContext;
+    private final boolean mShowSecondaryUntMis;
+    private final List<AccettazioneListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
 
@@ -55,8 +57,9 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
     }
 
 
-    public AccettazioneListAdapter(AppCompatActivity context, ObservableArrayList<AccettazioneListModel> mutableDataSet) {
+    public AccettazioneListAdapter(AppCompatActivity context, ObservableArrayList<AccettazioneListModel> mutableDataSet, boolean showSecondaryUntMis) {
         this.mContext = context;
+        this.mShowSecondaryUntMis = showSecondaryUntMis;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
             @Override
@@ -111,8 +114,8 @@ 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(mContext.getResources().getDrawable(!pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
-        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_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());
         holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
@@ -129,6 +132,17 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
         holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
         holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);
 
+        //Secondary Unt Mis
+        holder.mBinding.secondaryUntMis.setVisibility(mShowSecondaryUntMis ? View.VISIBLE : View.GONE);
+
+        if(mShowSecondaryUntMis) {
+            holder.mBinding.secQtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getSecQtaEvasa()));
+            holder.mBinding.secQtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getSecQtaTot()));
+
+            holder.mBinding.secUntMis.setText(pickingObjectDTO.getSecUntMis());
+            holder.mBinding.secUntMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getSecUntMis()) ? View.GONE : View.VISIBLE);
+        }
+
         holder.mBinding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());

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

@@ -19,6 +19,9 @@ public class AccettazioneListModel implements Cloneable {
     private BigDecimal qtaEvasa;
     private BigDecimal qtaTot;
     private String untMis;
+    private BigDecimal secQtaEvasa;
+    private BigDecimal secQtaTot;
+    private String secUntMis;
 
     private boolean active;
 
@@ -124,6 +127,33 @@ public class AccettazioneListModel implements Cloneable {
         return this;
     }
 
+    public BigDecimal getSecQtaEvasa() {
+        return secQtaEvasa;
+    }
+
+    public AccettazioneListModel setSecQtaEvasa(BigDecimal secQtaEvasa) {
+        this.secQtaEvasa = secQtaEvasa;
+        return this;
+    }
+
+    public BigDecimal getSecQtaTot() {
+        return secQtaTot;
+    }
+
+    public AccettazioneListModel setSecQtaTot(BigDecimal secQtaTot) {
+        this.secQtaTot = secQtaTot;
+        return this;
+    }
+
+    public String getSecUntMis() {
+        return secUntMis;
+    }
+
+    public AccettazioneListModel setSecUntMis(String secUntMis) {
+        this.secUntMis = secUntMis;
+        return this;
+    }
+
     public boolean isActive() {
         return active;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/dto/HistoryMtbAartDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.dto;
+
+import java.util.Date;
+
+public class HistoryMtbAartDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private Date dataScad;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public HistoryMtbAartDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public HistoryMtbAartDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public HistoryMtbAartDTO setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java

@@ -5,18 +5,17 @@ import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 
 @Singleton
@@ -29,58 +28,114 @@ public class AccettazionePickingRESTConsumer {
         this.mSystemRestConsumer = systemRESTConsumer;
     }
 
-    public void getBancaliGiaRegistrati(List<SitArtOrdDTO> ordiniToShow, RunnableArgs<ArrayList<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getBancaliGiaRegistrati(List<SitArtOrdDTO> ordiniToShow, RunnableArgs<ArrayList<RecoverMtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<HashMap<String, Object>> whereCondListMap = new ArrayList<>();
 
-        List<String> colliWhereCond = new ArrayList<>();
-
-
-        Stream.of(ordiniToShow).forEach(x -> {
+        Stream
+                .of(ordiniToShow)
+                .distinctBy(x -> x.getDataOrd() + " " + x.getGestione() + " " + x.getNumOrd())
+                .forEach(x -> {
                     try {
-                Date date = UtilityDate.recognizeDate(x.getDataOrd());
-                String dateString = UtilityDate.formatDate(date, "yyyy/MM/dd");
+                        HashMap<String, Object> whereCondMap = new HashMap<>();
+                        whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getDataOrd()));
+                        whereCondMap.put("mtb_colr.gestione", x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione());
+                        whereCondMap.put("mtb_colr.num_ord", x.getNumOrd());
 
-                if (!colliWhereCond.contains(x.getGestione() + " " + dateString + " " + x.getNumOrd())) {
-                    String gestione = x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione();
-                    colliWhereCond.add(gestione + " " + dateString + " " + x.getNumOrd());
-                }
-            } catch (Exception ex){
+                        whereCondListMap.add(whereCondMap);
+                    } catch (Exception ex) {
                         UtilityLogger.errorMe(ex);
                     }
                 });
 
 
-        StringBuilder colliINCondition = new StringBuilder();
-
-        for(int i = 0; i < colliWhereCond.size(); i ++){
-            colliINCondition.append("'").append(colliWhereCond.get(i)).append("'");
-
-            if(i < (colliWhereCond.size()-1)) colliINCondition.append(",");
-        }
+        String sql = "SELECT DISTINCT CAST(CASE WHEN MAX(ISNULL(mtb_colr_scar.num_collo, 0)) = 0 THEN 1 ELSE 0 END AS BIT) AS flagCanBeRecovered, " +
+                "                mtb_colt.gestione," +
+                "                mtb_colt.data_collo," +
+                "                mtb_colt.num_collo," +
+                "                segno," +
+                "                peso_kg," +
+                "                lunghezza_cm," +
+                "                larghezza_cm," +
+                "                altezza_cm," +
+                "                cod_anag," +
+                "                cod_dtip," +
+                "                mtb_colt.data_doc," +
+                "                mtb_colt.ser_doc," +
+                "                mtb_colt.num_doc," +
+                "                rif_ord," +
+                "                mtb_colt.ser_collo," +
+                "                cod_tcol," +
+                "                mtb_colt.data_ord," +
+                "                mtb_colt.num_ord," +
+                "                cod_vdes," +
+                "                cod_mdep," +
+                "                cod_vlis," +
+                "                preparato_da," +
+                "                ora_iniz_prep," +
+                "                ora_fine_prep," +
+                "                filtro_ordini," +
+                "                annotazioni," +
+                "                posizione," +
+                "                cod_dtip_provv," +
+                "                data_doc_provv," +
+                "                ser_doc_provv," +
+                "                num_doc_provv," +
+                "                cod_jfas," +
+                "                data_vers," +
+                "                mtb_colt.peso_netto_kg " +
+                "FROM mtb_colt" +
+                "   INNER JOIN  mtb_colr ON " +
+                " mtb_colt.gestione = mtb_colr.gestione AND " +
+                " mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
+                " mtb_colt.data_collo = mtb_colr.data_collo AND " +
+                " mtb_colt.num_collo = mtb_colr.num_collo " +
+                " LEFT OUTER JOIN mtb_colr mtb_colr_scar ON mtb_colr_scar.num_collo_rif = mtb_colr.num_collo AND " +
+                "                                             mtb_colr_scar.gestione_rif = mtb_colr.gestione AND " +
+                "                                             mtb_colr_scar.ser_collo_rif = mtb_colr.ser_collo AND " +
+                "                                             mtb_colr_scar.data_collo_rif = mtb_colr.data_collo " +
+                " WHERE (" + UtilityQuery.concatFieldListInWhereCond(whereCondListMap) + ") " +
+                " AND mtb_colt.data_doc IS NULL " +
+                " GROUP BY mtb_colt.gestione," +
+                "                mtb_colt.data_collo," +
+                "                mtb_colt.num_collo," +
+                "                segno," +
+                "                peso_kg," +
+                "                lunghezza_cm," +
+                "                larghezza_cm," +
+                "                altezza_cm," +
+                "                cod_anag," +
+                "                cod_dtip," +
+                "                mtb_colt.data_doc," +
+                "                mtb_colt.ser_doc," +
+                "                mtb_colt.num_doc," +
+                "                rif_ord," +
+                "                mtb_colt.ser_collo," +
+                "                cod_tcol," +
+                "                mtb_colt.data_ord," +
+                "                mtb_colt.num_ord," +
+                "                cod_vdes," +
+                "                cod_mdep," +
+                "                cod_vlis," +
+                "                preparato_da," +
+                "                ora_iniz_prep," +
+                "                ora_fine_prep," +
+                "                filtro_ordini," +
+                "                annotazioni," +
+                "                posizione," +
+                "                cod_dtip_provv," +
+                "                data_doc_provv," +
+                "                ser_doc_provv," +
+                "                num_doc_provv," +
+                "                cod_jfas," +
+                "                data_vers," +
+                "                mtb_colt.peso_netto_kg";
 
 
-
-        String sql = "SELECT DISTINCT mtb_colt.* " +
-                "FROM mtb_colt, mtb_colr " +
-                "WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
-                "mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
-                "mtb_colt.data_collo = mtb_colr.data_collo AND " +
-                "mtb_colt.num_collo = mtb_colr.num_collo AND " +
-                "mtb_colt.gestione + ' ' + CONVERT(VARCHAR(15), mtb_colr.data_ord, 111) + ' ' + CONVERT(VARCHAR, mtb_colr.num_ord) IN (" + colliINCondition +
-                ") AND mtb_colt.data_doc IS NULL ";
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
-        mSystemRestConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<MtbColt>>() {
-            @Override
-            public void onSuccess(ArrayList<MtbColt> value) {
-                if(onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
+        Type typeOfObjectsList = new TypeToken<ArrayList<RecoverMtbColt>>() {
+        }.getType();
+        mSystemRestConsumer.<ArrayList<RecoverMtbColt>>processSql(sql, typeOfObjectsList, value -> {
+            if (onComplete != null) onComplete.run(value);
+        }, onFailed);
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/RecoverMtbColt.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.rest;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class RecoverMtbColt extends MtbColt {
+
+    private boolean flagCanBeRecovered;
+
+    public boolean isFlagCanBeRecovered() {
+        return flagCanBeRecovered;
+    }
+
+    public RecoverMtbColt setFlagCanBeRecovered(boolean flagCanBeRecovered) {
+        this.flagCanBeRecovered = flagCanBeRecovered;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java

@@ -6,12 +6,12 @@ import android.os.Bundle;
 
 import androidx.databinding.DataBindingUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding;
@@ -32,7 +32,7 @@ public class ListaBancaliActivity extends BaseActivity {
 
     private ListaBancaliViewModel mViewModel;
 
-    private boolean mCanRecoverUl;
+    private RunnableArgsWithReturn<MtbColt, Boolean> mCanRecoverUl;
     private PrinterRESTConsumer.Type mPrinterType;
     private String mReportName;
     private boolean mFlagOnlyResiduo;
@@ -41,34 +41,25 @@ public class ListaBancaliActivity extends BaseActivity {
 
 
 
-    public static Intent createIntent(Context context, ArrayList<MtbColt> items, boolean canRecoverUl, PrinterRESTConsumer.Type printerType, String reportName) {
-        Intent myIntent = new Intent(context, ListaBancaliActivity.class);
-
-        String mtbColtsKey = DataCache.addItem(items);
-        myIntent.putExtra(Key.MtbColtsKey, mtbColtsKey);
-
-        String canRecoverULKey = DataCache.addItem(canRecoverUl);
-        myIntent.putExtra(Key.CanRecoverUL, canRecoverULKey);
-
-        String printerTypeKey = DataCache.addItem(printerType);
-        myIntent.putExtra(Key.PrinterType, printerTypeKey);
-
-        String reportNameKey = DataCache.addItem(reportName);
-        myIntent.putExtra(Key.ReportName, reportNameKey);
-
-        String flagOnlyResiduoKey = DataCache.addItem(true);
-        myIntent.putExtra(Key.FlagOnlyResiduo, flagOnlyResiduoKey);
-
-        return myIntent;
+    public static Intent createIntent(Context context, List<MtbColt> items, RunnableArgsWithReturn<MtbColt, Boolean> canRecoverUlAction, PrinterRESTConsumer.Type printerType, String reportName) {
+        return createIntent(context, items, canRecoverUlAction, printerType, true, reportName);
     }
 
-    public static Intent createIntent(Context context, ArrayList<MtbColt> items, boolean canRecoverUl, PrinterRESTConsumer.Type printerType, boolean onlyResiduo) {
+    public static Intent createIntent(Context context, List<MtbColt> items, boolean canRecoverUl, PrinterRESTConsumer.Type printerType, boolean onlyResiduo) {
+        return createIntent(context, items, input -> canRecoverUl, printerType, onlyResiduo);
+    }
+
+    public static Intent createIntent(Context context, List<MtbColt> items, RunnableArgsWithReturn<MtbColt, Boolean> canRecoverUlAction, PrinterRESTConsumer.Type printerType, boolean onlyResiduo) {
+        return createIntent(context, items, canRecoverUlAction, printerType, onlyResiduo, null);
+    }
+
+    public static Intent createIntent(Context context, List<MtbColt> items, RunnableArgsWithReturn<MtbColt, Boolean> canRecoverUlAction, PrinterRESTConsumer.Type printerType, boolean onlyResiduo, String reportName) {
         Intent myIntent = new Intent(context, ListaBancaliActivity.class);
 
         String mtbColtsKey = DataCache.addItem(items);
         myIntent.putExtra(Key.MtbColtsKey, mtbColtsKey);
 
-        String canRecoverULKey = DataCache.addItem(canRecoverUl);
+        String canRecoverULKey = DataCache.addItem(canRecoverUlAction);
         myIntent.putExtra(Key.CanRecoverUL, canRecoverULKey);
 
         String printerTypeKey = DataCache.addItem(printerType);
@@ -77,9 +68,13 @@ public class ListaBancaliActivity extends BaseActivity {
         String flagOnlyResiduoKey = DataCache.addItem(onlyResiduo);
         myIntent.putExtra(Key.FlagOnlyResiduo, flagOnlyResiduoKey);
 
+        String reportNameKey = DataCache.addItem(reportName);
+        myIntent.putExtra(Key.ReportName, reportNameKey);
+
         return myIntent;
     }
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -108,7 +103,7 @@ public class ListaBancaliActivity extends BaseActivity {
     }
 
     public void startContenutoBancaleActivity(MtbColt item){
-        Intent myIntent = ContenutoBancaleActivity.createIntent(this, item, mCanRecoverUl, mPrinterType, mReportName);
+        Intent myIntent = ContenutoBancaleActivity.createIntent(this, item, mCanRecoverUl.run(item), mPrinterType, mReportName);
         startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java

@@ -50,7 +50,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private FragmentMainBinding mBindings;
 
-    private Runnable mOnPreDestroy;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private LayoutInflater mLayoutInflater;
@@ -89,7 +89,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     @Override
     public void onDestroy() {
-        if (mOnPreDestroy != null) mOnPreDestroy.run();
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
         super.onDestroy();
     }
 
@@ -213,11 +215,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
-    }
-
 
     private void initGestMenu() {
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
@@ -257,4 +254,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         String appVersion = UtilityResources.getAppVersion();
         mBindings.currentAppVersionName.setText("v" + appVersion);
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/main/MenuListAdapter.java

@@ -2,13 +2,13 @@ package it.integry.integrywmsnative.gest.main;
 
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
@@ -42,7 +42,7 @@ public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHo
     // binds the data to the TextView in each cell
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.mIcon.setImageDrawable(mContext.getResources().getDrawable(mDataset.get(position).getTitleIcon(), null));
+        holder.mIcon.setImageDrawable(ResourcesCompat.getDrawable(mContext.getResources(), mDataset.get(position).getTitleIcon(), null));
         holder.mTitle.setText(mContext.getResources().getString(mDataset.get(position).getTitleText()));
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoComponent.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface OrdiniUscitaElencoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        OrdiniUscitaElencoComponent create();
+    }
+
+    void inject(OrdiniUscitaElencoFragment ordiniUscitaElencoFragment);
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoDTO.java

@@ -0,0 +1,24 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
+
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityReflections;
+
+public class OrdiniUscitaElencoDTO extends OrdineUscitaInevasoDTO {
+
+    private boolean hidden = false;
+
+    public static OrdiniUscitaElencoDTO fromParent(OrdineUscitaInevasoDTO parent) throws Exception {
+        OrdiniUscitaElencoDTO child = new OrdiniUscitaElencoDTO();
+        UtilityReflections.copy(parent, child);
+        return child;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    public OrdiniUscitaElencoDTO setHidden(boolean hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -0,0 +1,374 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.annimon.stream.ComparatorCompat;
+import com.annimon.stream.Stream;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+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.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
+import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
+import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
+import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.FragmentMainOrdiniUscitaBinding;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzato;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzatoViewModel;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoAdapter;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoListModel;
+import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+
+public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener {
+
+    public BindableBoolean fabVisible = new BindableBoolean(false);
+
+    @Inject
+    OrdiniUscitaElencoViewModel mViewModel;
+
+    private FragmentMainOrdiniUscitaBinding mBindings = null;
+
+    private final ObservableArrayList<OrdiniUscitaElencoListModel> mOrdiniInevasiMutableData = new ObservableArrayList<>();
+
+    private GestioneEnum mCurrentGestioneOrd = null;
+    private GestioneEnum mCurrentGestioneCol = null;
+    private int mCurrentSegnoCol = 0;
+    private Class<? extends BaseDialogRowInfoView> mDialogRowInfo;
+
+    private ElevatedToolbar mToolbar;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+
+    private int barcodeScannerIstanceID = -1;
+
+
+    public OrdiniUscitaElencoFragment() {
+        // Required empty public constructor
+    }
+
+    public static OrdiniUscitaElencoFragment newInstance(GestioneEnum gestioneOrd, GestioneEnum gestioneCol, int segnoCol, Class<? extends BaseDialogRowInfoView> dialogRowInfo) {
+        OrdiniUscitaElencoFragment fragment = new OrdiniUscitaElencoFragment();
+        Bundle args = new Bundle();
+
+        args.putString("gestioneOrd", gestioneOrd.getText());
+        args.putString("gestioneCol", gestioneCol != null ? gestioneCol.getText() : null);
+        args.putInt("segnoCol", segnoCol);
+
+        String keyDialogRowInfo = DataCache.addItem(dialogRowInfo);
+        args.putString("keyDialogRowInfo", keyDialogRowInfo);
+
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mCurrentGestioneOrd = GestioneEnum.fromString(getArguments().getString("gestioneOrd"));
+        String gestioneCol = getArguments().getString("gestioneCol");
+        mCurrentGestioneCol = gestioneCol != null ? GestioneEnum.fromString(gestioneCol) : null;
+        mCurrentSegnoCol = getArguments().getInt("segnoCol");
+
+        String keyDialogRowInfo = getArguments().getString("keyDialogRowInfo");
+        mDialogRowInfo = DataCache.retrieveItem(keyDialogRowInfo);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_ordini_uscita, container, false);
+
+        MainApplication.appComponent
+                .prodOrdineLavorazioneElencoComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
+
+        this.initRecyclerView();
+        this.initBarcodeReader();
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        mViewModel.init(codMdep, mCurrentGestioneOrd, mCurrentGestioneCol, mCurrentSegnoCol);
+    }
+
+    @Override
+    public void onDestroy() {
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+        super.onDestroy();
+    }
+
+    private void initRecyclerView() {
+
+        boolean canSelectMultipleOrdini = SettingsManager.iDB().isFlagSpedizioneCanSelectMultipleOrders();
+        boolean canSelectMultipleClienti = SettingsManager.iDB().isFlagMultiClienteOrdV();
+
+        this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), this::refreshList);
+
+        OrdiniUscitaElencoAdapter ordiniUscitaElencoAdapter =
+                new OrdiniUscitaElencoAdapter(getActivity(), mOrdiniInevasiMutableData)
+                        .setEmptyView(this.mBindings.ordiniVenditaEmptyView)
+                        .setOnGroupItemClicked(x -> {
+                            if(!canSelectMultipleClienti) {
+                                Stream.of(mOrdiniInevasiMutableData)
+                                        .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x) && y.getSelectedObservable().get())
+                                        .forEach(y -> y.getSelectedObservable().set(false));
+                            }
+
+                            boolean allSelected = Stream.of(mOrdiniInevasiMutableData)
+                                    .filter(y -> y.getGroupTitle().equalsIgnoreCase(x))
+                                    .allMatch(y -> y.getSelectedObservable().get());
+
+                            Stream.of(mOrdiniInevasiMutableData)
+                                    .filter(y -> y.getGroupTitle().equalsIgnoreCase(x))
+                                    .forEach(y -> y.getSelectedObservable().set(!allSelected));
+                        })
+                        .setOnItemChecked(x -> {
+                            if(!canSelectMultipleClienti && x.getSelectedObservable().get()) {
+                                Stream.of(mOrdiniInevasiMutableData)
+                                        .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x.getGroupTitle()) && y.getSelectedObservable().get())
+                                        .forEach(y -> y.getSelectedObservable().set(false));
+                            }
+
+                            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+                                    .anyMatch(y -> y.getSelectedObservable().get()));
+                        });
+
+        this.mBindings.venditaMainList.setAdapter(ordiniUscitaElencoAdapter);
+        this.mBindings.venditaMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        if(mToolbar != null)
+            mToolbar.setRecyclerView(this.mBindings.venditaMainList);
+    }
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanFailed(ex -> UtilityExceptions.defaultException(getActivity(), ex, false)));
+
+        BarcodeManager.enable();
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        BarcodeManager.disable();
+        this.openProgress();
+
+        this.mViewModel.processBarcodeDTO(data, () -> {
+            BarcodeManager.enable();
+            this.closeProgress();
+        });
+    };
+
+    private void refreshList(List<OrdiniUscitaElencoDTO> orderList) {
+        this.mOrdiniInevasiMutableData.clear();
+        this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(orderList));
+    }
+
+    private List<OrdiniUscitaElencoListModel> convertDataModelToListModel(List<OrdiniUscitaElencoDTO> dataList) {
+
+        ComparatorCompat<OrdiniUscitaElencoDTO> comparator = ComparatorCompat
+                .comparing(OrdiniUscitaElencoDTO::getRagSocOrd)
+                .thenComparing(ComparatorCompat.comparing(OrdiniUscitaElencoDTO::getNumOrd));
+
+        List<OrdiniUscitaElencoListModel> notHiddenElements = Stream.of(dataList)
+                .filter(x -> !x.isHidden())
+                .sorted(comparator)
+                .map(x -> {
+                    OrdiniUscitaElencoListModel listModel = new OrdiniUscitaElencoListModel();
+
+                    if (x.isFlagEvaso()) {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.mainGreen, null));
+                    } else if (x.isExistColloBoolean()) {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null));
+                    } else {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), android.R.color.transparent, null));
+                    }
+
+                    listModel.setGroupTitle(x.getRagSocOrd());
+
+                    String testataOrdString = String.format(getString(R.string.ord_ven_testata), String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                    listModel.setDescription(testataOrdString);
+
+                    listModel.setSubDescription(x.getRifOrd());
+
+                    String testataDataConsString = String.format(getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                    listModel.setRightDescription(testataDataConsString);
+
+                    listModel.setOriginalModel(x);
+
+                    return listModel;
+                })
+                .toList();
+
+        return notHiddenElements;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Stream.of(this.mOrdiniInevasiMutableData)
+                .forEach(x -> x.getSelectedObservable().set(false));
+    }
+
+    @Override
+    public void onPreDestroy(Runnable onComplete) {
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
+        onComplete.run();
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.prod_ordine_lavorazione_title_fragment).toString());
+    }
+
+
+    public void dispatchOrders() {
+        List<OrdiniUscitaElencoDTO> selectedOrders = Stream.of(this.mOrdiniInevasiMutableData)
+                .filter(x -> x.getSelectedObservable().get())
+                .map(OrdiniUscitaElencoListModel::getOriginalModel)
+                .toList();
+
+        this.mViewModel.loadPicking(selectedOrders);
+
+    }
+
+
+    @Override
+    public void onLoadingStarted() {
+        BarcodeManager.disable();
+        this.openProgress();
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.closeProgress();
+        BarcodeManager.enable();
+    }
+
+    @Override
+    public void onError(Exception ex) {
+        this.closeProgress();
+        UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+        BarcodeManager.enable();
+    }
+
+    @Override
+    public void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders) {
+        refreshList(filteredOrders);
+    }
+
+    @Override
+    public void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+        List<String> codMarts = Stream.of(sitArts)
+                .distinctBy(SitArtOrdDTO::getCodMart)
+                .map(SitArtOrdDTO::getCodMart)
+                .toList();
+
+        int alreadyRegisteredUL = alreadyRegisteredMtbColts.size();
+
+        DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
+                getText(R.string.orders).toString(),
+                Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size())
+                        + "<br />" +
+                        "<b>" + codMarts.size() + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size())
+                        + "<br />" +
+                        "<b>" + alreadyRegisteredUL + "</b> " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)),
+                null,
+                () -> SpedizioneActivity.startActivity(getActivity(), sitArts, orders, alreadyRegisteredMtbColts, mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT, mDialogRowInfo)
+        ).show();
+    }
+
+    @Override
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
+    }
+
+    @Override
+    public boolean isSelectAllButtonEnabled() {
+        return SettingsManager.iDB().isFlagMultiClienteOrdV();
+    }
+
+    @Override
+    public void onSelectAll() {
+        boolean allSelected = Stream.of(mOrdiniInevasiMutableData)
+                .allMatch(x -> x.getSelectedObservable().get());
+
+        Stream.of(mOrdiniInevasiMutableData)
+                .filter(x -> !x.getOriginalModel().isHidden())
+                .forEach(x -> x.getSelectedObservable().set(!allSelected));
+    }
+
+
+    private DialogVenditaFiltroAvanzatoViewModel mAppliedFilterViewModel;
+
+    @Override
+    public void onFilterClick() {
+        DialogVenditaFiltroAvanzato.make(
+                getActivity(),
+                this.mViewModel.getOrderList().getValue(),
+                mAppliedFilterViewModel,
+
+                (filteredOrderList, filter) -> {
+            mAppliedFilterViewModel = filter;
+
+            if(filteredOrderList != null){
+                refreshList(filteredOrderList);
+            }
+
+        }).show();
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoModule.java

@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.rest.OrdiniUscitaElencoRESTConsumer;
+
+@Module(subcomponents = OrdiniUscitaElencoComponent.class)
+public class OrdiniUscitaElencoModule {
+
+    @Singleton
+    @Provides
+    OrdiniUscitaElencoRESTConsumer providesOrdiniUscitaElencoRESTConsumer() {
+        return new OrdiniUscitaElencoRESTConsumer();
+    }
+
+    @Provides
+    OrdiniUscitaElencoViewModel providesProdOrdineLavorazioneElencoViewModel(OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, OrdiniUscitaElencoRESTConsumer ordiniUscitaElencoRESTConsumer) {
+        return new OrdiniUscitaElencoViewModel(ordiniRESTConsumer, colliMagazzinoRESTConsumer, barcodeRESTConsumer, ordiniUscitaElencoRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java

@@ -0,0 +1,297 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
+
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
+import it.integry.integrywmsnative.core.exception.InvalidLUMultiCodMdepException;
+import it.integry.integrywmsnative.core.exception.InvalidLUMultiGestioneException;
+import it.integry.integrywmsnative.core.exception.NoLUFoundException;
+import it.integry.integrywmsnative.core.exception.NoOrderFoundException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.DtbOrdt;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.rest.OrdiniUscitaElencoRESTConsumer;
+
+public class OrdiniUscitaElencoViewModel {
+
+    private final MutableLiveData<List<OrdiniUscitaElencoDTO>> mOrderList = new MutableLiveData<>();
+
+    private final OrdiniRESTConsumer mOrdiniRESTConsumer;
+    private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
+    private final OrdiniUscitaElencoRESTConsumer mOrdiniUscitaElencoRESTConsumer;
+
+    private Listener mListener;
+    private String mCurrentCodMdep;
+    private GestioneEnum mCurrentGestioneOrd;
+    private GestioneEnum mCurrentGestioneCol;
+    private int mCurrentSegnoCol;
+
+    @Inject
+    public OrdiniUscitaElencoViewModel(OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, OrdiniUscitaElencoRESTConsumer ordiniUscitaElencoRESTConsumer) {
+        this.mOrdiniRESTConsumer = ordiniRESTConsumer;
+        this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
+        this.mOrdiniUscitaElencoRESTConsumer = ordiniUscitaElencoRESTConsumer;
+    }
+
+
+    public void init(String currentCodMdep, GestioneEnum gestioneOrd, GestioneEnum gestioneCol, int segnoCol) {
+        this.mCurrentCodMdep = currentCodMdep;
+        this.mCurrentGestioneOrd = gestioneOrd;
+        this.mCurrentGestioneCol = gestioneCol;
+        this.mCurrentSegnoCol = segnoCol;
+
+        this.sendOnLoadingStarted();
+
+        new Thread(() -> {
+            Date loadingStartDate = new Date();
+
+            this.mOrdiniRESTConsumer.getOrdiniInevasi(this.mCurrentCodMdep, mCurrentGestioneOrd,
+                    ordiniLavorazione -> {
+                        this.mOrderList.postValue(Stream.of(ordiniLavorazione)
+                                .map(x -> {
+                                    try {
+                                        return OrdiniUscitaElencoDTO.fromParent(x);
+                                    } catch (Exception ex) {
+                                        return null;
+                                    }
+                                })
+                                .toList());
+
+                        long forcedDelaySecs = (new Date().getTime() - loadingStartDate.getTime()) / 1000;
+
+                        if(2 - forcedDelaySecs > 0) {
+                            try {
+                                Thread.sleep((2 - forcedDelaySecs) * 1000);
+                            } catch (Exception ignored) {
+                            }
+                        }
+
+                        this.sendOnLoadingEnded();
+                    }, this::sendError);
+        }).start();
+
+
+    }
+
+
+    public void loadPicking(List<OrdiniUscitaElencoDTO> selectedOrders) {
+        List<GestioneEnum> foundGestioni = Stream.of(selectedOrders)
+                .map(OrdineUscitaInevasoDTO::getGestioneEnum)
+                .withoutNulls()
+                .distinct()
+                .toList();
+
+        if(foundGestioni != null && foundGestioni.size() > 1) {
+            this.sendError(new InvalidLUMultiGestioneException());
+            return;
+        }
+
+
+        List<String> foundCodMdep = Stream.of(selectedOrders)
+                .map(OrdineUscitaInevasoDTO::getCodMdep)
+                .withoutNulls()
+                .distinct()
+                .toList();
+
+        if(foundCodMdep != null && foundCodMdep.size() > 1) {
+            this.sendError(new InvalidLUMultiCodMdepException());
+            return;
+        }
+
+
+        this.sendOnLoadingStarted();
+
+        List<OrdineUscitaInevasoDTO> selectedOrdersBase = Stream.of(selectedOrders)
+                .map(x -> (OrdineUscitaInevasoDTO) x)
+                .toList();
+
+        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrdersBase, sitArts -> {
+
+            this.mOrdiniRESTConsumer.getBancaliGiaRegistrati(
+                    Stream.of(selectedOrdersBase).map(x -> (OrdineInevasoDTO) x).toList(),
+                    mCurrentGestioneCol,
+                    mCurrentSegnoCol,
+                    mtbColtList -> {
+                        this.sendOnOrdersDispatched(selectedOrdersBase, sitArts, mtbColtList);
+
+                        this.sendOnLoadingEnded();
+                    }, this::sendError);
+        }, this::sendError);
+    }
+
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+        RunnableArgs<List<OrdiniUscitaElencoDTO>> onBarcodeScanComplete = orderList -> {
+            onComplete.run();
+            this.sendOnOrderFiltered(orderList);
+        };
+
+        if(UtilityBarcode.isBarcodeOrdineV(barcodeScanDTO)) {
+            this.executeEtichettaOrdineV(barcodeScanDTO.getStringValue(), onBarcodeScanComplete);
+        } else if(UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
+            this.executeEtichettaLU(barcodeScanDTO.getStringValue(), onBarcodeScanComplete);
+        } else if(UtilityBarcode.isEtichetta128(barcodeScanDTO)){
+            this.executeEtichettaEan128(barcodeScanDTO, onBarcodeScanComplete);
+        } else {
+            onComplete.run();
+        }
+    }
+
+
+
+    private void executeEtichettaOrdineV(String barcode, RunnableArgs<List<OrdiniUscitaElencoDTO>> onComplete) {
+        String gestione = "";
+
+        char c = barcode.charAt(0);
+        if (c == '1')
+            gestione = "A";
+        else if (c == '2')
+            gestione = "L";
+        else if (c == '3')
+            gestione = "V";
+
+        int numOrd = Integer.parseInt(UtilityString.mid(barcode, 10));
+
+        Date date = null;
+        try {
+            date = new SimpleDateFormat("ddMMyyyy")
+                    .parse(UtilityString.mid(barcode, 2, 8));
+        } catch (ParseException ex) {
+            this.sendError(ex);
+            return;
+        }
+
+
+        final String finalGestione = gestione;
+        final Date finalDate = date;
+
+        List<OrdiniUscitaElencoDTO> filteredOrders = Stream.of(mOrderList.getValue())
+                .filter(x -> x.getNumOrd() == numOrd && x.getGestione().equalsIgnoreCase(finalGestione) && x.getDataOrdD().equals(finalDate)).toList();
+
+        onComplete.run(filteredOrders);
+    }
+
+
+    private void executeEtichettaLU(String SSCC, RunnableArgs<List<OrdiniUscitaElencoDTO>> onComplete) {
+        this.mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
+
+            if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+
+                if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
+                    //GET BY COMMESSA COLLO
+                    this.mOrdiniUscitaElencoRESTConsumer.getOrdiniFromCommessaCollo(mCurrentCodMdep, mtbColt, orderList -> {
+
+                        if(orderList != null && orderList.size() > 0) {
+                            List<Integer> numOrds = Stream.of(orderList)
+                                    .map(DtbOrdt::getNumOrd)
+                                    .toList();
+
+                            List<OrdiniUscitaElencoDTO> filteredOrders = Stream.of(mOrderList.getValue())
+                                    .filter(x -> numOrds.contains(x.getNumOrd())).toList();
+
+                            onComplete.run(filteredOrders);
+                        } else {
+                            this.sendError(new NoOrderFoundException());
+                        }
+
+                    }, this::sendError);
+
+                } else {
+                    this.sendError(new InvalidLUGestioneException(GestioneEnum.VENDITA));
+                }
+
+            } else {
+                this.sendError(new NoLUFoundException());
+            }
+
+        }, this::sendError);
+    }
+
+
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, RunnableArgs<List<OrdiniUscitaElencoDTO>> onComplete) {
+        this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
+            String barcodeProd = null;
+
+            if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
+            if(!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
+            if(!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content;
+
+
+            if(!UtilityString.isNullOrEmpty(barcodeProd)) {
+
+                if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)){
+                    this.executeEtichettaLU(ean128Model.Sscc, onComplete);
+                } else {
+                    this.sendError(new NoLUFoundException());
+                }
+            } else {
+                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
+                this.sendError(new NoLUFoundException());
+            }
+        }, this::sendError);
+    }
+
+    public MutableLiveData<List<OrdiniUscitaElencoDTO>> getOrderList() {
+        return mOrderList;
+    }
+
+    public OrdiniUscitaElencoViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendOnOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders) {
+        if (this.mListener != null) mListener.onOrderFiltered(filteredOrders);
+    }
+
+    private void sendOnOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+        if (this.mListener != null) mListener.onOrdersDispatched(orders, sitArts, alreadyRegisteredMtbColts);
+    }
+
+    public interface Listener {
+        void onLoadingStarted();
+
+        void onLoadingEnded();
+
+        void onError(Exception ex);
+
+        void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders);
+
+        void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzato.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.vendita.dialogs;
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs;
 
 import android.app.DatePickerDialog;
 import android.content.Context;
@@ -28,19 +28,19 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 
 
 public class DialogVenditaFiltroAvanzato {
 
 
-    private AlertDialog currentAlert;
-    private Context currentContext;
+    private final AlertDialog currentAlert;
+    private final Context currentContext;
 
-    private RunnableArgss<List<OrdineVenditaInevasoDTO>, DialogVenditaFiltroAvanzatoViewModel> currentOnFilterDone;
+    private final RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> currentOnFilterDone;
 
-    private List<OrdineVenditaInevasoDTO> currentOrderList;
-    private List<OrdineVenditaInevasoDTO> currentFilteredOrderList;
+    private final List<OrdiniUscitaElencoDTO> currentOrderList;
+    private List<OrdiniUscitaElencoDTO> currentFilteredOrderList;
 
     private ArrayAdapter<String> arrayAdapterCodMdep;
     private ArrayAdapter<String> arrayAdapterIdViaggio;
@@ -51,30 +51,30 @@ public class DialogVenditaFiltroAvanzato {
     private ArrayAdapter<String> arrayAdapterAgente;
     private ArrayAdapter<String> arrayAdapterAutomezzo;
 
-    private Predicate<OrdineVenditaInevasoDTO> currentDepositoPredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentIdViaggioPredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentNumOrdsPredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentClientePredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentDataConsPredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentTermConsPredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentVettorePredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentAgentePredicate = null;
-    private Predicate<OrdineVenditaInevasoDTO> currentAutomezzoPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentDepositoPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentIdViaggioPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentNumOrdsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentClientePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentDataConsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentTermConsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentVettorePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentAgentePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentAutomezzoPredicate = null;
 
     private boolean firstInit = true;
 
-    public static AlertDialog make(final Context context, final List<OrdineVenditaInevasoDTO> ordersList, RunnableArgss<List<OrdineVenditaInevasoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+    public static AlertDialog make(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
         return new DialogVenditaFiltroAvanzato(context, ordersList, null, onDismiss).currentAlert;
     }
 
     public static AlertDialog make(final Context context,
-                                   final List<OrdineVenditaInevasoDTO> ordersList,
+                                   final List<OrdiniUscitaElencoDTO> ordersList,
                                    DialogVenditaFiltroAvanzatoViewModel baseViewModel,
-                                   RunnableArgss<List<OrdineVenditaInevasoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+                                   RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
         return new DialogVenditaFiltroAvanzato(context, ordersList, baseViewModel, onDismiss).currentAlert;
     }
 
-    private DialogVenditaFiltroAvanzato(final Context context, final List<OrdineVenditaInevasoDTO> ordersList, DialogVenditaFiltroAvanzatoViewModel baseViewModel, RunnableArgss<List<OrdineVenditaInevasoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+    private DialogVenditaFiltroAvanzato(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, DialogVenditaFiltroAvanzatoViewModel baseViewModel, RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
         currentContext = context;
         currentOrderList = ordersList;
         currentOnFilterDone = onDismiss;
@@ -456,7 +456,7 @@ public class DialogVenditaFiltroAvanzato {
         if(currentAgentePredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null && currentDepositoPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -484,7 +484,7 @@ public class DialogVenditaFiltroAvanzato {
         if(currentDepositoPredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -500,14 +500,14 @@ public class DialogVenditaFiltroAvanzato {
             currentFilteredOrderList = tmpStream.toList();
         }
 
-        return Stream.of(currentFilteredOrderList).map(OrdineVenditaInevasoDTO::getNomeAgente).distinct().withoutNulls().sorted().toList();
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getNomeAgente).distinct().withoutNulls().sorted().toList();
     }
 
     private List<String> getAvailableCodMdeps(boolean skipRecalc) {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -522,14 +522,14 @@ public class DialogVenditaFiltroAvanzato {
             currentFilteredOrderList = tmpStream.toList();
         }
 
-        return Stream.of(currentFilteredOrderList).map(OrdineVenditaInevasoDTO::getCodMdep).distinct().withoutNulls().sorted().toList();
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getCodMdep).distinct().withoutNulls().sorted().toList();
     }
 
     private List<String> getAvailableCliente(boolean skipRecalc) {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentDepositoPredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
@@ -544,14 +544,14 @@ public class DialogVenditaFiltroAvanzato {
             currentFilteredOrderList = tmpStream.toList();
         }
 
-        return Stream.of(currentFilteredOrderList).map(OrdineVenditaInevasoDTO::getRagSocOrd).distinct().withoutNulls().sorted().toList();
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getRagSocOrd).distinct().withoutNulls().sorted().toList();
     }
 
     private List<String> getAvailableNumOrds(boolean skipRecalc) {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentDepositoPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -573,7 +573,7 @@ public class DialogVenditaFiltroAvanzato {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -588,14 +588,14 @@ public class DialogVenditaFiltroAvanzato {
             currentFilteredOrderList = tmpStream.toList();
         }
 
-        return Stream.of(currentFilteredOrderList).map(OrdineVenditaInevasoDTO::getTermCons).distinct().withoutNulls().sorted().toList();
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getTermCons).distinct().withoutNulls().sorted().toList();
     }
 
     private List<String> getAvailableVettori(boolean skipRecalc) {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -617,7 +617,7 @@ public class DialogVenditaFiltroAvanzato {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else if(!skipRecalc){
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                     .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
@@ -632,7 +632,7 @@ public class DialogVenditaFiltroAvanzato {
             currentFilteredOrderList = tmpStream.toList();
         }
 
-        return Stream.of(currentFilteredOrderList).map(OrdineVenditaInevasoDTO::getDescrizioneAuto).distinct().withoutNulls().sorted().toList();
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getDescrizioneAuto).distinct().withoutNulls().sorted().toList();
     }
 
     private void refreshList() {
@@ -640,7 +640,7 @@ public class DialogVenditaFiltroAvanzato {
         if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
             currentFilteredOrderList = currentOrderList;
         } else {
-            Stream<OrdineVenditaInevasoDTO> tmpStream = Stream.of(currentOrderList)
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
                 .filter(x ->
                             (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
                             (currentClientePredicate == null || (currentClientePredicate.test(x))) &&

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.vendita.dialogs;
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs;
 
 import java.util.Date;
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java

@@ -0,0 +1,181 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.list;
+
+
+import android.content.Context;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.content.res.ResourcesCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.FragmentMainOrdiniUscitaListGroupModelBinding;
+import it.integry.integrywmsnative.databinding.FragmentMainOrdiniUscitaListModelBinding;
+
+public class OrdiniUscitaElencoAdapter extends SectionedRecyclerViewAdapter<OrdiniUscitaElencoAdapter.SubheaderHolder, OrdiniUscitaElencoAdapter.SingleItemViewHolder> {
+
+    private final Context mContext;
+    private final List<OrdiniUscitaElencoListModel> mDataset = new ArrayList<>();
+    private View mEmptyView;
+
+    private RunnableArgs<String> mOnGroupItemClicked;
+    private RunnableArgs<OrdiniUscitaElencoListModel> mOnItemChecked;
+
+    static class SubheaderHolder extends RecyclerView.ViewHolder {
+
+        FragmentMainOrdiniUscitaListModelBinding mBinding;
+
+        SubheaderHolder(FragmentMainOrdiniUscitaListModelBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+
+    }
+
+    static class SingleItemViewHolder extends RecyclerView.ViewHolder {
+
+        FragmentMainOrdiniUscitaListGroupModelBinding mBinding;
+
+        SingleItemViewHolder(FragmentMainOrdiniUscitaListGroupModelBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+    }
+
+    public OrdiniUscitaElencoAdapter(Context context, ObservableArrayList<OrdiniUscitaElencoListModel> mutableDataSet) {
+        this.mContext = context;
+
+        mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @Override
+            public void onChanged(ObservableList sender) {
+                mDataset.clear();
+                mDataset.addAll(sender);
+                notifyDataSetChanged();
+                notifyDataChanged();
+                checkIfEmpty();
+            }
+        });
+    }
+
+    public OrdiniUscitaElencoAdapter setOnGroupItemClicked(RunnableArgs<String> onGroupItemClicked) {
+        this.mOnGroupItemClicked = onGroupItemClicked;
+        return this;
+    }
+
+    public OrdiniUscitaElencoAdapter setOnItemChecked(RunnableArgs<OrdiniUscitaElencoListModel> onItemChecked) {
+        this.mOnItemChecked = onItemChecked;
+        return this;
+    }
+
+    public OrdiniUscitaElencoAdapter setEmptyView(View emptyView) {
+        this.mEmptyView = emptyView;
+        this.checkIfEmpty();
+        return this;
+    }
+
+    private void checkIfEmpty() {
+        if (mEmptyView != null) {
+            final boolean emptyViewVisible = getItemCount() == 0;
+            mEmptyView.setVisibility(emptyViewVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+
+    @Override
+    public OrdiniUscitaElencoAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
+        FragmentMainOrdiniUscitaListModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_main_ordini_uscita__list_model, parent, false);
+        return new OrdiniUscitaElencoAdapter.SubheaderHolder(binding);
+    }
+
+    @Override
+    public OrdiniUscitaElencoAdapter.SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        FragmentMainOrdiniUscitaListGroupModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_main_ordini_uscita__list_group_model, parent, false);
+        return new OrdiniUscitaElencoAdapter.SingleItemViewHolder(binding);
+    }
+
+    @Override
+    public void onBindSubheaderViewHolder(OrdiniUscitaElencoAdapter.SubheaderHolder subheaderHolder, int nextItemPosition) {
+        OrdiniUscitaElencoListModel pickingObjectDTO = this.mDataset.get(nextItemPosition);
+
+        subheaderHolder.mBinding.groupTitle.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getGroupTitle()) ? View.GONE : View.VISIBLE);
+        subheaderHolder.mBinding.groupTitle.setText(Html.fromHtml(pickingObjectDTO.getGroupTitle()));
+
+        subheaderHolder.mBinding.getRoot().setOnClickListener(new OnSingleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                if(mOnGroupItemClicked != null) mOnGroupItemClicked.run(pickingObjectDTO.getGroupTitle());
+            }
+        });
+    }
+
+    @Override
+    public void onBindItemViewHolder(final OrdiniUscitaElencoAdapter.SingleItemViewHolder holder, final int position) {
+        OrdiniUscitaElencoListModel listModel = this.mDataset.get(position);
+
+        listModel.getSelectedObservable().resetOnPropertyChangedCallback();
+
+        if(listModel.getEtichettaColor() != null)
+            holder.mBinding.emptyView.setBackgroundColor(listModel.getEtichettaColor());
+        else holder.mBinding.emptyView.setBackgroundColor(ResourcesCompat.getColor(mContext.getResources(), android.R.color.transparent, null));
+
+        if(!UtilityString.isNullOrEmpty(listModel.getDescription()))
+            holder.mBinding.descrizione.setText(Html.fromHtml(listModel.getDescription()));
+
+        if(!UtilityString.isNullOrEmpty(listModel.getSubDescription()))
+            holder.mBinding.subDescrizione.setText(Html.fromHtml(listModel.getSubDescription()));
+
+        if(!UtilityString.isNullOrEmpty(listModel.getRightDescription()))
+            holder.mBinding.rightDescrizione.setText(Html.fromHtml(listModel.getRightDescription()));
+
+        if(!UtilityString.isNullOrEmpty(listModel.getRightSubDescription()))
+            holder.mBinding.rightSubDescrizione.setText(Html.fromHtml(listModel.getRightSubDescription()));
+
+        holder.mBinding.setSelected(listModel.getSelectedObservable());
+        holder.mBinding.executePendingBindings();
+        holder.mBinding.checkbox.jumpDrawablesToCurrentState();
+
+        listModel.getSelectedObservable().addOnPropertyChangedCallback(() -> {
+            if(this.mOnItemChecked != null) this.mOnItemChecked.run(listModel);
+        });
+
+        holder.mBinding.getRoot().setOnClickListener(v -> {
+            listModel.getSelectedObservable().set(!listModel.getSelectedObservable().get());
+        });
+    }
+
+    @Override
+    public boolean onPlaceSubheaderBetweenItems(int position) {
+
+        if (getItemSize() == 1) return true;
+        else if (getItemSize() > 1) {
+            OrdiniUscitaElencoListModel compare1 = this.mDataset.get(position);
+            OrdiniUscitaElencoListModel compare2 = this.mDataset.get(position + 1);
+
+            if (UtilityString.equalsIgnoreCase(compare1.getGroupTitle(), compare2.getGroupTitle())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public int getItemSize() {
+        return mDataset.size();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoListModel.java

@@ -0,0 +1,100 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.list;
+
+import androidx.annotation.ColorInt;
+
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
+
+public class OrdiniUscitaElencoListModel implements Cloneable {
+    private String groupTitle;
+
+    private String description;
+    private String subDescription;
+    private String rightDescription;
+    private String rightSubDescription;
+
+    private @ColorInt Integer etichettaColor;
+
+    private boolean hidden;
+    private BindableBoolean selected = new BindableBoolean();
+
+
+    private OrdiniUscitaElencoDTO originalModel;
+
+
+    public String getGroupTitle() {
+        return groupTitle;
+    }
+
+    public OrdiniUscitaElencoListModel setGroupTitle(String groupTitle) {
+        this.groupTitle = groupTitle;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public OrdiniUscitaElencoListModel setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getSubDescription() {
+        return subDescription;
+    }
+
+    public OrdiniUscitaElencoListModel setSubDescription(String subDescription) {
+        this.subDescription = subDescription;
+        return this;
+    }
+
+    public String getRightDescription() {
+        return rightDescription;
+    }
+
+    public OrdiniUscitaElencoListModel setRightDescription(String rightDescription) {
+        this.rightDescription = rightDescription;
+        return this;
+    }
+
+    public String getRightSubDescription() {
+        return rightSubDescription;
+    }
+
+    public OrdiniUscitaElencoListModel setRightSubDescription(String rightSubDescription) {
+        this.rightSubDescription = rightSubDescription;
+        return this;
+    }
+
+    public @ColorInt Integer getEtichettaColor() {
+        return etichettaColor;
+    }
+
+    public OrdiniUscitaElencoListModel setEtichettaColor(@ColorInt Integer etichettaColor) {
+        this.etichettaColor = etichettaColor;
+        return this;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    public OrdiniUscitaElencoListModel setHidden(boolean hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+
+    public BindableBoolean getSelectedObservable() {
+        return selected;
+    }
+
+    public OrdiniUscitaElencoDTO getOriginalModel() {
+        return originalModel;
+    }
+
+    public OrdiniUscitaElencoListModel setOriginalModel(OrdiniUscitaElencoDTO originalModel) {
+        this.originalModel = originalModel;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumer.java

@@ -0,0 +1,45 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.rest;
+
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.DtbOrdt;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class OrdiniUscitaElencoRESTConsumer extends _BaseRESTConsumer {
+
+    public void getOrdiniFromCommessaCollo(String codMdep, MtbColt testataCollo, RunnableArgs<List<DtbOrdt>> onComplete, RunnableArgs<Exception> onFailed) {
+        OrdiniUscitaElencoRESTConsumerService service = RESTBuilder.getService(OrdiniUscitaElencoRESTConsumerService.class);
+        service.getOrdiniInCommessaCollo(
+                testataCollo.getDataColloS(),
+                testataCollo.getNumCollo(),
+                testataCollo.getSerCollo(),
+                testataCollo.getGestione(),
+                GestioneEnum.VENDITA.getText(),
+                codMdep)
+                .enqueue(new Callback<ServiceRESTResponse<List<DtbOrdt>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<DtbOrdt>>> call, Response<ServiceRESTResponse<List<DtbOrdt>>> response) {
+                        analyzeAnswer(response, "getOrdiniFromCommessaCollo", (m) -> {
+                            onComplete.run(response.body().getEntity());
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<DtbOrdt>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumerService.java

@@ -1,21 +1,14 @@
-package it.integry.integrywmsnative.gest.vendita.rest;
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.rest;
 
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbOrdt;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
-public interface OrdiniVenditaRESTConsumerService {
-
-    @GET("SM2GetOrdiniVenditaInevasi")
-    Call<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> listOrdiniInevasi(@Query("codMdep") String codMdep);
-
-    @GET("SM2GetOrdiniVenditaInevasi")
-    Call<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> listOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
+public interface OrdiniUscitaElencoRESTConsumerService {
 
     @GET("getOrdiniInCommCollo")
     Call<ServiceRESTResponse<List<DtbOrdt>>> getOrdiniInCommessaCollo(@Query("dataCollo") String dataCollo, @Query("numCollo") Integer numCollo, @Query("serCollo") String serCollo, @Query("gestioneCollo") String gestioneCollo, @Query("gestioneOrdine") String gestioneOrdine, @Query("codMdep") String codMdep);

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java

@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.gest.picking_libero;
 
 
-import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -20,6 +19,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.tfb.fbtoast.FBToast;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -31,6 +31,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
@@ -44,7 +45,6 @@ import it.integry.integrywmsnative.core.model.VtbDest;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding;
 import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter;
@@ -57,13 +57,13 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 /**
  * A simple {@link Fragment} subclass.
  */
-public class PickingLiberoFragment extends Fragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener {
+public class PickingLiberoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener {
 
     private FragmentPickingLiberoBinding mBindings;
 
@@ -75,7 +75,7 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
     public BindableBoolean thereIsAnyRowInUL = new BindableBoolean(false);
     public BindableBoolean thereIsAnOpenULWithoutRows = new BindableBoolean(false);
 
-    private Runnable mOnPreDestroy;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
     private AppCompatTextView mToolbarTitleText;
 
@@ -83,8 +83,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
 
     private int barcodeScannerIstanceID = -1;
 
-    private Dialog mCurrentProgress;
-
     private GestioneEnum mCurrentGestione;
 
     public PickingLiberoFragment() {
@@ -215,24 +213,12 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         this.mViewModel.closeLU(null);
     }
 
-
-    private void openProgress() {
-        if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-        }
-    }
-
-    private void closeProgress() {
-        if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
-        }
-    }
-
     @Override
-    public void onDestroyView() {
-        if (mOnPreDestroy != null) mOnPreDestroy.run();
-        super.onDestroyView();
+    public void onDestroy() {
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+        super.onDestroy();
     }
 
     @Override
@@ -240,11 +226,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
-    }
-
 
     @Override
     public void onLoadingStarted() {
@@ -309,10 +290,10 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
     }
 
     @Override
-    public void onLUClienteRequired(RunnableArgs<VtbDest> onComplete, Runnable onAbort) {
-        DialogAskCliente.makeBase(getActivity(), (status, result) -> {
+    public void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort) {
+        DialogAskCliente.makeBase(getActivity(), (status, result, codJcom) -> {
             if (status == DialogConsts.Results.YES) {
-                onComplete.run(result);
+                onComplete.run(result, codJcom);
             } else {
                 onAbort.run();
             }
@@ -365,7 +346,7 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2
+        DialogInputQuantityV2View
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
@@ -401,7 +382,13 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
 
     @Override
     public void onPreDestroy(Runnable onComplete) {
-        if(thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete);
         BarcodeManager.removeCallback(barcodeScannerIstanceID);
+        if(thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete);
+        else onComplete.run();
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java

@@ -6,9 +6,7 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Iterator;
 import java.util.List;
 
@@ -181,15 +179,15 @@ public class PickingLiberoViewModel {
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
         if (this.mFlagAskCliente) {
-            this.sendLUClienteRequired(vtbDest -> {
-                createNewLU_PostClienteAsk(customNumCollo, customSerCollo, vtbDest, onComplete);
+            this.sendLUClienteRequired((vtbDest, codJcom) -> {
+                createNewLU_PostClienteAsk(customNumCollo, customSerCollo, vtbDest, codJcom, onComplete);
             }, onComplete);
         } else {
-            createNewLU_PostClienteAsk(customNumCollo, customSerCollo, null, onComplete);
+            createNewLU_PostClienteAsk(customNumCollo, customSerCollo, null, null, onComplete);
         }
     }
 
-    private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
+    private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJcom, Runnable onComplete) {
         MtbColt mtbColt = new MtbColt();
         mtbColt.initDefaultFields();
         mtbColt.setGestione(mDefaultGestione)
@@ -211,6 +209,10 @@ public class PickingLiberoViewModel {
             mtbColt.setCodVdes(vtbDest.getCodVdes());
         }
 
+        if(!UtilityString.isNullOrEmpty(codJcom)) {
+            mtbColt.setCodJcom(codJcom);
+        }
+
         mColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> {
             mtbColt
                     .setNumCollo(value.getNumCollo())
@@ -233,9 +235,9 @@ public class PickingLiberoViewModel {
         BigDecimal qtaColDaPrelevare = null;
         BigDecimal qtaCnfDaPrelevare = null;
 
-        BigDecimal initialNumCnf = null;
-        BigDecimal initialQtaCnf = null;
-        BigDecimal initialQtaTot = null;
+        BigDecimal initialNumCnf;
+        BigDecimal initialQtaCnf;
+        BigDecimal initialQtaTot;
 
         String partitaMag = null;
         Date dataScad = null;
@@ -510,7 +512,7 @@ public class PickingLiberoViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
@@ -758,7 +760,7 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onMtbColrDeleteRequest(onComplete);
     }
 
-    private void sendLUClienteRequired(RunnableArgs<VtbDest> onComplete, Runnable onAbort) {
+    private void sendLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort) {
         if (this.mListener != null) mListener.onLUClienteRequired(onComplete, onAbort);
     }
 
@@ -816,7 +818,7 @@ public class PickingLiberoViewModel {
 
         void onError(Exception ex);
 
-        void onLUClienteRequired(RunnableArgs<VtbDest> onComplete, Runnable onAbort);
+        void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort);
 
         void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
 

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java

@@ -50,7 +50,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 
@@ -309,7 +309,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 .setCanLUBeClosed(false)
                 .setCanPartitaMagBeChanged(false);
 
-        DialogInputQuantityV2
+        DialogInputQuantityV2View
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiModule.java

@@ -16,8 +16,8 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 public class PickingResiModule {
 
     @Provides
-    PickingResiRESTConsumer providesPickingResiRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new PickingResiRESTConsumer(systemRESTConsumer);
+    PickingResiRESTConsumer providesPickingResiRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new PickingResiRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java

@@ -378,7 +378,7 @@ public class PickingResiViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(withdrawableDtbDocr.getMtbAart().getUntMis())
                     .setMtbAart(withdrawableDtbDocr.getMtbAart());
 

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -105,8 +106,8 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingResiListModel.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
-        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingResiListModel.isActive() ? R.color.gray_600 : R.color.green_700));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingResiListModel.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingResiListModel.getDescrizione());
         holder.mBinding.descrizione.setTextColor(pickingResiListModel.isDescrizionePresente() ? Color.BLACK : Color.GRAY);

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java

@@ -15,7 +15,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.DtbDocr;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
@@ -25,10 +24,12 @@ public class PickingResiRESTConsumer {
 
 
     private final SystemRESTConsumer mSystemRestConsumer;
+    private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
     @Inject
-    public PickingResiRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    public PickingResiRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
         this.mSystemRestConsumer = systemRESTConsumer;
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
     }
 
     public void loadDocRows(List<DocumentoResoDTO> documents, RunnableArgs<ArrayList<WithdrawableDtbDocr>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -53,9 +54,7 @@ public class PickingResiRESTConsumer {
 
 
         Type typeOfObjectsList = new TypeToken<ArrayList<WithdrawableDtbDocr>>() {}.getType();
-        this.mSystemRestConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<WithdrawableDtbDocr>>() {
-            @Override
-            public void onSuccess(ArrayList<WithdrawableDtbDocr> values) {
+        this.mSystemRestConsumer.<ArrayList<WithdrawableDtbDocr>>processSql(sql, typeOfObjectsList, values -> {
 
                 if(values != null && values.size() > 0){
                     List<String> codMarts = Stream.of(values)
@@ -64,7 +63,7 @@ public class PickingResiRESTConsumer {
                             .distinct()
                             .toList();
 
-                    ArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+                    mArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
 
                         if(arts != null && arts.size() > 0) {
                             for (DtbDocr value : values) {
@@ -90,13 +89,7 @@ public class PickingResiRESTConsumer {
                 } else {
                     if(onComplete != null) onComplete.run(values);
                 }
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
+            }, onFailed);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java

@@ -48,7 +48,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
  */
 public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
 
-    private Runnable mOnPreDestroy;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private FragmentProdOrdineProduzioneElencoBinding mBinding;
@@ -102,6 +102,15 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         return mBinding.getRoot();
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+    }
+
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         mAppBarTitle = titleText;
@@ -138,12 +147,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
-    }
-
-
     private void initRecyclerView() {
         mAdapter = new OrdineProduzioneListAdapter(getActivity(), mRenderedOrderList, onSingleSelectionChanged);
         mBinding.ordineProduzioneMainList.setAdapter(mAdapter);
@@ -246,4 +249,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         mRenderedOrderList.clear();
         mRenderedOrderList.addAll(ordini);
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdFabbisognoLineeProdComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ProdFabbisognoLineeProdComponent create();
+    }
+
+    void inject(ProdFabbisognoLineeProdFragment prodFabbisognoLineeProdFragment);
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java

@@ -0,0 +1,169 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
+import com.annimon.stream.Stream;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBinding;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaView;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdView;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link ProdFabbisognoLineeProdFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ProdFabbisognoLineeProdViewModel.Listener {
+
+    @Inject
+    ProdFabbisognoLineeProdViewModel mViewModel;
+
+    private final ArrayList<Runnable> mOnPreDestroyList = new ArrayList<>();
+
+    private FragmentProdFabbisognoLineeProdBinding mBindings;
+
+    public ProdFabbisognoLineeProdFragment() {
+        // Required empty public constructor
+    }
+
+    public static ProdFabbisognoLineeProdFragment newInstance() {
+        ProdFabbisognoLineeProdFragment fragment = new ProdFabbisognoLineeProdFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_fabbisogno_linee_prod, container, false);
+
+        mBindings.setLifecycleOwner(this);
+
+        MainApplication.appComponent
+                .prodFabbisognoLineeProdComponent()
+                .create()
+                .inject(this);
+
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        this.mViewModel.setListener(this);
+
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
+        DialogAskMagazzinoProssimitaView
+                .newInstance((jtbFase, startDate, endDate) -> {
+//                    if (jtbFase == null) {
+//                        ((IPoppableActivity) getActivity()).pop();
+//                    } else {
+                        //Load fabbisogno
+                        this.mViewModel.loadFabbisogno(startDate, endDate, codMdep, this::startPickingActivity);
+//                    }
+                })
+                .show(getActivity().getSupportFragmentManager(), "tag");
+    }
+
+
+    @Override
+    public void onDestroy() {
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.prod_fabbisogno_linee_prod_title).toString());
+    }
+
+
+    @Override
+    public void onError(Exception ex) {
+        this.closeProgress();
+        UtilityExceptions.defaultException(getActivity(), ex);
+    }
+
+    @Override
+    public void onLoadingStarted() {
+        this.openProgress();
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.closeProgress();
+    }
+
+
+    private void startPickingActivity(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
+        List<SitArtOrdDTO> sitArtOrdDTOS = Stream.of(fabbisognoList)
+                .map(x -> {
+                    SitArtOrdDTO sitArtOrdDTO = new SitArtOrdDTO()
+                            .setCodMart(x.getCodMart())
+                            .setCodMdep(codMdep)
+                            .setQtaOrd(x.getQtaFabbisogno())
+                            .setNumCnfOrd(x.getNumCnfFabbisogno())
+                            .setFlagEnablePickManuale(false);
+
+                    sitArtOrdDTO.getExtraInfo().put("dataInizio", x.getDataInizio());
+                    sitArtOrdDTO.getExtraInfo().put("dataFine", x.getDataFine());
+
+                    return sitArtOrdDTO;
+                })
+                .toList();
+
+        SpedizioneActivity.startActivity(getActivity(),
+                sitArtOrdDTOS,
+                null,
+                new ArrayList<>(),
+                GestioneEnum.LAVORAZIONE,
+                +1,
+                MtbColr.Causale.VERSAMENTO,
+                DialogRowInfoProdFabbisognoLineeProdView.class);
+
+        ((IPoppableActivity) getActivity()).pop();
+
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdModule.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+
+@Module(subcomponents = ProdFabbisognoLineeProdComponent.class)
+public class ProdFabbisognoLineeProdModule {
+
+    @Provides
+    ProdFabbisognoLineeProdViewModel providesProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+        return new ProdFabbisognoLineeProdViewModel(prodFabbisognoLineeProdRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java

@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
+
+import com.annimon.stream.Stream;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+
+public class ProdFabbisognoLineeProdViewModel {
+
+    private final ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer;
+
+    private Listener mListener;
+
+    public ProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+        this.mProdFabbisognoLineeProdRESTConsumer = prodFabbisognoLineeProdRESTConsumer;
+    }
+
+    public void init() {
+
+    }
+
+
+    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
+        this.sendOnLoadingStarted();
+
+        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(startDate, endDate, codMdep, jtbFasi -> {
+            if (jtbFasi != null) Stream.of(jtbFasi)
+                    .forEach(x -> x
+                            .setDataInizio(startDate)
+                            .setDataFine(endDate));
+
+            this.sendOnLoadingEnded();
+            onComplete.run(jtbFasi);
+        }, this::sendError);
+    }
+
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaAdapter.java

@@ -0,0 +1,114 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Filter;
+import android.widget.Filterable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.model.JtbFasi;
+
+public class DialogAskMagazzinoProssimitaAdapter extends ArrayAdapter<JtbFasi> implements Filterable {
+
+    private final Context mContext;
+    private final List<JtbFasi> mDataset;
+    private List<JtbFasi> mDatasetAllItems;
+
+    private final ListFilter listFilter = new ListFilter();
+
+    public DialogAskMagazzinoProssimitaAdapter(@NonNull Context context, @NonNull List<JtbFasi> list) {
+        super(context, 0, list);
+        mContext = context;
+        mDataset = list;
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+        View listItem = convertView;
+        if (listItem == null) {
+            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item, parent, false);
+        }
+
+        if (position < mDataset.size()) {
+            AppCompatTextView textView = listItem.findViewById(R.id.text);
+            textView.setText(mDataset.get(position).toString());
+            return listItem;
+        }
+
+        return null;
+    }
+
+
+
+
+    @NonNull
+    @Override
+    public Filter getFilter() {
+        return listFilter;
+    }
+
+    public class ListFilter extends Filter {
+        private Object lock = new Object();
+
+        @Override
+        protected FilterResults performFiltering(CharSequence prefix) {
+            FilterResults results = new FilterResults();
+            if (mDatasetAllItems == null) {
+                synchronized (lock) {
+                    mDatasetAllItems = new ArrayList<>(mDataset);
+                }
+            }
+
+            if (prefix == null || prefix.length() == 0) {
+                synchronized (lock) {
+                    results.values = mDatasetAllItems;
+                    results.count = mDatasetAllItems.size();
+                }
+            } else {
+                final String searchStrLowerCase = prefix.toString().toLowerCase();
+
+                ArrayList<JtbFasi> matchValues = new ArrayList<>();
+
+                for (JtbFasi dataItem : mDatasetAllItems) {
+                    if (dataItem.getCodJfas().toLowerCase().startsWith(searchStrLowerCase) ||
+                            dataItem.getDescrizione().toLowerCase().startsWith(searchStrLowerCase)) {
+                        matchValues.add(dataItem);
+                    }
+                }
+
+                results.values = matchValues;
+                results.count = matchValues.size();
+            }
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            if (results.values != null) {
+                mDataset.clear();
+                mDataset.addAll((ArrayList<JtbFasi>) results.values);
+            } else {
+                mDataset.clear();
+            }
+            if (results.count > 0) {
+                notifyDataSetChanged();
+            } else {
+                notifyDataSetInvalidated();
+            }
+        }
+
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaComponent.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskMagazzinoProssimitaComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskMagazzinoProssimitaComponent create();
+    }
+
+    void inject(DialogAskMagazzinoProssimitaView dialogAskMagazzinoProssimitaView);
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaModule.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+
+@Module
+public class DialogAskMagazzinoProssimitaModule {
+
+    @Provides
+    DialogAskMagazzinoProssimitaViewModel providesDialogAskMagazzinoProssimitaViewModel(SystemRESTConsumer systemRESTConsumer) {
+        return new DialogAskMagazzinoProssimitaViewModel(systemRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java

@@ -0,0 +1,197 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita;
+
+import android.app.DatePickerDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+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 java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
+import it.integry.integrywmsnative.core.model.JtbFasi;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.DialogAskMagazzinoProssimitaBinding;
+
+public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment implements DialogAskMagazzinoProssimitaViewModel.Listener {
+
+    @Inject
+    DialogAskMagazzinoProssimitaViewModel mViewModel;
+
+    private final RunnableArgsss<JtbFasi, Date, Date> mOnItemSelected;
+
+    private Context mContext;
+    private DialogAskMagazzinoProssimitaBinding mBindings;
+
+//    private JtbFasi mSelectedItem;
+
+    public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
+        return new DialogAskMagazzinoProssimitaView(onItemSelected);
+    }
+
+
+    private DialogAskMagazzinoProssimitaView(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
+        super();
+
+        this.mOnItemSelected = onItemSelected;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mContext = getActivity();
+
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_magazzino_prossimita, container, false);
+
+        MainApplication.appComponent
+                .dialogAskMagazzinoProssimitaComponent()
+                .create()
+                .inject(this);
+
+        mBindings.setView(this);
+        mBindings.setViewmodel(this.mViewModel);
+
+        getDialog().setCanceledOnTouchOutside(false);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+
+        mBindings.buttonConfirm.setOnClickListener(new OnSingleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+//                if(mSelectedItem != null) {
+                    getDialog().dismiss();
+//                } else {
+//                    FBToast.warningToast(mContext, getResources().getString(R.string.please_select_an_item), Toast.LENGTH_LONG);
+//                }
+            }
+        });
+
+        mBindings.buttonAbort.setOnClickListener(new OnSingleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                getDialog().dismiss();
+            }
+        });
+
+        mBindings.filledExposedDropdownStartDate.setOnClickListener(onStartDateClickListener);
+        mBindings.filledExposedDropdownEndDate.setOnClickListener(onEndDateClickListener);
+
+        return mBindings.getRoot();
+    }
+
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
+        this.mViewModel.setListener(this);
+        this.mViewModel.init(codMdep);
+
+//        this.mViewModel.getJtbFasi().observe(getViewLifecycleOwner(), this::onPosizioniLoaded);
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
+    }
+
+    private final View.OnClickListener onStartDateClickListener = new OnSingleClickListener() {
+        @Override
+        public void onSingleClick(View v) {
+            Calendar c = UtilityDate.getCalendarInstance();
+
+
+            if(mViewModel.startDateBindable != null) {
+                c.setTime(mViewModel.startDate);
+            }
+
+            int mYear = c.get(Calendar.YEAR);
+            int mMonth = c.get(Calendar.MONTH);
+            int mDay = c.get(Calendar.DAY_OF_MONTH);
+
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(),
+                    (view2, year, month, day) -> {
+
+                        mViewModel.startDate = new GregorianCalendar(year, month, day).getTime();
+                        mViewModel.startDateBindable.set(UtilityDate.formatDate(mViewModel.startDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+                    }, mYear, mMonth, mDay);
+            datePickerDialog.show();
+        }
+    };
+
+    private final View.OnClickListener onEndDateClickListener = new OnSingleClickListener() {
+        @Override
+        public void onSingleClick(View v) {
+            Calendar c = UtilityDate.getCalendarInstance();
+
+            if(mViewModel.endDateBindable != null) {
+                c.setTime(mViewModel.endDate);
+            }
+
+            int mYear = c.get(Calendar.YEAR);
+            int mMonth = c.get(Calendar.MONTH);
+            int mDay = c.get(Calendar.DAY_OF_MONTH);
+
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(),
+                    (view2, year, month, day) -> {
+
+                        mViewModel.endDate = new GregorianCalendar(year, month, day).getTime();
+                        mViewModel.endDateBindable.set(UtilityDate.formatDate(mViewModel.endDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+                    }, mYear, mMonth, mDay);
+            datePickerDialog.show();
+        }
+    };
+
+
+//    private void onPosizioniLoaded(List<JtbFasi> items) {
+//        DialogAskMagazzinoProssimitaAdapter adapter = new DialogAskMagazzinoProssimitaAdapter(mContext, items);
+//
+//        AutoCompleteTextView editTextDropdownCliente = mBindings.dropdownLineaProd;
+//        editTextDropdownCliente.setThreshold(0);
+//        editTextDropdownCliente.setAdapter(adapter);
+//        editTextDropdownCliente.setOnItemClickListener((parent, view, position, id) -> {
+//            mSelectedItem = items.get(position);
+//        });
+//    }
+
+    @Override
+    public void onError(Exception ex) {
+        this.closeProgress();
+        UtilityExceptions.defaultException(mContext, ex);
+        BarcodeManager.enable();
+    }
+
+    @Override
+    public void onLoadingStarted() {
+        this.openProgress();
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.closeProgress();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaViewModel.java

@@ -0,0 +1,95 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita;
+
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.JtbFasi;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class DialogAskMagazzinoProssimitaViewModel {
+
+    public BindableString startDateBindable = new BindableString();
+    public BindableString endDateBindable = new BindableString();
+
+    public Date startDate = new Date();
+    public Date endDate = new Date();
+
+    private Listener mListener;
+
+    private final MutableLiveData<List<JtbFasi>> mJtbFasi = new MutableLiveData<>();
+
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public DialogAskMagazzinoProssimitaViewModel(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
+
+    public void init(String codMdep) {
+
+        Calendar c = UtilityDate.getCalendarInstance();
+        c.set(Calendar.DAY_OF_WEEK, c.getActualMinimum(Calendar.DAY_OF_WEEK));
+        c.add(Calendar.DAY_OF_MONTH, -7);
+        startDate = c.getTime();
+        startDateBindable.set(UtilityDate.formatDate(startDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+        c.add(Calendar.DAY_OF_MONTH, 7);
+        endDate = c.getTime();
+        endDateBindable.set(UtilityDate.formatDate(endDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+//        this.sendOnLoadingStarted();
+//
+//        String sql = "SELECT DISTINCT jrl_fase_posizioni.posizione as cod_jfas, " +
+//                "                descrizione, " +
+//                "                jrl_fase_posizioni.cod_mdep " +
+//                "FROM jrl_fase_posizioni " +
+//                "         INNER JOIN mtb_depo_posizioni mdp ON jrl_fase_posizioni.cod_mdep = mdp.cod_mdep AND " +
+//                "                                              jrl_fase_posizioni.posizione = mdp.posizione " +
+//                "WHERE cod_jfas IN (SELECT cod_jfas FROM jtb_fasi WHERE um_prod IS NOT NULL) " +
+//                "  AND jrl_fase_posizioni.cod_mdep = " + UtilityDB.valueToString(codMdep) + " " +
+//                "ORDER BY jrl_fase_posizioni.posizione";
+//
+//
+//        Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {}.getType();
+//        this.mSystemRESTConsumer.<List<JtbFasi>>processSql(sql, typeOfObjectsList, jtbFasi -> {
+//            this.mJtbFasi.postValue(jtbFasi);
+//
+//            this.sendOnLoadingEnded();
+//        }, this::sendError);
+    }
+
+
+
+//    public MutableLiveData<List<JtbFasi>> getJtbFasi() {
+//        return mJtbFasi;
+//    }
+
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java

@@ -0,0 +1,121 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ProdFabbisognoLineeProdDTO {
+
+    private String codMart;
+    private String codJfas;
+    private BigDecimal qtaOrd;
+    private BigDecimal numCnfOrd;
+    private String untMis;
+    private BigDecimal qtaColVersata;
+    private BigDecimal numCnfVersata;
+    private BigDecimal qtaFabbisogno;
+    private BigDecimal numCnfFabbisogno;
+    private Date dataInizio;
+    private Date dataFine;
+
+    public ProdFabbisognoLineeProdDTO() {
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ProdFabbisognoLineeProdDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdFabbisognoLineeProdDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public BigDecimal getQtaOrd() {
+        return qtaOrd;
+    }
+
+    public ProdFabbisognoLineeProdDTO setQtaOrd(BigDecimal qtaOrd) {
+        this.qtaOrd = qtaOrd;
+        return this;
+    }
+
+    public BigDecimal getNumCnfOrd() {
+        return numCnfOrd;
+    }
+
+    public ProdFabbisognoLineeProdDTO setNumCnfOrd(BigDecimal numCnfOrd) {
+        this.numCnfOrd = numCnfOrd;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public ProdFabbisognoLineeProdDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public BigDecimal getQtaColVersata() {
+        return qtaColVersata;
+    }
+
+    public ProdFabbisognoLineeProdDTO setQtaColVersata(BigDecimal qtaColVersata) {
+        this.qtaColVersata = qtaColVersata;
+        return this;
+    }
+
+    public BigDecimal getNumCnfVersata() {
+        return numCnfVersata;
+    }
+
+    public ProdFabbisognoLineeProdDTO setNumCnfVersata(BigDecimal numCnfVersata) {
+        this.numCnfVersata = numCnfVersata;
+        return this;
+    }
+
+    public BigDecimal getQtaFabbisogno() {
+        return qtaFabbisogno;
+    }
+
+    public ProdFabbisognoLineeProdDTO setQtaFabbisogno(BigDecimal qtaFabbisogno) {
+        this.qtaFabbisogno = qtaFabbisogno;
+        return this;
+    }
+
+    public BigDecimal getNumCnfFabbisogno() {
+        return numCnfFabbisogno;
+    }
+
+    public ProdFabbisognoLineeProdDTO setNumCnfFabbisogno(BigDecimal numCnfFabbisogno) {
+        this.numCnfFabbisogno = numCnfFabbisogno;
+        return this;
+    }
+
+    public Date getDataInizio() {
+        return dataInizio;
+    }
+
+    public ProdFabbisognoLineeProdDTO setDataInizio(Date dataInizio) {
+        this.dataInizio = dataInizio;
+        return this;
+    }
+
+    public Date getDataFine() {
+        return dataFine;
+    }
+
+    public ProdFabbisognoLineeProdDTO setDataFine(Date dataFine) {
+        this.dataFine = dataFine;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java

@@ -0,0 +1,402 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
+
+import com.google.gson.reflect.TypeToken;
+
+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.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+
+@Singleton
+public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
+
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public ProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
+
+
+    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "WITH input_values AS ( " +
+                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
+                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
+//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
+                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
+                " withdraw_mtb_colr AS ( " +
+                "         SELECT cod_mart, " +
+                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
+                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
+                "                mtb_colr.data_ord, " +
+                "                mtb_colr.num_ord, " +
+                "                mtb_colr.gestione " +
+                "         FROM mtb_colr " +
+                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
+                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
+                "         WHERE segno = -1 " +
+                "           AND cod_dtip IS NULL " +
+                "         GROUP BY cod_mart, " +
+                "                  mtb_colr.data_ord, " +
+                "                  mtb_colr.num_ord, " +
+                "                  mtb_colr.gestione " +
+                "     ), " +
+                "     custom_mtb_colr AS (SELECT cod_mart, " +
+                "                                SUM(qta_col) AS qta_col, " +
+                "                                SUM(num_cnf) AS num_cnf, " +
+                "                                posizione " +
+                "                         FROM mvw_sitart_udc_det_inventario " +
+                "                         GROUP BY cod_mart, posizione), " +
+                "     grouped_ord AS ( " +
+                "         SELECT dtb_ordr.cod_mart, " +
+                "                dtb_ordt.cod_jfas, " +
+                "                dtb_ordt.cod_mdep, " +
+                "                dtb_ordt.gestione, " +
+                "                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) - " +
+                "                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord, " +
+                "                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord, " +
+                "                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata, " +
+                "                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata " +
+                "         FROM dtb_ordr " +
+                "                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND " +
+                "                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND " +
+                "                                         dtb_ordr.num_ord = dtb_ordt.num_ord " +
+                "                  LEFT OUTER JOIN withdraw_mtb_colr " +
+                "                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND " +
+                "                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND " +
+                "                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND " +
+                "                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart " +
+                "                  CROSS APPLY input_values " +
+                "         WHERE dtb_ordt.gestione = 'L' " +
+                "           AND flag_evaso = 'I' " +
+                "           AND dtb_ordr.flag_evaso_forzato = 'N' " +
+                "           AND flag_annulla = 'N' " +
+                "           AND dtb_ordt.cod_mdep = input_values.cod_mdep " +
+                "           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine " +
+                "         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione " +
+                "     ), " +
+                "     tmp_ord AS (SELECT grouped_ord.cod_mart, " +
+                "                        mtb_aart.unt_mis, " +
+                "                        grouped_ord.cod_jfas, " +
+                "                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord, " +
+                "                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord " +
+                "                 FROM grouped_ord " +
+                "                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart " +
+                "                          CROSS APPLY input_values " +
+                "                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas " +
+                "     ), " +
+                "     ord_without_positioned_mtb_colt AS ( " +
+                "         SELECT tmp_ord.cod_mart, " +
+                "                tmp_ord.cod_jfas, " +
+                "                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione, " +
+                "                unt_mis, " +
+                "                qta_ord                                                      AS qta_ord_calc, " +
+                "                num_cnf_ord                                                  AS num_cnf_ord_calc, " +
+                "                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata, " +
+                "                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata, " +
+                "                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno, " +
+                "                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno " +
+                "         FROM tmp_ord " +
+                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
+                "             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione " +
+                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
+                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
+                "                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione " +
+                " " +
+                "         UNION ALL " +
+                " " +
+                "         SELECT DISTINCT tmp_ord.cod_mart, " +
+                "                         null                                        AS cod_jfas, " +
+                "                         jrl_fase_posizioni.posizione, " +
+                "                         unt_mis, " +
+                "                         0                                           AS qta_ord_calc, " +
+                "                         0                                           AS num_cnf_ord_calc, " +
+                "                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata, " +
+                "                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata, " +
+                "                         0                                           AS qta_fabbisogno, " +
+                "                         0                                           AS num_cnf_fabbisogno " +
+                "         FROM tmp_ord " +
+                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
+                "             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione " +
+                " " +
+                " " +
+                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
+                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
+                "                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione " +
+                "     ) " +
+                "SELECT cod_mart, " +
+                "       unt_mis, " +
+                "       input_values.data_inizio, " +
+                "       input_values.data_fine, " +
+                "       SUM(qta_ord_calc)                               AS qta_ord, " +
+                "       SUM(num_cnf_ord_calc)                           AS num_cnf_ord, " +
+                "       SUM(qta_gia_posizionata)                        AS qta_col_versata, " +
+                "       SUM(num_cnf_gia_posizionata)                    AS num_cnf_versata, " +
+                "       SUM(qta_ord_calc - qta_gia_posizionata)         AS qta_fabbisogno, " +
+                "       SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) AS num_cnf_fabbisogno " +
+                "FROM ord_without_positioned_mtb_colt " +
+                "CROSS APPLY input_values " +
+                "GROUP BY cod_mart, unt_mis, input_values.data_inizio, input_values.data_fine " +
+                "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 " +
+                "ORDER BY cod_mart";
+
+
+
+        /*
+        * Query splittata per cod_jfas (più pesante)
+        WITH input_values AS (SELECT '2021-02-15' AS data_inizio,
+                             '2021-02-28' AS data_fine,
+                             --'SC06'     AS linea_prod,
+                             '34'         AS cod_mdep),
+     withdraw_mtb_colr AS (
+         SELECT cod_mart,
+                SUM(ISNULL(qta_col, 0)) as qta_col,
+                SUM(ISNULL(num_cnf, 0)) as num_cnf,
+                mtb_colr.data_ord,
+                mtb_colr.num_ord,
+                mtb_colr.gestione
+         FROM mtb_colr
+                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and
+                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo
+         WHERE segno = -1
+           and cod_dtip IS NULL
+         GROUP BY cod_mart,
+                  mtb_colr.data_ord,
+                  mtb_colr.num_ord,
+                  mtb_colr.gestione
+     ),
+     custom_mtb_colr AS (SELECT cod_mart,
+                                SUM(qta_col) AS qta_col,
+                                SUM(num_cnf) AS num_cnf,
+                                posizione
+                         FROM mvw_sitart_udc_det_inventario
+                         GROUP BY cod_mart, posizione),
+     grouped_ord AS (
+         SELECT dtb_ordr.cod_mart,
+                dtb_ordt.cod_jfas,
+                dtb_ordt.cod_mdep,
+                dtb_ordt.gestione,
+                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) -
+                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord,
+                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord,
+                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata,
+                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata
+         FROM dtb_ordr
+                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND
+                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND
+                                         dtb_ordr.num_ord = dtb_ordt.num_ord
+                  LEFT OUTER JOIN withdraw_mtb_colr
+                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND
+                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND
+                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND
+                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart
+                  CROSS APPLY input_values
+         WHERE dtb_ordt.gestione = 'L'
+           AND flag_evaso = 'I'
+           AND dtb_ordr.flag_evaso_forzato = 'N'
+           AND flag_annulla = 'N'
+           AND dtb_ordt.cod_mdep = input_values.cod_mdep
+           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine
+         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione
+     ),
+     tmp_ord AS (SELECT grouped_ord.cod_mart,
+                        mtb_aart.unt_mis,
+                        grouped_ord.cod_jfas,
+                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord,
+                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord
+                 FROM grouped_ord
+                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart
+                          CROSS APPLY input_values
+                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas
+     ),
+     ord_without_positioned_mtb_colt AS (
+         SELECT tmp_ord.cod_mart,
+                tmp_ord.cod_jfas,
+                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione,
+                unt_mis,
+                qta_ord                                                      AS qta_ord_calc,
+                num_cnf_ord                                                  AS num_cnf_ord_calc,
+                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata,
+                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata,
+                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno,
+                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno
+         FROM tmp_ord
+                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas
+             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione
+                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea
+                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND
+                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione
+
+         UNION ALL
+
+         SELECT DISTINCT tmp_ord.cod_mart,
+                         null                                        AS cod_jfas,
+                         jrl_fase_posizioni.posizione,
+                         unt_mis,
+                         0                                           AS qta_ord_calc,
+                         0                                           AS num_cnf_ord_calc,
+                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata,
+                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata,
+                         0                                           AS qta_fabbisogno,
+                         0                                           AS num_cnf_fabbisogno
+         FROM tmp_ord
+                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas
+             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione
+
+
+                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea
+                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND
+                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione
+     )
+SELECT cod_mart,
+       cod_jfas,
+       posizione,
+       unt_mis,
+       qta_ord_calc            AS qta_ord,
+       num_cnf_ord_calc        AS num_cnf_ord,
+       qta_gia_posizionata     AS qta_col_versata,
+       num_cnf_gia_posizionata AS num_cnf_versata,
+       qta_ord_calc - qta_gia_posizionata AS qta_fabbisogno,
+       num_cnf_ord_calc - num_cnf_gia_posizionata AS num_cnf_fabbisogno
+FROM ord_without_positioned_mtb_colt
+
+ORDER BY cod_mart, posizione
+        * */
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+    }
+
+
+    public void loadFabbisogno(String codMart, Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "WITH input_values AS ( " +
+                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
+                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
+//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
+                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
+                " withdraw_mtb_colr AS ( " +
+                "         SELECT cod_mart, " +
+                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
+                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
+                "                mtb_colr.data_ord, " +
+                "                mtb_colr.num_ord, " +
+                "                mtb_colr.gestione " +
+                "         FROM mtb_colr " +
+                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
+                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
+                "         WHERE segno = -1 " +
+                "           AND cod_dtip IS NULL " +
+                "         GROUP BY cod_mart, " +
+                "                  mtb_colr.data_ord, " +
+                "                  mtb_colr.num_ord, " +
+                "                  mtb_colr.gestione " +
+                "     ), " +
+                "     custom_mtb_colr AS (SELECT cod_mart, " +
+                "                                SUM(qta_col) AS qta_col, " +
+                "                                SUM(num_cnf) AS num_cnf, " +
+                "                                posizione " +
+                "                         FROM mvw_sitart_udc_det_inventario " +
+                "                         GROUP BY cod_mart, posizione), " +
+                "     grouped_ord AS ( " +
+                "         SELECT dtb_ordr.cod_mart, " +
+                "                dtb_ordt.cod_jfas, " +
+                "                dtb_ordt.cod_mdep, " +
+                "                dtb_ordt.gestione, " +
+                "                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) - " +
+                "                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord, " +
+                "                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord, " +
+                "                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata, " +
+                "                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata " +
+                "         FROM dtb_ordr " +
+                "                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND " +
+                "                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND " +
+                "                                         dtb_ordr.num_ord = dtb_ordt.num_ord " +
+                "                  LEFT OUTER JOIN withdraw_mtb_colr " +
+                "                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND " +
+                "                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND " +
+                "                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND " +
+                "                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart " +
+                "                  CROSS APPLY input_values " +
+                "         WHERE dtb_ordt.gestione = 'L' " +
+                "           AND flag_evaso = 'I' " +
+                "           AND dtb_ordr.flag_evaso_forzato = 'N' " +
+                "           AND flag_annulla = 'N' " +
+                "           AND dtb_ordt.cod_mdep = input_values.cod_mdep " +
+                "           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine " +
+                "         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione " +
+                "     ), " +
+                "     tmp_ord AS (SELECT grouped_ord.cod_mart, " +
+                "                        mtb_aart.unt_mis, " +
+                "                        grouped_ord.cod_jfas, " +
+                "                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord, " +
+                "                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord " +
+                "                 FROM grouped_ord " +
+                "                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart " +
+                "                          CROSS APPLY input_values " +
+                "                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas " +
+                "     ), " +
+                "     ord_without_positioned_mtb_colt AS ( " +
+                "         SELECT tmp_ord.cod_mart, " +
+                "                tmp_ord.cod_jfas, " +
+                "                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione, " +
+                "                unt_mis, " +
+                "                qta_ord                                                      AS qta_ord_calc, " +
+                "                num_cnf_ord                                                  AS num_cnf_ord_calc, " +
+                "                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata, " +
+                "                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata, " +
+                "                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno, " +
+                "                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno " +
+                "         FROM tmp_ord " +
+                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
+                "             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione " +
+                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
+                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
+                "                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione " +
+                " " +
+                "         UNION ALL " +
+                " " +
+                "         SELECT DISTINCT tmp_ord.cod_mart, " +
+                "                         null                                        AS cod_jfas, " +
+                "                         jrl_fase_posizioni.posizione, " +
+                "                         unt_mis, " +
+                "                         0                                           AS qta_ord_calc, " +
+                "                         0                                           AS num_cnf_ord_calc, " +
+                "                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata, " +
+                "                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata, " +
+                "                         0                                           AS qta_fabbisogno, " +
+                "                         0                                           AS num_cnf_fabbisogno " +
+                "         FROM tmp_ord " +
+                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
+                "             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione " +
+                " " +
+                " " +
+                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
+                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
+                "                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione " +
+                "     ) " +
+                "SELECT DISTINCT cod_mart, " +
+                "       unt_mis, " +
+                "       cod_jfas, " +
+                "       input_values.data_inizio, " +
+                "       input_values.data_fine " +
+                "FROM ord_without_positioned_mtb_colt " +
+                "CROSS APPLY input_values " +
+                "WHERE cod_mart = " + UtilityDB.valueToString(codMart) + " " +
+                "GROUP BY cod_mart, unt_mis, cod_jfas, input_values.data_inizio, input_values.data_fine " +
+                "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 " +
+                "ORDER BY cod_mart";
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java

@@ -1,275 +0,0 @@
-package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.SpannableString;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import com.annimon.stream.Stream;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.data_cache.DataCache;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
-import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.core.rest.CommonRESTException;
-import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
-import it.integry.integrywmsnative.core.utility.UtilityToast;
-import it.integry.integrywmsnative.databinding.FragmentProdOrdineLavorazioneElencoBinding;
-import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core.ProdOrdineLavorazioneHelper;
-import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core.ProdOrdineLavorazioneListAdapter;
-import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
-import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-
-/**
- * A simple {@link Fragment} subclass.
- */
-public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITitledFragment, IScrollableFragment {
-    private FragmentProdOrdineLavorazioneElencoBinding mBinding;
-    private ProdOrdineLavorazioneHelper mHelper;
-
-    private Runnable mOnPreDestroy;
-    private ElevatedToolbar mToolbar;
-
-    private ProdOrdineLavorazioneListAdapter mAdapter;
-
-    private List<OrdineVenditaInevasoDTO> mOriginalOrderList;
-    private List<OrdineVenditaInevasoDTO> mRenderedOrderList = new ArrayList<>();
-
-
-    public ProdOrdineLavorazioneElencoFragment() {
-        // Required empty public constructor
-    }
-
-
-    public static ProdOrdineLavorazioneElencoFragment newInstance() {
-        ProdOrdineLavorazioneElencoFragment fragment = new ProdOrdineLavorazioneElencoFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_ordine_lavorazione_elenco, container, false);
-
-        mBinding.ordineLavorazioneMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
-        mBinding.ordineLavorazioneMainFab.hide();
-
-        mBinding.ordineLavorazioneMainFab.setOnClickListener(v -> onVenditaMainFabClick());
-
-        if (mToolbar != null) mToolbar.setRecyclerView(mBinding.ordineLavorazioneMainList);
-
-        init();
-        return mBinding.getRoot();
-    }
-
-    @Override
-    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
-        titleText.setText(context.getText(R.string.prod_ordine_lavorazione_title_fragment).toString());
-    }
-
-    @Override
-    public void setScrollToolbar(ElevatedToolbar toolbar) {
-        mToolbar = toolbar;
-    }
-
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
-    }
-
-
-    private void init() {
-        final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
-
-        mHelper = new ProdOrdineLavorazioneHelper(getActivity());
-//        mViewModel = new VenditaViewModel(getActivity(), this, mBinding, mHelper);
-
-        mHelper.loadOrdini(ordini -> {
-            if (ordini != null) {
-                UtilityToast.showToast("Caricati " + ordini.size() + " ordini");
-                mOriginalOrderList = ordini;
-//                    mViewModel.setListOrder(ordini);
-            }
-
-
-            mBinding.ordineLavorazioneEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE);
-
-            refreshOrdini(ordini);
-            initRecyclerView();
-            progress.dismiss();
-        }, ex -> {
-            mOriginalOrderList = new ArrayList<>();
-            progress.dismiss();
-
-            String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
-            if (errorMessage == null) errorMessage = ex.getMessage();
-            DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
-        });
-
-    }
-
-
-    public void refreshOrdini(List<OrdineVenditaInevasoDTO> ordini) {
-
-        mRenderedOrderList.clear();
-        if (ordini != null && ordini.size() > 0) mRenderedOrderList.addAll(ordini);
-    }
-
-    private void initRecyclerView() {
-        mAdapter = new ProdOrdineLavorazioneListAdapter(getActivity(), mRenderedOrderList, onSingleSelectionChanged);
-        mBinding.ordineLavorazioneMainList.setAdapter(mAdapter);
-    }
-
-    public void refreshRecyclerView() {
-        mAdapter.updateItems(mRenderedOrderList);
-    }
-
-    private RunnableArgs<OrdineVenditaInevasoDTO> onSingleSelectionChanged = dto -> {
-        List<OrdineVenditaInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
-
-        if (!SettingsManager.iDB().isFlagMultiClienteOrdV()) {
-            boolean allMatch = Stream.of(selectedOrders).allMatch(x -> dto.getCodAnagOrd().equalsIgnoreCase(x.getCodAnagOrd()));
-
-            if (!allMatch) {
-                Stream.of(selectedOrders)
-                        .filter(x -> !x.getCodAnagOrd().equalsIgnoreCase(dto.getCodAnagOrd()))
-                        .forEach(x -> x.setSelected(false));
-            }
-        }
-
-        if (selectedOrders != null && selectedOrders.size() > 0) {
-            mBinding.ordineLavorazioneMainFab.show();
-        } else {
-            mBinding.ordineLavorazioneMainFab.hide();
-        }
-    };
-
-
-    private void onVenditaMainFabClick() {
-
-        List<OrdineVenditaInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
-        List<String> barcodes = new ArrayList<>();
-
-        String dataCons = null;
-
-        for (OrdineVenditaInevasoDTO ordine : selectedOrders) {
-            if (!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode());
-
-            if (dataCons == null) dataCons = ordine.getDataConsS();
-            else if (!dataCons.equalsIgnoreCase(ordine.getDataConsS())) dataCons = "";
-        }
-
-        final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
-
-
-        checkSelectedOrders(selectedOrders, () -> {
-            RunnableArgs<List<SitArtOrdDTO>> onPostGetListaArts = sitArtsDTO -> {
-                mHelper.getBancaliLavorazioneGiaRegistrati(selectedOrders, mtbColtList -> {
-                    progress.dismiss();
-
-                    List<String> codMarts = Stream.of(sitArtsDTO)
-                            .distinctBy(SitArtOrdDTO::getCodMart)
-                            .map(SitArtOrdDTO::getCodMart)
-                            .toList();
-
-                    int alreadyRegisteredUL = mtbColtList.size();
-
-
-                    DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
-                            getText(R.string.orders).toString(),
-                            Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, selectedOrders.size()), selectedOrders.size())
-                                    + "<br />" +
-                                    "<b>" + codMarts.size() + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size())
-                                    + "<br />" +
-                                    "<b>" + alreadyRegisteredUL + "</b> " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)),
-                            null,
-                            () -> startPickingActivity(sitArtsDTO, selectedOrders, mtbColtList)
-                    ).show();
-
-                }, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress));
-            };
-
-            OrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrders, onPostGetListaArts, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress));
-
-        }, progress::dismiss);
-    }
-
-    private void checkSelectedOrders(List<OrdineVenditaInevasoDTO> selectedOrders, Runnable onComplete, Runnable onFailed) {
-        if (selectedOrders != null && selectedOrders.size() > 0) {
-
-            //Definizione della gestione collo di default
-            List<GestioneEnum> foundGestioni = Stream.of(selectedOrders)
-                    .map(OrdineVenditaInevasoDTO::getGestioneEnum)
-                    .withoutNulls()
-                    .distinctBy(x -> x)
-                    .toList();
-
-            if (foundGestioni != null && foundGestioni.size() > 1) {
-                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_gest)), null, onFailed::run).show();
-                return;
-            }
-
-            //Definizione del deposito di default
-            List<String> foundCodMdep = Stream.of(selectedOrders)
-                    .map(OrdineVenditaInevasoDTO::getCodMdep)
-                    .withoutNulls()
-                    .distinctBy(x -> x)
-                    .toList();
-
-            if (foundCodMdep != null && foundCodMdep.size() > 1) {
-                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_cod_mdep_ordv)), null, onFailed::run).show();
-                return;
-            }
-        }
-
-        onComplete.run();
-    }
-
-    private void startPickingActivity(List<SitArtOrdDTO> ordini, List<OrdineVenditaInevasoDTO> selectedOrders, List<MtbColt> mtbColtList) {
-        Intent myIntent = new Intent(getActivity(), SpedizioneActivity.class);
-
-        String keyPickingList = DataCache.addItem(ordini);
-        myIntent.putExtra("keyPickingList", keyPickingList);
-
-        String keyTestateOrdini = DataCache.addItem(selectedOrders);
-        myIntent.putExtra("keyTestateOrdini", keyTestateOrdini);
-
-        String keyColliRegistrati = DataCache.addItem(mtbColtList);
-        myIntent.putExtra("keyColliRegistrati", keyColliRegistrati);
-
-        getActivity().startActivity(myIntent);
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java

@@ -1,183 +0,0 @@
-package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core;
-
-import android.content.Context;
-import android.util.Log;
-
-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.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.EsitoType;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityFirebase;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
-import it.integry.integrywmsnative.gest.vendita.rest.OrdiniVenditaRESTConsumerService;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class ProdOrdineLavorazioneHelper {
-
-
-    private Context mContext;
-
-    public ProdOrdineLavorazioneHelper(Context context){
-        mContext = context;
-    }
-
-    public void loadOrdini(RunnableArgs<List<OrdineVenditaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed){
-        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
-
-        Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_ords_lavorazione");
-        perfTrace.start();
-
-        OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class);
-        service
-                .listOrdiniInevasi(codMdep, "P")
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>>() {
-
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> response) {
-
-                if(response.isSuccessful()) {
-
-                    if(response.body() != null) {
-                        if(response.body().getEsito() == EsitoType.OK) {
-                            UtilityFirebase.stopPerformanceTrace(perfTrace, false);
-                            onComplete.run(response.body().getDto());
-                        } else {
-                            UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                            Log.e("Ord Lavorazione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.body().getErrorMessage()));
-                        }
-                    } else {
-                        UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                        Log.e("Ord Lavorazione", response.message());
-                        onFailed.run(new Exception(response.message()));
-                    }
-                } else {
-                    UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                    Log.e("Ord Lavorazione", "Status " + response.code() + ": " + response.message());
-                    onFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
-                }
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> call, Throwable t) {
-                UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                Log.e("Ord Lavorazione", t.toString());
-                UtilityLogger.errorMe(new Exception(t));
-                onFailed.run(new Exception(t));
-            }
-        });
-    }
-
-    public List<OrdineVenditaInevasoDTO> getSelectedOrders(List<OrdineVenditaInevasoDTO> ordiniList) {
-        return Stream.of(ordiniList)
-                .filter(OrdineVenditaInevasoDTO::isSelected)
-                .toList();
-    }
-
-
-
-
-//    public void retrievePickingList(List<OrdineLavorazioneInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed){
-//        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
-//
-//
-//        Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_lavorazione");
-//        perfTrace.start();
-//
-//        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
-//                .map(x -> new GetPickingListDTO()
-//                        .setData(x.getDataOrdS())
-//                        .setGestione(x.getGestione())
-//                        .setNumero(x.getNumOrd())
-//                        .setDataConsegna(x.getDataConsS())
-//                        .setIdViaggio(x.getIdViaggio()))
-//                .toList();
-//
-//        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
-//        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
-//            @Override
-//            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
-//                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniVendita", onComplete, onFailed);
-//            }
-//
-//            @Override
-//            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-//                UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-//                Log.e("Ord Lavorazione", t.toString());
-//                UtilityLogger.errorMe(new Exception(t));
-//                onFailed.run(new Exception(t));
-//            }
-//        });
-//
-//    }
-
-
-
-
-
-    public void getBancaliLavorazioneGiaRegistrati(List<OrdineVenditaInevasoDTO> orders, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-
-        String baseSql = "SELECT DISTINCT mtb_colt.* " +
-                "FROM mtb_colt, " +
-                "     mtb_colr " +
-                "WHERE mtb_colt.gestione = mtb_colr.gestione " +
-                "  AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
-                "  AND mtb_colt.data_collo = mtb_colr.data_collo " +
-                "  AND mtb_colt.num_collo = mtb_colr.num_collo " +
-                "  AND mtb_colt.gestione = 'L' " +
-                "  AND mtb_colt.segno = -1 " +
-                // "  AND mtb_colt.ser_collo = '/' " +
-                "  AND mtb_colt.data_doc IS NULL AND ";
-
-        StringBuilder whereCond = new StringBuilder();
-
-        for(int i = 0; i < orders.size(); i++){
-
-
-            whereCond
-                    .append("(mtb_colr.data_ord = '").append(UtilityDate.formatDate(orders.get(i).getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)).append("' ")
-                    .append("AND mtb_colr.num_ord = ").append(orders.get(i).getNumOrd()).append(" ")
-                    .append("AND mtb_colr.gestione = ").append(UtilityDB.valueToString(orders.get(i).getGestione()))
-                    .append(") ");
-
-            if(i != (orders.size() - 1)){
-                whereCond.append("OR ");
-            }
-        }
-
-        baseSql += "( " + whereCond + ")";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
-        SystemRESTConsumer.processSqlStatic(baseSql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbColt>>() {
-            @Override
-            public void onSuccess(List<MtbColt> value) {
-                if(onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
-
-    }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneListAdapter.java

@@ -1,174 +0,0 @@
-package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core;
-
-import android.content.Context;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.Observable;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.annimon.stream.Stream;
-import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
-
-import java.util.List;
-
-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.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.databinding.FragmentProdOrdineLavorazioneListGroupModelBinding;
-import it.integry.integrywmsnative.databinding.FragmentProdOrdineLavorazioneListModelBinding;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
-import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider;
-
-public class ProdOrdineLavorazioneListAdapter extends SectionedRecyclerViewAdapter<ProdOrdineLavorazioneListAdapter.SubheaderHolder, ProdOrdineLavorazioneListAdapter.SingleItemViewHolder> implements SectionTitleProvider {
-    private Context mContext;
-
-    private List<OrdineVenditaInevasoDTO> mDataset;
-    private RunnableArgs<OrdineVenditaInevasoDTO> mOnSingleSelectionChanged;
-
-    static class SubheaderHolder extends RecyclerView.ViewHolder {
-
-        FragmentProdOrdineLavorazioneListModelBinding binding;
-
-        SubheaderHolder(FragmentProdOrdineLavorazioneListModelBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-
-    }
-
-    static class SingleItemViewHolder extends RecyclerView.ViewHolder {
-
-        FragmentProdOrdineLavorazioneListGroupModelBinding binding;
-
-        SingleItemViewHolder(FragmentProdOrdineLavorazioneListGroupModelBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-    }
-
-
-    public ProdOrdineLavorazioneListAdapter(Context context, List<OrdineVenditaInevasoDTO> myDataset, RunnableArgs<OrdineVenditaInevasoDTO> onSingleSelectionChanged) {
-        mContext = context;
-        mDataset = orderItems(myDataset);
-        mOnSingleSelectionChanged = onSingleSelectionChanged;
-    }
-
-    public void updateItems(List<OrdineVenditaInevasoDTO> updatedDataset) {
-        mDataset.clear();
-        mDataset.addAll(orderItems(updatedDataset));
-        notifyDataSetChanged();
-        notifyDataChanged();
-    }
-
-
-    private List<OrdineVenditaInevasoDTO> orderItems(List<OrdineVenditaInevasoDTO> dataset) {
-        return Stream.of(dataset)
-                .sortBy(OrdineVenditaInevasoDTO::getRagSocOrd)
-                .toList();
-
-    }
-
-
-
-    @Override
-    public ProdOrdineLavorazioneListAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
-        FragmentProdOrdineLavorazioneListModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_prod_ordine_lavorazione__list_model, parent, false);
-        return new ProdOrdineLavorazioneListAdapter.SubheaderHolder(binding);
-    }
-
-    @Override
-    public ProdOrdineLavorazioneListAdapter.SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-        FragmentProdOrdineLavorazioneListGroupModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_prod_ordine_lavorazione__list_group_model, parent, false);
-        return new ProdOrdineLavorazioneListAdapter.SingleItemViewHolder(binding);
-    }
-
-
-    @Override
-    public void onBindSubheaderViewHolder(ProdOrdineLavorazioneListAdapter.SubheaderHolder subheaderHolder, int nextItemPosition) {
-        subheaderHolder.binding.ordineLavorazioneMainListGroupHeader.setText(mDataset.get(nextItemPosition).getRagSocOrd());
-
-        subheaderHolder.binding.getRoot().setOnClickListener(v -> {
-
-            boolean anySelected = Stream.of(mDataset)
-                    .filter(x -> x.getCodAnagOrd().equals(mDataset.get(nextItemPosition).getCodAnagOrd()))
-                    .anyMatch(OrdineVenditaInevasoDTO::isSelected);
-
-            Stream.of(mDataset)
-                    .filter(x -> x.getCodAnagOrd().equals(mDataset.get(nextItemPosition).getCodAnagOrd()))
-                    .forEach(x -> x.setSelected(!anySelected));
-        });
-    }
-
-    @Override
-    public void onBindItemViewHolder(SingleItemViewHolder h, int itemPosition) {
-        final OrdineVenditaInevasoDTO ordine = mDataset.get(itemPosition);
-        final SingleItemViewHolder holder = h;
-
-        holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.setTag(ordine.getNumOrd());
-
-        holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.setOnCheckedChangeListener(null);
-
-        ordine.selected.resetOnPropertyChangedCallback();
-
-
-        String testataOrdString = String.format(mContext.getString(R.string.ord_ven_testata), String.valueOf(ordine.getNumOrd()), UtilityDate.formatDate(ordine.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-        holder.binding.ordineLavorazioneMainListGroupItemContainerTestataOrd.setText(Html.fromHtml(testataOrdString));
-
-        String testataDataConsString = String.format(mContext.getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(ordine.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-        holder.binding.ordineLavorazioneMainListGroupItemContainerTestataDataCons.setText(Html.fromHtml(testataDataConsString));
-
-        holder.binding.venditaMainListGroupItemContainerDetailOrd.setText(ordine.getRifOrd());
-
-        if(!UtilityString.isNullOrEmpty(ordine.getCodJcom())) {
-//            holder.binding.ordineLavorazioneMainListGroupItemContainerTestataCodJcom.setText(ordine.getCodJcom());
-        }
-
-        holder.binding.setCheckboxValue(ordine.selected);
-
-        holder.binding.getRoot().setOnClickListener(v -> {
-            ordine.setSelected(!ordine.isSelected());
-        });
-
-        holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.setChecked(ordine.isSelected());
-
-        //Bindable to View
-        ordine.selected.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
-            @Override
-            public void onPropertyChanged(Observable sender, int propertyId) {
-                if(holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.getTag().equals(ordine.getNumOrd())) {
-                    holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.setChecked(((BindableBoolean) sender).get());
-                }
-            }
-        });
-
-
-        //View to Bindable
-        holder.binding.ordineLavorazioneMainListGroupItemContainerCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            ordine.setSelected(isChecked);
-            mOnSingleSelectionChanged.run(ordine);
-        });
-    }
-
-
-    @Override
-    public boolean onPlaceSubheaderBetweenItems(int position) {
-        return !this.mDataset.get(position).getRagSocOrd().equalsIgnoreCase(this.mDataset.get(position + 1).getRagSocOrd());
-
-    }
-
-    @Override
-    public int getItemSize() {
-        return mDataset.size();
-    }
-
-    @Override
-    public String getSectionTitle(int position) {
-        return null;
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/dto/OrdineLavorazioneInevasoDTO.java

@@ -1,447 +0,0 @@
-package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.dto;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.Date;
-
-import it.integry.integrywmsnative.core.di.BindableBoolean;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-
-public class OrdineLavorazioneInevasoDTO {
-
-    private String data;
-    private Integer numero;
-    private Integer idViaggio;
-    private String gestione;
-    private String listino;
-    private String termCons;
-    private String codAuto;
-    private String codMdep;
-    private String descrizioneAuto;
-    private String codVvet;
-    private String descrizioneVettore;
-    private String dataInizTrasp;
-    private String descrizionePaga;
-    private String rifOrd;
-    private String codAnagOrd;
-    private String codJcom;
-    private String descrizioneCom;
-    private String ragSocCom;
-    private String ragSocOrd;
-    private String destinatario;
-    private String citta;
-    private String provincia;
-    private String indirizzo;
-    private BigDecimal pesoTotale;
-    private BigDecimal numCnfdaEvadere;
-    private BigDecimal numCnfDisp;
-    private String dataCons;
-    private String barcode;
-    private Integer numRighe;
-    private Integer righeInPartenza;
-    private BigDecimal saldoContabile;
-    private String codVzon;
-    private String ragSocOrdV;
-    private int colliRiservati;
-    private boolean existColloBoolean;
-    private boolean flagEvaso;
-    private String nomeAgente;
-    private String codJfas;
-
-    public BindableBoolean selected;
-
-
-    public OrdineLavorazioneInevasoDTO() {
-        this.selected = new BindableBoolean(false);
-    }
-
-
-    public String getDataOrdS() {
-        return data;
-    }
-
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
-    }
-
-    public OrdineLavorazioneInevasoDTO setData(String data) {
-        this.data = data;
-        return this;
-    }
-
-    public Integer getNumOrd() {
-        return numero;
-    }
-
-    public OrdineLavorazioneInevasoDTO setNumero(Integer numero) {
-        this.numero = numero;
-        return this;
-    }
-
-    public Integer getIdViaggio() {
-        return idViaggio;
-    }
-
-    public OrdineLavorazioneInevasoDTO setIdViaggio(Integer idViaggio) {
-        this.idViaggio = idViaggio;
-        return this;
-    }
-
-    public String getGestione() {
-        return gestione;
-    }
-
-    public GestioneEnum getGestioneEnum() {
-        return GestioneEnum.fromString(getGestione());
-    }
-
-
-    public OrdineLavorazioneInevasoDTO setGestione(String gestione) {
-        this.gestione = gestione;
-        return this;
-    }
-
-    public String getListino() {
-        return listino;
-    }
-
-    public OrdineLavorazioneInevasoDTO setListino(String listino) {
-        this.listino = listino;
-        return this;
-    }
-
-    public String getTermCons() {
-        return termCons;
-    }
-
-    public OrdineLavorazioneInevasoDTO setTermCons(String termCons) {
-        this.termCons = termCons;
-        return this;
-    }
-
-    public String getCodAuto() {
-        return codAuto;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodAuto(String codAuto) {
-        this.codAuto = codAuto;
-        return this;
-    }
-
-    public String getCodMdep() {
-        return codMdep;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodMdep(String codMdep) {
-        this.codMdep = codMdep;
-        return this;
-    }
-
-    public String getDescrizioneAuto() {
-        return descrizioneAuto;
-    }
-
-    public OrdineLavorazioneInevasoDTO setDescrizioneAuto(String descrizioneAuto) {
-        this.descrizioneAuto = descrizioneAuto;
-        return this;
-    }
-
-    public String getCodVvet() {
-        return codVvet;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodVvet(String codVvet) {
-        this.codVvet = codVvet;
-        return this;
-    }
-
-    public String getDescrizioneVettore() {
-        return descrizioneVettore;
-    }
-
-    public OrdineLavorazioneInevasoDTO setDescrizioneVettore(String descrizioneVettore) {
-        this.descrizioneVettore = descrizioneVettore;
-        return this;
-    }
-
-    public String getDataInizTraspS() {
-        return dataInizTrasp;
-    }
-
-    public Date getDataInizTraspD() throws ParseException {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
-    }
-
-    public OrdineLavorazioneInevasoDTO setDataInizTrasp(String dataInizTrasp) {
-        this.dataInizTrasp = dataInizTrasp;
-        return this;
-    }
-
-    public String getDescrizionePaga() {
-        return descrizionePaga;
-    }
-
-    public OrdineLavorazioneInevasoDTO setDescrizionePaga(String descrizionePaga) {
-        this.descrizionePaga = descrizionePaga;
-        return this;
-    }
-
-    public String getRifOrd() {
-        return rifOrd;
-    }
-
-    public OrdineLavorazioneInevasoDTO setRifOrd(String rifOrd) {
-        this.rifOrd = rifOrd;
-        return this;
-    }
-
-    public String getCodAnagOrd() {
-        return codAnagOrd;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodAnagOrd(String codAnagOrd) {
-        this.codAnagOrd = codAnagOrd;
-        return this;
-    }
-
-    public String getCodJcom() {
-        return codJcom;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodJcom(String codJcom) {
-        this.codJcom = codJcom;
-        return this;
-    }
-
-    public String getDescrizioneCom() {
-        return descrizioneCom;
-    }
-
-    public OrdineLavorazioneInevasoDTO setDescrizioneCom(String descrizioneCom) {
-        this.descrizioneCom = descrizioneCom;
-        return this;
-    }
-
-    public String getRagSocCom() {
-        return ragSocCom;
-    }
-
-    public OrdineLavorazioneInevasoDTO setRagSocCom(String ragSocCom) {
-        this.ragSocCom = ragSocCom;
-        return this;
-    }
-
-    public String getRagSocOrd() {
-        return ragSocOrd;
-    }
-
-    public OrdineLavorazioneInevasoDTO setRagSocOrd(String ragSocOrd) {
-        this.ragSocOrd = ragSocOrd;
-        return this;
-    }
-
-    public String getDestinatario() {
-        return destinatario;
-    }
-
-    public OrdineLavorazioneInevasoDTO setDestinatario(String destinatario) {
-        this.destinatario = destinatario;
-        return this;
-    }
-
-    public String getCitta() {
-        return citta;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCitta(String citta) {
-        this.citta = citta;
-        return this;
-    }
-
-    public String getProvincia() {
-        return provincia;
-    }
-
-    public OrdineLavorazioneInevasoDTO setProvincia(String provincia) {
-        this.provincia = provincia;
-        return this;
-    }
-
-    public String getIndirizzo() {
-        return indirizzo;
-    }
-
-    public OrdineLavorazioneInevasoDTO setIndirizzo(String indirizzo) {
-        this.indirizzo = indirizzo;
-        return this;
-    }
-
-    public BigDecimal getPesoTotale() {
-        return pesoTotale;
-    }
-
-    public OrdineLavorazioneInevasoDTO setPesoTotale(BigDecimal pesoTotale) {
-        this.pesoTotale = pesoTotale;
-        return this;
-    }
-
-    public BigDecimal getNumCnfdaEvadere() {
-        return numCnfdaEvadere;
-    }
-
-    public OrdineLavorazioneInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) {
-        this.numCnfdaEvadere = numCnfdaEvadere;
-        return this;
-    }
-
-    public BigDecimal getNumCnfDisp() {
-        return numCnfDisp;
-    }
-
-    public OrdineLavorazioneInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) {
-        this.numCnfDisp = numCnfDisp;
-        return this;
-    }
-
-    public String getDataConsS() {
-        return dataCons;
-    }
-
-    public Date getDataConsD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS());
-    }
-
-    public OrdineLavorazioneInevasoDTO setDataCons(String dataCons) {
-        this.dataCons = dataCons;
-        return this;
-    }
-
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public OrdineLavorazioneInevasoDTO setBarcode(String barcode) {
-        this.barcode = barcode;
-        return this;
-    }
-
-    public Integer getNumRighe() {
-        return numRighe;
-    }
-
-    public OrdineLavorazioneInevasoDTO setNumRighe(Integer numRighe) {
-        this.numRighe = numRighe;
-        return this;
-    }
-
-    public Integer getRigheInPartenza() {
-        return righeInPartenza;
-    }
-
-    public OrdineLavorazioneInevasoDTO setRigheInPartenza(Integer righeInPartenza) {
-        this.righeInPartenza = righeInPartenza;
-        return this;
-    }
-
-    public BigDecimal getSaldoContabile() {
-        return saldoContabile;
-    }
-
-    public OrdineLavorazioneInevasoDTO setSaldoContabile(BigDecimal saldoContabile) {
-        this.saldoContabile = saldoContabile;
-        return this;
-    }
-
-    public String getCodVzon() {
-        return codVzon;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodVzon(String codVzon) {
-        this.codVzon = codVzon;
-        return this;
-    }
-
-    public String getRagSocOrdV() {
-        return ragSocOrdV;
-    }
-
-    public OrdineLavorazioneInevasoDTO setRagSocOrdV(String ragSocOrdV) {
-        this.ragSocOrdV = ragSocOrdV;
-        return this;
-    }
-
-    public int getColliRiservati() {
-        return colliRiservati;
-    }
-
-    public OrdineLavorazioneInevasoDTO setColliRiservati(int colliRiservati) {
-        this.colliRiservati = colliRiservati;
-        return this;
-    }
-
-    public boolean isExistColloBoolean() {
-        return existColloBoolean;
-    }
-
-    public OrdineLavorazioneInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
-        this.existColloBoolean = existColloBoolean;
-        return this;
-    }
-
-    public boolean isFlagEvaso() {
-        return flagEvaso;
-    }
-
-    public OrdineLavorazioneInevasoDTO setFlagEvaso(boolean flagEvaso) {
-        this.flagEvaso = flagEvaso;
-        return this;
-    }
-
-    public String getNomeAgente() {
-        return nomeAgente;
-    }
-
-    public OrdineLavorazioneInevasoDTO setNomeAgente(String nomeAgente) {
-        this.nomeAgente = nomeAgente;
-        return this;
-    }
-
-    public String getCodJfas() {
-        return codJfas;
-    }
-
-    public OrdineLavorazioneInevasoDTO setCodJfas(String codJfas) {
-        this.codJfas = codJfas;
-        return this;
-    }
-
-    public boolean isSelected() {
-        return selected.get();
-    }
-
-    public OrdineLavorazioneInevasoDTO setSelected(boolean selected) {
-        this.selected.set(selected);
-        return this;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        OrdineLavorazioneInevasoDTO that = (OrdineLavorazioneInevasoDTO) o;
-
-        if (!data.equals(that.data)) return false;
-        if (!numero.equals(that.numero)) return false;
-        return getGestione().equals(that.getGestione());
-    }
-
-    @Override
-    public int hashCode() {
-        int result = data.hashCode();
-        result = 31 * result + numero.hashCode();
-        result = 31 * result + getGestione().hashCode();
-        return result;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java

@@ -3,27 +3,23 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import java.util.ArrayList;
+import java.util.List;
 
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
-import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBinding;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel.ProdRecuperoMaterialeViewModel;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel.ProdVersamentoMaterialViewModel;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -33,6 +29,8 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
     private ProdRecuperoMaterialeViewModel mViewmodel;
     private ProdRecuperoMaterialeHelper mHelper;
 
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+
     public ProdRecuperoMaterialeFragment() {
         // Required empty public constructor
     }
@@ -57,7 +55,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
                              Bundle savedInstanceState) {
         mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false);
 
-
         init();
         return mBinding.getRoot();
     }
@@ -75,11 +72,16 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
         titleText.setText(context.getText(R.string.prod_recupero_materiale_title_fragment).toString());
     }
 
-
-
     @Override
     public void onDestroy() {
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
         super.onDestroy();
     }
 
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java

@@ -262,7 +262,7 @@ public class ProdRecuperoMaterialeHelper {
                             .distinct()
                             .toList();
 
-                    ArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+                    ArticoloRESTConsumer.getByCodMartStatic(codMarts, arts -> {
 
                         if(arts != null && arts.size() > 0) {
                             for (HistoryVersamentoProdULDTO value : newUlList) {

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java

@@ -1,12 +1,11 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel;
 
-import android.app.Activity;
 import android.app.Dialog;
-import android.content.Context;
 import android.text.SpannableString;
 
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
+import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
@@ -18,6 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
@@ -31,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 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.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
@@ -39,15 +40,16 @@ import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBind
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.HistoryULsListAdapter;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 
 public class ProdRecuperoMaterialeViewModel {
 
-    private Context mContext;
+    private FragmentActivity mContext;
 
     private FragmentProdRecuperoMaterialeBinding mBinding;
     private ProdRecuperoMaterialeHelper mHelper;
@@ -61,7 +63,7 @@ public class ProdRecuperoMaterialeViewModel {
 
     private int barcodeScannerIstanceID = -1;
 
-    public void init(Activity context, FragmentProdRecuperoMaterialeBinding binding, ProdRecuperoMaterialeHelper helper, Runnable onRecuperoCompleted) {
+    public void init(FragmentActivity context, FragmentProdRecuperoMaterialeBinding binding, ProdRecuperoMaterialeHelper helper, Runnable onRecuperoCompleted) {
         mContext = context;
         mBinding = binding;
         mHelper = helper;
@@ -80,6 +82,7 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     private void initBarcode() {
+        BarcodeManager.enable();
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessfull(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(mContext, ex, false)));
@@ -152,33 +155,74 @@ public class ProdRecuperoMaterialeViewModel {
     }
 
 
+//    private void dispatchItem(HistoryVersamentoProdULDTO item, MtbColt sourceMtbColt, Dialog dialogProgress) {
+//        BigDecimal qtaDaEvadere = BigDecimal.ZERO;
+//
+//        qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
+//
+//
+//        DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
+//                .setBatchLot(item.getPartitaMag())
+//                .setQtaDaEvadere(null)
+//                .setQtaOrd(null)
+//                .setMtbAart(item.getMtbAart())
+//                .setCanPartitaMagBeChanged(false)
+//                .setNumCnf(1)
+//                .setQtaCnf(item.getQtaCnf())
+//                .setQtaTot(item.getQtaCnf())
+//                .setMaxQta(qtaDaEvadere)
+//                .setQtaDisponibile(qtaDaEvadere);
+//
+//        DialogInputQuantity.makeBase(mContext, dto, false, quantity -> {
+//            onItemDispatched(item, quantity.qtaTot.getBigDecimal(), sourceMtbColt, dialogProgress);
+//        }, () -> {
+//            if (dialogProgress != null) dialogProgress.dismiss();
+//        }).show();
+//    }
+
+
     private void dispatchItem(HistoryVersamentoProdULDTO item, MtbColt sourceMtbColt, Dialog dialogProgress) {
         BigDecimal qtaDaEvadere = BigDecimal.ZERO;
+        BigDecimal numCnfDaEvadere = BigDecimal.ZERO;
 
         qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
 
-
-        DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
-                .setBatchLot(item.getPartitaMag())
-                .setQtaDaEvadere(null)
-                .setQtaOrd(null)
-                .setMtbAart(item.getMtbAart())
-                .setCanPartitaMagBeChanged(false)
-                .setNumCnf(1)
-                .setQtaCnf(item.getQtaCnf())
-                .setQtaTot(item.getQtaCnf())
-                .setMaxQta(qtaDaEvadere)
-                .setQtaDisponibile(qtaDaEvadere);
-
-        DialogInputQuantity.makeBase(mContext, dto, false, quantity -> {
-            onItemDispatched(item, quantity.qtaTot.getBigDecimal(), sourceMtbColt, dialogProgress);
-        }, () -> {
-            if (dialogProgress != null) dialogProgress.dismiss();
-        }).show();
+        if(!UtilityBigDecimal.equalsTo(qtaDaEvadere, BigDecimal.ZERO)) {
+            numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
         }
 
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(item.getMtbAart())
+                .setInitialNumCnf(BigDecimal.ONE)
+                .setInitialQtaCnf(item.getQtaCnf())
+                .setInitialQtaTot(item.getQtaCnf())
 
-    private void onItemDispatched(HistoryVersamentoProdULDTO item, BigDecimal quantity, MtbColt sourceMtbColt, Dialog progress) {
+                .setTotalQtaAvailable(qtaDaEvadere)
+                .setTotalNumCnfAvailable(numCnfDaEvadere)
+                .setQtaCnfAvailable(item.getQtaCnf())
+                .setPartitaMag(item.getPartitaMag())
+//                .setDataScad(item.getDa)
+                .setCanOverflowOrderQuantity(false)
+                .setCanLUBeClosed(false);
+
+        DialogInputQuantityV2View
+                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                    PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                            .setNumCnf(resultDTO.getNumCnf())
+                            .setQtaCnf(resultDTO.getQtaCnf())
+                            .setQtaTot(resultDTO.getQtaTot())
+                            .setPartitaMag(resultDTO.getPartitaMag())
+                            .setDataScad(resultDTO.getDataScad());
+
+                    onItemDispatched(item, resultDTO.getQtaTot(), resultDTO.getNumCnf(), resultDTO.getQtaCnf(), sourceMtbColt, dialogProgress);
+                }, () -> {
+                    if (dialogProgress != null) dialogProgress.dismiss();
+                    BarcodeManager.enable();
+                })
+                .show(mContext.getSupportFragmentManager(), "tag");
+    }
+
+    private void onItemDispatched(HistoryVersamentoProdULDTO item, BigDecimal inputQtaTot, BigDecimal inputNumCnf, BigDecimal inputQtaCnf, MtbColt sourceMtbColt, Dialog progress) {
 
         if (progress == null) {
             progress = UtilityProgress.createDefaultProgressDialog(mContext);
@@ -192,14 +236,37 @@ public class ProdRecuperoMaterialeViewModel {
                 .setGestione(item.getGestione())
                 .setMtbColr(new ObservableArrayList<>());
 
+
+        BigDecimal totalSumOfQtaCol = BigDecimal.ZERO;
+        BigDecimal totalSumOfNumCnf = BigDecimal.ZERO;
+
         for (HistoryVersamentoProdULDTO.OrdineDto ordine : item.getOrdini()) {
-            BigDecimal qtaCol = quantity.multiply(new BigDecimal(-1).multiply(new BigDecimal(ordine.getPercentageHr()))).divide(new BigDecimal(100), 3, RoundingMode.HALF_EVEN);
+
+            BigDecimal qtaColToSave;
+            BigDecimal numCnfToSave;
+
+            if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean()) ){
+                numCnfToSave = UtilityBigDecimal.divideAndRoundToInteger(inputNumCnf.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                qtaColToSave = numCnfToSave.multiply(inputQtaCnf).setScale(0, BigDecimal.ROUND_FLOOR);
+            } else {
+                qtaColToSave = UtilityBigDecimal.divideAndRoundToInteger(inputQtaTot.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                numCnfToSave = UtilityBigDecimal.divide(qtaColToSave, item.getQtaCnf(), RoundingMode.FLOOR);
+            }
+
+
+            totalSumOfQtaCol = totalSumOfQtaCol.add(qtaColToSave);
+            totalSumOfNumCnf = totalSumOfNumCnf.add(numCnfToSave);
+
+            numCnfToSave = numCnfToSave.multiply(BigDecimal.valueOf(-1));
+            qtaColToSave = qtaColToSave.multiply(BigDecimal.valueOf(-1));
+
 
             final MtbColr mtbColrScarico = new MtbColr()
                     .setCodMart(item.getCodMart())
                     .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
-                    .setQtaCol(qtaCol)
-                    .setQtaCnf(ordine.getQtaCnf())
+                    .setQtaCol(qtaColToSave)
+                    .setQtaCnf(inputQtaCnf)
+                    .setNumCnf(numCnfToSave)
                     .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
                     .setDatetimeRow(UtilityDate.getDateInstance())
                     .setNumColloRif(item.getNumColloRif())
@@ -214,6 +281,24 @@ public class ProdRecuperoMaterialeViewModel {
             mtbColtScarico.getMtbColr().add(mtbColrScarico);
         }
 
+        boolean updateQtaCnfFirstRow = false;
+
+        if(UtilityBigDecimal.lowerThan(totalSumOfNumCnf, inputNumCnf)) {
+            BigDecimal diff = inputNumCnf.subtract(totalSumOfNumCnf).multiply(BigDecimal.valueOf(-1));
+            mtbColtScarico.getMtbColr().get(0).setNumCnf(mtbColtScarico.getMtbColr().get(0).getNumCnf().add(diff));
+            updateQtaCnfFirstRow = true;
+        }
+
+        if(UtilityBigDecimal.lowerThan(totalSumOfQtaCol, inputQtaTot)) {
+            BigDecimal diff = inputQtaTot.subtract(totalSumOfQtaCol).multiply(BigDecimal.valueOf(-1));
+            mtbColtScarico.getMtbColr().get(0).setQtaCol(mtbColtScarico.getMtbColr().get(0).getQtaCol().add(diff));
+            updateQtaCnfFirstRow = true;
+        }
+
+        if(updateQtaCnfFirstRow) {
+            mtbColtScarico.getMtbColr().get(0).setQtaCnf(
+                    UtilityBigDecimal.divide(mtbColtScarico.getMtbColr().get(0).getQtaCol(), mtbColtScarico.getMtbColr().get(0).getNumCnf()));
+        }
 
         mtbColtScarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
@@ -238,7 +323,9 @@ public class ProdRecuperoMaterialeViewModel {
                     final MtbColr mtbColrCarico = new MtbColr()
                             .setCodMart(item.getCodMart())
                             .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
-                            .setQtaCol(quantity)
+                            .setQtaCol(inputQtaTot)
+                            .setNumCnf(inputNumCnf)
+                            .setQtaCnf(inputQtaCnf)
                             .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
                             .setDatetimeRow(UtilityDate.getDateInstance())
                             .setNumColloRif(item.getNumColloRif())
@@ -257,7 +344,7 @@ public class ProdRecuperoMaterialeViewModel {
                 colliToSave.add(mtbColtScarico);
 
                 boolean finalShouldPrint = shouldPrint;
-                ColliMagazzinoRESTConsumer.saveColli(colliToSave, value -> {
+                ColliMagazzinoRESTConsumer.saveColliStatic(colliToSave, value -> {
 
                     FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java

@@ -2,14 +2,16 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import java.util.ArrayList;
+import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
@@ -17,7 +19,6 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel.ProdVersamentoMaterialViewModel;
-import it.integry.integrywmsnative.gest.versamento_merce.viewmodel.VersamentoMerceViewModel;
 
 public class ProdVersamentoMaterialeFragment extends Fragment implements ITitledFragment {
 
@@ -25,6 +26,8 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     private ProdVersamentoMaterialViewModel mViewmodel;
     private ProdVersamentoMaterialHelper mHelper;
 
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+
     public ProdVersamentoMaterialeFragment() {
         // Required empty public constructor
     }
@@ -40,9 +43,7 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
         mViewmodel = new ProdVersamentoMaterialViewModel();
-
     }
 
     @Override
@@ -58,17 +59,13 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     }
 
 
-
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
+    public void onDestroy() {
+        super.onDestroy();
 
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
         }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-
     }
 
 
@@ -81,7 +78,6 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
         });
 
         mViewmodel.openLU();
-
     }
 
 
@@ -89,4 +85,9 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(context.getText(R.string.prod_versamento_materiale_title_fragment).toString());
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java

@@ -13,18 +13,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
 import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
 import it.integry.integrywmsnative.core.model.CheckableOrdineLavoro;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
@@ -76,38 +77,52 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
         MtbColr mtbColr = mMtbColr;
         BigDecimal residuoCol = mtbColr.getQtaCol();
         BigDecimal residuoCnf = mtbColr.getNumCnf();
-        BigDecimal offsetCol = BigDecimal.ZERO.add(residuoCol);
-        BigDecimal offsetCnf = BigDecimal.ZERO.add(residuoCnf);
-        mtbColr.setQtaCnf(mtbColr.getQtaCol().divide(mtbColr.getNumCnf(),5,BigDecimal.ROUND_HALF_UP));
+
+        BigDecimal offsetCol = BigDecimal.ZERO.add(residuoCol); //Forced clone
+        BigDecimal offsetCnf = BigDecimal.ZERO.add(residuoCnf); //Forced clone
+
+        mtbColr.setQtaCnf(UtilityBigDecimal.divide(mtbColr.getQtaCol(), mtbColr.getNumCnf()));
 
         List<CheckableOrdineLavoro> ordiniSelezionati = getSelectedData();
-        int totalHr = Stream.of(ordiniSelezionati).mapToInt(x -> x.getItem().getOrdineLav().getHrNum()).sum();
+        int totalHr = Stream.of(ordiniSelezionati)
+                .mapToInt(x -> x.getItem().getOrdineLav().getHrNum())
+                .sum();
+
         for (CheckableOrdineLavoro c : ordiniSelezionati) {
             BigDecimal usedCol, usedCnf;
-            float perc = (c.getItem().getOrdineLav().getHrNum() * 100) / totalHr;
+            int perc = (c.getItem().getOrdineLav().getHrNum() * 100) / totalHr;
+
             if (SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.getMtbAart() != null && !mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean()) ){
-                usedCnf = residuoCnf.multiply(BigDecimal.valueOf(perc)).divide(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_FLOOR);
-                if (usedCnf.compareTo(BigDecimal.ZERO) <= 0 && offsetCnf.compareTo(BigDecimal.ZERO) > 0){
+                usedCnf = UtilityBigDecimal.divideAndRoundToInteger(residuoCnf.multiply(BigDecimal.valueOf(perc)), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+
+                if(UtilityBigDecimal.equalsOrLowerThan(usedCnf, BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(offsetCnf, BigDecimal.ZERO)) {
                     usedCnf = BigDecimal.ONE;
                 }
+
                 usedCol = usedCnf.multiply(mtbColr.getQtaCnf()).setScale(0,BigDecimal.ROUND_FLOOR);
             } else {
-                usedCol = residuoCol.multiply(BigDecimal.valueOf(perc)).divide(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_FLOOR);
-                if (usedCol.compareTo(BigDecimal.ZERO) <= 0 && offsetCol.compareTo(BigDecimal.ZERO) > 0){
+                usedCol = UtilityBigDecimal.divideAndRoundToInteger(residuoCol.multiply(BigDecimal.valueOf(perc)), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+
+                if (UtilityBigDecimal.equalsOrLowerThan(usedCol, BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(offsetCol, BigDecimal.ZERO)){
                     usedCol = BigDecimal.ONE;
                 }
-                usedCnf = usedCol.divide(mtbColr.getQtaCnf()).setScale(3, BigDecimal.ROUND_FLOOR);
+
+                usedCnf = UtilityBigDecimal.divide(usedCol, mtbColr.getQtaCnf(), RoundingMode.FLOOR);
             }
+
             offsetCol = offsetCol.subtract(usedCol);
             offsetCnf = offsetCnf.subtract(usedCnf);
+
             c.setQtaCol(usedCol.floatValue());
             c.setNumCnf(usedCnf.floatValue());
         }
+
         if (ordiniSelezionati.size() > 0) {
             CheckableOrdineLavoro majorOrder = Stream.of(ordiniSelezionati).max((o1, o2) -> Integer.compare(o1.getItem().getOrdineLav().getHrNum(), o2.getItem().getOrdineLav().getHrNum())).get();
             if (majorOrder == null) {
                 majorOrder = ordiniSelezionati.get(0);
             }
+
             if (offsetCnf.floatValue() != 0 || offsetCol.floatValue() != 0){
                 if ( SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.getMtbAart() != null && !mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                     majorOrder.setNumCnf(majorOrder.getNumCnf().get() + offsetCnf.floatValue());
@@ -116,8 +131,6 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
                     majorOrder.setQtaCol(majorOrder.getQtaCol().get() + offsetCol.floatValue());
                     majorOrder.setNumCnf(majorOrder.getQtaCol().get() / mtbColr.getQtaCnf().floatValue());
                 }
-
-
             }
         }
     }

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java

@@ -113,7 +113,7 @@ public class ProdVersamentoMaterialViewModel {
     }
 
     private void choosePosition() {
-        DialogAskPositionOfLU.makeBase(mContext, null, true, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLU.makeBase(mContext, true, (status, mtbDepoPosizione) -> {
 
             if (status == DialogConsts.Results.ABORT) {
                 ((IPoppableActivity) mContext).pop();

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java

@@ -55,15 +55,20 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
     private OrdineAcquistoPvHelper mHelper;
     private Griglia mGriglia;
     private OrdineAcquistoPvOpenListAdapter mAdapter;
-    private List<OrdineWrapper> mRenderedOrderList = new ArrayList<>();
+    private final List<OrdineWrapper> mRenderedOrderList = new ArrayList<>();
     private boolean mRedirectToNewOrder = true;
 
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+
     @Inject
     GrigliaRepository mGrigliaRepository;
+
     @Inject
     ArticoliOrdineRepository mArticoliOrdineRepository;
+
     @Inject
     ArticoloGrigliaRepository mArticoloGrigliaRepository;
+
     @Inject
     OrdineRepository mOrdineRepository;
 
@@ -191,8 +196,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
     }
 
     private void deleteOrdine(Ordine ordine) {
-
-
         String text = "Stai per eliminare un ordine sei sicuro?";
 
         DialogSimpleMessageHelper.makeWarningDialog(getActivity(), new SpannableString(Html.fromHtml(text)), null, () -> getActivity().runOnUiThread(() -> {
@@ -200,7 +203,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
             mHelper.deleteOrder(ordine, () -> {
                 getActivity().runOnUiThread(() -> {
                     progress.dismiss();
-                    Toast.makeText(getActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT);
+                    Toast.makeText(getActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT).show();
                     fetchOrders();
                 });
             }, e -> {
@@ -230,11 +233,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
 
     }
 
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -242,4 +240,18 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
             fetchOrders();
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoTransmittedListFragment.java

@@ -1,114 +0,0 @@
-package it.integry.integrywmsnative.gest.pv_ordini_acquisto;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.SpannableString;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.OrdineDataSource;
-import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
-import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
-import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
-import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
-import it.integry.integrywmsnative.databinding.FragmentPvOrdiniATrasmessiElencoBinding;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.core.OrdineAcquistoPvTransmittedListAdapter;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog.DialogOrdineProduzioneFiltroAvanzato;
-import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-
-public class PVOrdiniAcquistoTransmittedListFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
-
-    private FragmentPvOrdiniATrasmessiElencoBinding mBinding;
-    private OrdineAcquistoPvTransmittedListAdapter mAdapter;
-
-    private List<OrdineWithGriglia> mOriginalOrderList;
-    private List<OrdineWithGriglia> mRenderedOrderList = new ArrayList<>();
-
-    private DialogOrdineProduzioneFiltroAvanzato.DialogOrdineProduzioneFiltroAvanzatoViewModel mAppliedFilterViewModel;
-
-    public PVOrdiniAcquistoTransmittedListFragment() {
-        // Required empty public constructor
-    }
-
-    public static PVOrdiniAcquistoTransmittedListFragment newInstance() {
-        PVOrdiniAcquistoTransmittedListFragment fragment = new PVOrdiniAcquistoTransmittedListFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_pv_ordini_a_trasmessi_elenco, container, false);
-        mBinding.setView(this);
-
-
-        //init();
-        return mBinding.getRoot();
-    }
-
-    @Override
-    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
-        titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString());
-    }
-
-    @Override
-    public void setScrollToolbar(ElevatedToolbar toolbar) {
-
-    }
-
-    @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-
-    }
-
-    @Override
-    public void onFilterClick() {
-
-    }
-
-    private void init(){
-        final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
-
-
-        //TODO: resolve databinding
-        OrdineDataSource repository = null; //new OrdineDataSource();
-
-        repository.selectAllTransmitted((ordini)->{
-            mOriginalOrderList = ordini;
-            mBinding.ordiniAEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE);
-            refreshRenderedOrdini(ordini);
-            initRecyclerView();
-            progress.dismiss();
-        },(e)->{
-            progress.dismiss();
-            String errorMessage = e.getMessage();
-            DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
-        });
-
-    }
-
-    private void initRecyclerView() {
-        mAdapter = new OrdineAcquistoPvTransmittedListAdapter(getActivity(), mRenderedOrderList);
-        mBinding.ordineAMainList.setAdapter(mAdapter);
-    }
-
-    private void refreshRenderedOrdini(List<OrdineWithGriglia> ordini) {
-        mRenderedOrderList.clear();
-        if(ordini != null) mRenderedOrderList.addAll(ordini);
-    }
-}