Finish v1.23.2(257)

nascosta input tipo collo in accettazione se non ci sono tipi collo configurati

.idea/.gitignore

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

app/build.gradle

@@ -1,13 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (!project.hasProperty("disable-performance-plugin")) {
+    apply plugin: 'com.google.firebase.firebase-perf'
+}
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 247
-    def appVersionName = '1.20.0'
+    def appVersionCode = 257
+    def appVersionName = '1.23.2'
 
     signingConfigs {
         release {
@@ -27,12 +31,12 @@ android {
         }
     }
 
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -94,37 +98,37 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation platform('com.google.firebase:firebase-bom:29.1.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-core'
-    implementation 'com.google.firebase:firebase-crash'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.6.0'
+    implementation 'com.google.android.gms:play-services-basement:18.0.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.35.1'
+    def dagger2_version = '2.40'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version" // if you use the support libraries
+    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"
 
     //FAB
@@ -134,13 +138,12 @@ dependencies {
     implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
     implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
     implementation 'com.github.fede87:StatusBarAlert:1.0.1'
-    implementation 'com.github.akshay2211:Stash:master'
     testImplementation 'junit:junit:4.13.2'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.3.0"
+    def room_version = "2.4.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -159,7 +162,6 @@ dependencies {
 
 
     implementation 'com.github.RaviKoradiya:LiveAdapter:1.3.4'
-    implementation 'org.reflections:reflections:0.10.2'
 }
 
 repositories {

app/src/main/AndroidManifest.xml

@@ -40,7 +40,8 @@
         <activity
             android:name=".gest.main.MainActivity"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing">
+            android:windowSoftInputMode="adjustNothing"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
@@ -73,7 +74,8 @@
         <activity
             android:name=".SplashActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -11,14 +11,16 @@ import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePicking
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairComponent;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectMgrpDtipPairModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliModule;
+import it.integry.integrywmsnative.gest.login.LoginComponent;
+import it.integry.integrywmsnative.gest.login.LoginModule;
 import it.integry.integrywmsnative.gest.main.MainActivityComponent;
 import it.integry.integrywmsnative.gest.main.MainActivityModule;
 import it.integry.integrywmsnative.gest.main.MainFragmentComponent;
@@ -61,6 +63,7 @@ import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.Dial
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
@@ -76,6 +79,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         RoomModule.class,
         SplashActivityModule.class,
         MainApplicationModule.class,
+        LoginModule.class,
         MainActivityModule.class,
         MainFragmentModule.class,
         MainAccettazioneModule.class,
@@ -105,47 +109,85 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         ProdVersamentoMaterialeModule.class,
         DialogChooseArtsFromListaArtsModule.class,
         DocInterniModule.class,
-        DialogSelectMgrpDtipPairModule.class,
+        DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class
 })
 public interface MainApplicationComponent {
 
     SplashActivityComponent.Factory splashActivityComponent();
+
+    LoginComponent.Factory loginActivityComponent();
+
     MainActivityComponent.Factory mainActivityComponent();
+
     MainFragmentComponent.Factory mainFragmentComponent();
+
     MainAccettazioneComponent.Factory mainAccettazioneComponent();
+
     ListaBancaliComponent.Factory listaBancaliComponent();
+
     ContenutoBancaleComponent.Factory contenutoBancaleComponent();
+
     PVOrdiniAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
     PVOrdineAcquistoEditComponent.Factory pvOrdineAcquistoEditComponent();
+
     PickingLiberoComponent.Factory pickingLiberoComponent();
+
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
+
     SpedizioneComponent.Factory spedizioneComponent();
+
     AccettazionePickingComponent.Factory accettazionePickingComponent();
+
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+
     UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
+
     PickingResiComponent.Factory pickingResiComponent();
+
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+
     DialogInputLUProdComponent.Factory dialogInputLUProdComponent();
+
     DialogScanArtComponent.Factory dialogScanArtComponent();
+
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+
     VersamentoMerceComponent.Factory versamentoMerceComponent();
+
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+
     DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
+
     DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
+
     ProdRientroMerceComponent.Factory prodRientroMerceComponent();
+
     ProdRientroMerceOrderDetailComponent.Factory prodRientroMerceOrderDetailComponent();
+
     ProdOrdineProduzioneElencoComponent.Factory prodOrdineProduzioneElencoComponent();
+
     ProdRecuperoMaterialeComponent.Factory prodRecuperoMaterialeComponent();
+
     ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
+
     DialogChooseArtsFromListaArtsComponent.Factory dialogChooseArtsFromListaArtsComponent();
+
     DocInterniComponent.Factory docInterniComponent();
-    DialogSelectMgrpDtipPairComponent.Factory dialogSelectMgrpDtipPairComponent();
+
+    DialogSelectDocInfoComponent.Factory dialogSelectMgrpDtipPairComponent();
+
     DocInterniEditFormComponent.Factory docInterniEditFormComponent();
 
+    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
+
     void inject(MainApplication mainApplication);
+
     void inject(AppContext mainApplication);
 
 }

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

@@ -19,12 +19,14 @@ import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
@@ -165,5 +167,16 @@ public class MainApplicationModule {
         return new DocInterniRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    InventarioService provideInventarioService(GiacenzaRESTConsumer giacenzaRESTConsumer) {
+        return new InventarioService(giacenzaRESTConsumer);
+    }
 
 }

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

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

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

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

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

@@ -18,7 +18,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 4, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 5, exportSchema = false)
 @TypeConverters({
         DateConverter.class
 })

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

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

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

@@ -6,6 +6,8 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.math.BigDecimal;
+
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 @Entity(
@@ -54,6 +56,18 @@ public class ArticoloGriglia {
     @ColumnInfo(name = "qta_min_ordinabile")
     private float qtaMinOrdinabile;
 
+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza;
+
+    @ColumnInfo(name = "giacenza")
+    private float giacenza;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private float qtaPrevistaVendita;
+
+    @ColumnInfo(name = "qta_proposta")
+    private float qtaProposta;
+
     @ColumnInfo(name = "id_griglia")
     private int idGriglia;
 
@@ -145,6 +159,38 @@ public class ArticoloGriglia {
         this.idGriglia = idGriglia;
     }
 
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
     public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
         ArticoloOrdine articolo = new ArticoloOrdine();
 
@@ -160,6 +206,11 @@ public class ArticoloGriglia {
         articolo.setUntMis(this.getUntMis());
         articolo.setDescrizione(this.getDescrizione());
         articolo.setDataIns(UtilityDate.getDateInstance());
+        articolo.setGgScadenza(this.getGgScadenza());
+        articolo.setGiacenza(BigDecimal.valueOf(this.getGiacenza()));
+        articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
+        articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
+
         articolo.setQtaOrd(0);
 
         return articolo;

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

@@ -3,16 +3,19 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
+import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 @Entity(
         tableName = "articoli_ordine",
         indices = {
                 @Index(value = "id_ordine"),
-                @Index(value = {"id_ordine","cod_mart"}, unique = true)
+                @Index(value = {"id_ordine", "cod_mart"}, unique = true)
         },
         foreignKeys = {
                 @ForeignKey(
@@ -22,7 +25,7 @@ import java.util.Date;
                         onDelete = ForeignKey.CASCADE
                 )
         }
-        )
+)
 public class ArticoloOrdine {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_ordine_id")
@@ -64,6 +67,20 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "data_ins")
     private Date dataIns;
 
+
+    @Ignore
+    private int ggScadenza = 0;
+
+    @Ignore
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+
     public int getArticoloOrdineId() {
         return articoloOrdineId;
     }
@@ -167,4 +184,51 @@ public class ArticoloOrdine {
     public void setDataIns(Date dataIns) {
         this.dataIns = dataIns;
     }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public ArticoloOrdine setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public ArticoloOrdine setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public ArticoloOrdine setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public ArticoloOrdine setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnfPrevistaVendita(){
+        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+    }
+
+    public BigDecimal getQtaCnfProposta(){
+        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+    }
+    public BigDecimal getQtaCnfGiacenza(){
+        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+    }
 }

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

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

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

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

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

@@ -1,34 +1,38 @@
 package it.integry.integrywmsnative.core.data_store.db.view_model;
 
+import androidx.room.ColumnInfo;
+
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 
 public class ArticoloDTO {
 
     private String codMart;
 
-
     private String descrizione;
 
-
     private String untMis;
 
-
-    private float qtaCnf;
-
-
     private String barcode;
 
-
-    private float merceDaRic;
-
-
-    private float mediaSett;
-
-
     private String flagQtaMultipla;
 
+    private float qtaCnf;
+
+    private float merceDaRic;
+
+    private float mediaSett;
+
     private float qtaMinOrdinabile;
 
+    private int ggScadenza;
+
+    private float giacenza;
+
+    private float qtaPrevistaVendita;
+
+    private float qtaProposta;
+
+
     public String getCodMart() {
         return codMart;
     }
@@ -101,8 +105,47 @@ public class ArticoloDTO {
         this.qtaMinOrdinabile = qtaMinOrdinabile;
     }
 
+    public String getBarcode() {
+        return barcode;
+    }
 
-    public ArticoloGriglia toArticoloGriglia(){
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public ArticoloGriglia toArticoloGriglia() {
         ArticoloGriglia result = new ArticoloGriglia();
         result.setBarCode(this.getBarCode());
         result.setDescrizione(this.getDescrizione());
@@ -113,6 +156,10 @@ public class ArticoloDTO {
         result.setMediaSett(this.getMediaSett());
         result.setFlagQtaMultipla(this.getFlagQtaMultipla());
         result.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
+        result.setGgScadenza(this.ggScadenza);
+        result.setGiacenza(this.giacenza);
+        result.setQtaPrevistaVendita(this.qtaPrevistaVendita);
+        result.setQtaProposta(this.qtaProposta);
 
         return result;
     }

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

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

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

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

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

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

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

@@ -22,8 +22,6 @@ public abstract class BaseFragment extends Fragment {
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
 
 
-
-
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
@@ -34,10 +32,6 @@ public abstract class BaseFragment extends Fragment {
     }
 
 
-
-
-
-
     public void onLoadingStarted() {
         new Thread(() -> {
             BarcodeManager.disable();
@@ -71,23 +65,25 @@ public abstract class BaseFragment extends Fragment {
     }
 
     protected void openProgress() {
-            getActivity().runOnUiThread(() -> {
-                if (this.mCurrentProgress == null) {
-                    this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-                }
-            });
+        getActivity().runOnUiThread(() -> {
+            if (this.mCurrentProgress == null) {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            }
+        });
     }
 
     protected void closeProgress() {
-            getActivity().runOnUiThread(() -> {
-                if (mCurrentProgress != null) {
-                    mCurrentProgress.dismiss();
-                    mCurrentProgress = null;
-                }
-            });
+        getActivity().runOnUiThread(() -> {
+            if (mCurrentProgress != null) {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            }
+        });
     }
 
     protected void popMe() {
-        ((IPoppableActivity) requireActivity()).pop();
+        getActivity().runOnUiThread(() -> {
+            ((IPoppableActivity) requireActivity()).pop();
+        });
     }
 }

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

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

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

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

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

@@ -57,6 +57,7 @@ public class MtbColt extends EntityBase {
     private String codJcom;
 
     private List<MtbCols> mtbCols;
+    private MtbTCol mtbTCol;
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -83,7 +84,6 @@ public class MtbColt extends EntityBase {
     }
 
 
-
     private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
 
     public ObservableArrayList<MtbColr> getMtbColr() {
@@ -95,12 +95,12 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public MtbColt(){
+    public MtbColt() {
         type = "mtb_colt";
         setDataCollo(UtilityDate.getDateInstance());
         setSerCollo("/");
 
-        if(SettingsManager.i().isUserLoggedIn()) {
+        if (SettingsManager.i().isUserLoggedIn()) {
             setPreparatoDa(SettingsManager.i().getUser().getFullname());
         }
     }
@@ -137,11 +137,11 @@ public class MtbColt extends EntityBase {
         Date dataColloD = null;
         try {
             dataColloD = getDataColloD();
-        } catch (Exception ex){
+        } catch (Exception ex) {
             UtilityLogger.errorMe(ex);
         }
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG);
         } else return null;
     }
@@ -392,7 +392,7 @@ public class MtbColt extends EntityBase {
     public String getTimeVers() {
         Date dataColloD = getDataVersD();
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.TIME);
         } else return null;
     }
@@ -526,6 +526,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbTCol getMtbTCol() {
+        return mtbTCol;
+    }
+
+    public MtbColt setMtbTCol(MtbTCol mtbTCol) {
+        this.mtbTCol = mtbTCol;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";
@@ -533,9 +542,9 @@ public class MtbColt extends EntityBase {
 
         StringBuilder whereCond = new StringBuilder();
 
-        if(filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
+        if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
 
-            for(int i = 0; i < filtroOrdineDtos.size(); i++){
+            for (int i = 0; i < filtroOrdineDtos.size(); i++) {
                 FiltroOrdineDTO x = filtroOrdineDtos.get(i);
 
                 try {
@@ -545,13 +554,13 @@ public class MtbColt extends EntityBase {
                             UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
                             UtilityDB.valueToString(x.getNumOrd())));
 
-                    if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
+                    if (!UtilityString.isNullOrEmpty(x.getDataConsS())) {
                         whereCond.append(String.format(" AND dr.dc = %s",
                                 UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
                     }
 
                     whereCond.append(")");
-                    if(i < filtroOrdineDtos.size()-1) {
+                    if (i < filtroOrdineDtos.size() - 1) {
                         whereCond.append(" OR ");
                     }
                 } catch (Exception e) {

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

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

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.databinding.ObservableArrayList;
 
+import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -32,6 +33,7 @@ import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -153,7 +155,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
             mtbColrClone
                     .setNumCollo(null)
-                    .setDataCollo(null)
+                    .setDataCollo((String) null)
                     .setRiga(null)
                     .setGestione(GestioneEnum.LAVORAZIONE)
 
@@ -207,7 +209,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColr mtbColrClone = new MtbColr();
         mtbColrClone
                 .setNumCollo(null)
-                .setDataCollo(null)
+                .setDataCollo((String) null)
                 .setRiga(null)
                 .setGestione(GestioneEnum.LAVORAZIONE)
                 .setDataColloRif(sourceMtbColt.getDataColloD())
@@ -237,7 +239,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(newMtbColt, onComplete, onFailed);
     }
 
-
     public void createColloFromEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         createColloFromEtichettaAnonima(barcodeScanDTO.getStringValue(), gestione, onComplete, onFailed);
     }
@@ -397,7 +398,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }, onFailed);
     }
 
-
     private void cyclicGetMultipleByTestate(@NotNull Iterator<MtbColt> sourceMtbColts, boolean onlyResiduo, ArrayList<MtbColt> resultMtbColt, Runnable onComplete, RunnableArgs<Exception> onAbort) {
         if (sourceMtbColts.hasNext()) {
             getByTestata(sourceMtbColts.next(), onlyResiduo, false, mtbColt -> {
@@ -447,7 +447,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
     public void changePosizione(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         String codMdep = posizione.getCodMdep();
@@ -543,7 +542,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }, onFailed);
     }
 
-
     public static void retrieveBasketColli(RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService.getColliInBasket(SettingsManager.i().getUserSession().getDepo().getCodMdep()).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
@@ -620,7 +618,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
     public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
 
@@ -646,4 +643,57 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void versamentoAutomaticoUL(MtbColt sourceMtbColt, RunnableArgs<VersamentoAutomaticoULResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
+
+        for (int i = 0; i < sourceMtbColtClone.getMtbColr().size(); i++) {
+            sourceMtbColtClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
+        }
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Response<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> response) {
+                analyzeAnswer(response, "versamentoAutomaticoUL", data -> {
+                    var result = response.body().getDto();
+
+                    List<MtbColr> allMtbColr = new ArrayList<>();
+                    allMtbColr.addAll(result.getSuccess());
+                    allMtbColr.addAll(result.getFailed());
+
+                    List<String> codMarts = Stream.of(allMtbColr)
+                            .map(x -> x.getCodMart().trim())
+                            .toList();
+
+                    mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                        for (var mtbColr : allMtbColr) {
+
+                            MtbAart foundMtbAart = null;
+
+                            Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                    .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                                    .findFirst();
+
+                            if (mtbAartOpt.isPresent()) {
+                                foundMtbAart = mtbAartOpt.get();
+                            }
+
+                            mtbColr.setMtbAart(foundMtbAart);
+                        }
+
+                        onComplete.run(result);
+                    }, onFailed);
+
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Throwable t) {
+                if (onFailed != null) onFailed.run(new Exception(t));
+            }
+        });
+    }
+
 }

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

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

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

@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
+
+@Singleton
+public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
+
+    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final ArticoloRESTConsumer mArticoloRESTConsumer;
+
+    public GiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
+
+    }
+
+    public void getGiacenzeInPosizione(MtbDepoPosizione posizione, RunnableArgs<List<MvwSitArtUdcDetInventario>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("posizione", posizione.getPosizione());
+        String whereCond = UtilityQuery.concatFieldsInWhereCond(params);
+        String query = "SELECT * from mvw_sitart_udc_det_inventario" +
+                "  WHERE " + whereCond;
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MvwSitArtUdcDetInventario>>() {
+        }.getType();
+        this.mSystemRESTConsumer.<ArrayList<MvwSitArtUdcDetInventario>>processSql(query, typeOfObjectsList, inventarioList -> {
+            List<String> codMarts = Stream.of(inventarioList)
+                    .map(x -> x.getCodMart().trim())
+                    .toList();
+
+            mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                for (var row : inventarioList) {
+
+                    MtbAart foundMtbAart = null;
+                    Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                            .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                            .findFirst();
+
+                    if (mtbAartOpt.isPresent()) {
+                        foundMtbAart = mtbAartOpt.get();
+                    }
+
+                    row.setMtbAart(foundMtbAart);
+                }
+
+                onComplete.run(inventarioList);
+            }, onFailed);
+        }, onFailed);
+    }
+
+
+}

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.settings;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
@@ -33,6 +34,7 @@ public class DBSettingsModel {
     private boolean flagForceAllToColli;
     private boolean flagSpedizioneEnableManualPick;
     private boolean flagSpedizioneCanSelectMultipleOrders;
+    private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
@@ -271,4 +273,13 @@ public class DBSettingsModel {
         this.onNumCnfInputChanged = onNumCnfInputChanged;
         return this;
     }
+
+    public List<String> getNotePerditaDocInterni() {
+        return notePerditaDocInterni;
+    }
+
+    public DBSettingsModel setNotePerditaDocInterni(List<String> notePerditaDocInterni) {
+        this.notePerditaDocInterni = notePerditaDocInterni;
+        return this;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.google.firebase.perf.metrics.Trace;
 
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
@@ -129,7 +130,7 @@ public class SettingsManager {
     }
 
     private static void loadAvailableCodMdeps(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
+        SystemRESTConsumer.getAvailableCodMdepsStatic(availableCodMdeps -> {
             dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
 
             if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
@@ -265,6 +266,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SETUP")
                 .setKeySection("ON_NUM_CNF_INPUT_CHANGED"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("NOTE_PERDITA"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -289,6 +294,10 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
             dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
+            String notePerdita = getValueFromList(list,"DOC_INTERNI","NOTE_PERDITA",String.class);
+            if (notePerdita != null){
+                dbSettingsModelIstance.setNotePerditaDocInterni(Arrays.asList(notePerdita.split("\\|")));
+            }
 
             Integer onNumCnfInputChanged = getValueFromList(list, "SETUP", "ON_NUM_CNF_INPUT_CHANGED", Integer.class);
             if (onNumCnfInputChanged != null) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoComponent.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogSelectDocInfoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogSelectDocInfoComponent create();
+    }
+
+
+    void inject(DialogSelectDocInfoView dialogSelectDocInfoView);
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoModule.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogSelectDocInfoComponent.class)
+public class DialogSelectDocInfoModule {
+
+    @Singleton
+    @Provides
+    DialogSelectDocInfoViewModel dialogSelectMgrpDtipPairViewModel() {
+        return new DialogSelectDocInfoViewModel();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoView.java

@@ -0,0 +1,240 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
+
+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 android.view.WindowManager;
+import android.widget.ArrayAdapter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableField;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityObservable;
+import it.integry.integrywmsnative.databinding.DialogSelectDocInfoBinding;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
+
+public class DialogSelectDocInfoView extends BaseDialogFragment implements DialogSelectDocInfoViewModel.Listener {
+
+    @Inject
+    DialogSelectDocInfoViewModel mViewModel;
+    private Context mCurrentContext;
+
+
+    public BindableString codDtip = new BindableString();
+    public BindableString codMgrp = new BindableString();
+    public BindableString codAnag = new BindableString();
+    public BindableString numDoc = new BindableString();
+    public BindableString note = new BindableString();
+    public ObservableField<Date> dataDoc = new ObservableField<>();
+
+    private ArrayAdapter<String> arrayAdapterCodDtips;
+    private ArrayAdapter<String> arrayAdapterCodMgrps;
+    private ArrayAdapter<String> arrayAdapterCodAnags;
+    private ArrayAdapter<String> arrayAdapterNote;
+    private DialogSelectDocInfoBinding mBindings;
+
+    private final RunnableArgs<DialogSelectDocInfoViewModel> currentOnFilterDone;
+    private final DocInterniSetupDTO docInterniSetupDTO;
+    private final TipiDocDTO selectedDtip;
+    private final GruppiArticoloDTO selectedGrp;
+    private final FornitoreDTO selectedAnag;
+    private final Date selectedDataDoc;
+    private final String selectedNumDoc;
+    private final String selectedNote;
+
+    public static DialogSelectDocInfoView newInstance(
+            DocInterniSetupDTO docInterniSetupDTO,
+            TipiDocDTO tipiDocDTO,
+            GruppiArticoloDTO gruppiArticoloDTO,
+            FornitoreDTO fornitoreDTO,
+            Date dataDoc,
+            String numDoc,
+            String note,
+            RunnableArgs<DialogSelectDocInfoViewModel> onDismiss
+    ) {
+        return new DialogSelectDocInfoView(docInterniSetupDTO, tipiDocDTO, gruppiArticoloDTO, fornitoreDTO, dataDoc, numDoc,note, onDismiss);
+    }
+
+
+    private DialogSelectDocInfoView(DocInterniSetupDTO docInterniSetupDTO,
+                                    TipiDocDTO tipiDocDTO,
+                                    GruppiArticoloDTO gruppiArticoloDTO,
+                                    FornitoreDTO fornitoreDTO,
+                                    Date dataDoc,
+                                    String numDoc,
+                                    String note,
+                                    RunnableArgs<DialogSelectDocInfoViewModel> onDismiss) {
+        super();
+        currentOnFilterDone = onDismiss;
+        this.docInterniSetupDTO = docInterniSetupDTO;
+        selectedDtip = tipiDocDTO;
+        selectedGrp = gruppiArticoloDTO;
+        selectedDataDoc = dataDoc;
+        selectedNumDoc = numDoc;
+        selectedNote = note;
+        selectedAnag = fornitoreDTO;
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (currentOnFilterDone != null) currentOnFilterDone.run(mViewModel);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mCurrentContext = this.requireActivity();
+
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_select_doc_info, container, false);
+        mBindings.setLifecycleOwner(this);
+
+        MainApplication
+                .appComponent
+                .dialogSelectMgrpDtipPairComponent()
+                .create()
+                .inject(this);
+        mViewModel.init(docInterniSetupDTO);
+        mViewModel.setListeners(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
+
+        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        initView();
+
+
+        mBindings.positiveBtn.setOnClickListener(view -> {
+            if (this.isInputValid()) {
+                getDialog().dismiss();
+            }
+        });
+
+
+        return mBindings.getRoot();
+    }
+
+    private void initView() {
+        initArrayAdapters();
+        initBindables();
+
+        if (selectedDtip != null) {
+            codDtip.set(selectedDtip.getLabel());
+        }
+        if (selectedGrp != null) {
+            codMgrp.set(selectedGrp.getLabel());
+        }
+        if (selectedAnag != null) {
+            codAnag.set(selectedAnag.getLabel());
+        }
+        if (selectedDataDoc != null) {
+            dataDoc.set(selectedDataDoc);
+        }
+        if (selectedNumDoc != null) {
+            numDoc.set(selectedNumDoc);
+        }
+        if (selectedNote != null) {
+            note.set(selectedNote);
+        }
+    }
+
+    private boolean isInputValid() {
+        if (this.mViewModel.getSelectedTipoDoc() == null) {
+            mBindings.inputCodDtip.setErrorEnabled(true);
+            mBindings.inputCodDtip.setError("Seleziona un tipo documento");
+            return false;
+        }
+
+        if (this.mViewModel.requiresFornitore() && this.mViewModel.getSelectedFornitore() == null) {
+            mBindings.inputCodAnagForn.setErrorEnabled(true);
+            mBindings.inputCodAnagForn.setError("Seleziona un fornitore/destinatario");
+            return false;
+        }
+
+        if (this.mViewModel.requiresDocData() && this.mViewModel.getDataDoc() == null){
+            mBindings.inputDataDoc.setError("Seleziona la data del documento");
+            return false;
+        }
+
+        if (this.mViewModel.requiresDocData() && (this.mViewModel.getNumDoc() == null || this.mViewModel.getNumDoc().isEmpty() )){
+            mBindings.inputNumDoc.setError("Seleziona il numero del documento");
+            return false;
+        }
+
+        if (this.mViewModel.requiresNote() && (this.mViewModel.getNote() == null || this.mViewModel.getNote().isEmpty() )){
+            mBindings.inputNoteLayout.setErrorEnabled(true);
+            mBindings.inputNoteLayout.setError("Specifica delle note per il documento");
+            return false;
+        }
+
+        return true;
+    }
+
+    private void initArrayAdapters() {
+
+        arrayAdapterCodDtips = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_doc_info__single_item);
+        arrayAdapterCodDtips.addAll(mViewModel.getAvailableCodDtips());
+        mBindings.filledExposedDropdownCodDtips.setAdapter(arrayAdapterCodDtips);
+
+        arrayAdapterCodMgrps = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_doc_info__single_item);
+        arrayAdapterCodMgrps.addAll(mViewModel.getAvailableCodMgrps());
+        mBindings.filledExposedDropdownCodMgrps.setAdapter(arrayAdapterCodMgrps);
+
+        arrayAdapterCodAnags = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_doc_info__single_item);
+        arrayAdapterCodAnags.addAll(mViewModel.getAvailableFornitori());
+        mBindings.filledExposedDropdownCodAnagList.setAdapter(arrayAdapterCodAnags);
+
+        arrayAdapterNote = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_doc_info__single_item);
+        arrayAdapterNote.addAll(mViewModel.getAdditionalNotes());
+        mBindings.filledExposedDropdownNote.setAdapter(arrayAdapterNote);
+    }
+
+    private void initBindables() {
+        BindableString.registerListener(codDtip, codDtip -> {
+            mViewModel.setCodDtip(codDtip);
+            mBindings.inputCodAnagForn.setVisibility(mViewModel.requiresFornitore() ? View.VISIBLE : View.GONE);
+            mBindings.inputDataDocLayout.setVisibility(mViewModel.requiresDocData() ? View.VISIBLE : View.GONE);
+            mBindings.inputNumDocLayout.setVisibility(mViewModel.requiresDocData() ? View.VISIBLE : View.GONE);
+            mBindings.inputNoteLayout.setVisibility(mViewModel.requiresNote() ? View.VISIBLE : View.GONE);
+        });
+        BindableString.registerListener(codMgrp, mViewModel::setCodMgrp);
+        BindableString.registerListener(codAnag, mViewModel::setCodAnag);
+        BindableString.registerListener(numDoc, mViewModel::setNumDoc);
+        BindableString.registerListener(note, mViewModel::setNote);
+        UtilityObservable.addPropertyChanged(this.dataDoc, (value) -> {
+            this.mViewModel.setDataDoc(value);
+        });
+    }
+
+
+    @Override
+    public void onDocTypeSelected() {
+        arrayAdapterCodAnags.clear();
+        if (mViewModel.getSelectedFornitore() != null && !mViewModel.getAvailableFornitori().contains(mViewModel.getSelectedFornitore().getLabel())) {
+            codAnag.set("");
+        }
+        if (mViewModel.getNote() != null && ! mViewModel.requiresNote()){
+            mViewModel.setNote(null);
+        }
+        arrayAdapterCodAnags.addAll(mViewModel.getAvailableFornitori());
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java

@@ -0,0 +1,192 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
+
+import com.annimon.stream.Stream;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
+
+
+public class DialogSelectDocInfoViewModel {
+
+
+    private DocInterniSetupDTO mDocInterniSetupDTO;
+
+    private String mTipoDoc;
+
+    private String mGruppoArt;
+
+    private String mFornitore;
+
+    private Date mDataDoc;
+
+    private String mNumDoc;
+
+    private String mNote;
+
+    private Listener mListener;
+
+    public void init(DocInterniSetupDTO initialList) {
+        this.mDocInterniSetupDTO = initialList;
+    }
+
+    public String getCodDtip() {
+        return mTipoDoc;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.mTipoDoc = codDtip;
+        if (this.getSelectedTipoDoc() != null) {
+            this.mListener.onDocTypeSelected();
+        }
+    }
+
+    public String getCodMgrp() {
+        return mGruppoArt;
+    }
+
+    public void setCodMgrp(String codMgrp) {
+        this.mGruppoArt = codMgrp;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.mFornitore = codAnag;
+    }
+
+    public Date getDataDoc() {
+        return mDataDoc;
+    }
+
+    public void setDataDoc(Date mDataDoc) {
+        this.mDataDoc = mDataDoc;
+    }
+
+    public String getNumDoc() {
+        return mNumDoc;
+    }
+
+    public void setNumDoc(String numDoc) {
+        this.mNumDoc = numDoc;
+    }
+
+    public String getNote() {
+        return mNote;
+    }
+
+    public DialogSelectDocInfoViewModel setNote(String note) {
+        this.mNote = note;
+        return this;
+    }
+
+    public DialogSelectDocInfoViewModel setListeners(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public List<String> getAvailableCodDtips() {
+        return mDocInterniSetupDTO.getTipiDoc() != null ? Stream.of(mDocInterniSetupDTO.getTipiDoc()).map(TipiDocDTO::getLabel).toList() : new ArrayList<>();
+    }
+
+    public List<String> getAvailableCodMgrps() {
+        return mDocInterniSetupDTO.getGruppiArt() != null ? Stream.of(mDocInterniSetupDTO.getGruppiArt()).map(GruppiArticoloDTO::getLabel).toList() : new ArrayList<>();
+    }
+
+    public List<String> getAvailableFornitori() {
+        if (!this.requiresFornitore()) {
+            return new ArrayList<>();
+        }
+        TipiDocDTO selectedDocType = getSelectedTipoDoc();
+
+        return Stream.of(mDocInterniSetupDTO.getFornitori())
+                .filter(forn -> {
+                    if (selectedDocType.getGestioneDoc().equalsIgnoreCase("T")) {
+                        return forn.getTipoAnag().equalsIgnoreCase("D") &&
+                                forn.getGestioneAnag().equalsIgnoreCase(
+                                        selectedDocType.getGestione().equalsIgnoreCase("V") ? "V" : "A"
+                                );
+                    } else {
+                        return forn.getTipoAnag().equalsIgnoreCase("F") ;
+                    }
+                })
+                .map(FornitoreDTO::getLabel).toList();
+    }
+
+    public TipiDocDTO getSelectedTipoDoc() {
+        return Stream.of(mDocInterniSetupDTO.getTipiDoc()).filter(x -> x.getLabel().equals(mTipoDoc)).findFirstOrElse(null);
+    }
+
+    public FornitoreDTO getSelectedFornitore() {
+        return Stream.of(mDocInterniSetupDTO.getFornitori()).filter(x -> x.getLabel().equals(mFornitore)).findFirstOrElse(null);
+    }
+
+    public GruppiArticoloDTO getSelectedGruppoArt() {
+        if (mGruppoArt == null) {
+            return null;
+        }
+
+        return Stream.of(mDocInterniSetupDTO.getGruppiArt()).filter(x -> x.getLabel().equals(mGruppoArt)).findFirstOrElse(null);
+    }
+
+    public boolean requiresFornitore() {
+        return this.getSelectedTipoDoc() != null && (
+                this.getSelectedTipoDoc().getGestioneDoc().equals("T") ||
+                        this.getSelectedTipoDoc().getGestioneDoc().equals("A") ||
+                        (
+                                this.getSelectedTipoDoc().getGestioneDoc().equals("P") &&
+                                        !this.getSelectedTipoDoc().getGestione().equals("L")
+                        )
+        );
+    }
+
+    public boolean requiresNote() {
+        return this.getSelectedTipoDoc() != null &&
+                this.getSelectedTipoDoc().getGestioneDoc().equals("P") &&
+                this.getSelectedTipoDoc().getGestione().equals("L")
+        ;
+    }
+
+    public boolean isInputValid() {
+        if (this.getSelectedTipoDoc() == null) {
+            return false;
+        }
+
+        if (this.requiresFornitore() && this.getSelectedFornitore() == null) {
+            return false;
+        }
+
+        if (this.requiresDocData() && (this.getDataDoc() == null || this.getNumDoc() == null)){
+            return false;
+        }
+
+
+        if (this.requiresNote() && (this.getNote() == null || this.getNote().length() <= 0) ){
+            return false;
+        }
+
+        return true;
+    }
+
+    public boolean requiresDocData() {
+        TipiDocDTO doc =  this.getSelectedTipoDoc();
+        return doc != null && doc.getGestioneDoc().equalsIgnoreCase("P") && !doc.getGestione().equalsIgnoreCase("L");
+    }
+
+    public List<String> getAdditionalNotes() {
+        return SettingsManager.iDB().getNotePerditaDocInterni();
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+        void onDocTypeSelected();
+
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectMgrpDtipPairComponent.java

@@ -1,17 +0,0 @@
-package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
-
-import dagger.Subcomponent;
-import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
-
-@Subcomponent
-public interface DialogSelectMgrpDtipPairComponent {
-
-    @Subcomponent.Factory
-    interface Factory {
-        DialogSelectMgrpDtipPairComponent create();
-    }
-
-
-    void inject(DialogSelectMgrpDtipPairView dialogSelectMgrpDtipPairView);
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectMgrpDtipPairModule.java

@@ -1,17 +0,0 @@
-package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module(subcomponents = DialogSelectMgrpDtipPairComponent.class)
-public class DialogSelectMgrpDtipPairModule {
-
-    @Singleton
-    @Provides
-    DialogSelectMgrpDtipPairViewModel dialogSelectMgrpDtipPairViewModel() {
-        return new DialogSelectMgrpDtipPairViewModel();
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectMgrpDtipPairView.java

@@ -1,161 +0,0 @@
-package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
-
-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 android.view.WindowManager;
-import android.widget.ArrayAdapter;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-
-import javax.inject.Inject;
-
-import it.integry.integrywmsnative.MainApplication;
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.di.BindableString;
-import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.databinding.DialogSelectTipoDocAndGroupArtBinding;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
-
-public class DialogSelectMgrpDtipPairView extends BaseDialogFragment {
-
-    @Inject
-    DialogSelectMgrpDtipPairViewModel mViewModel;
-    private Context mCurrentContext;
-
-
-    public BindableString codDtip = new BindableString();
-    public BindableString codMgrp = new BindableString();
-    private ArrayAdapter<String> arrayAdapterCodDtips;
-    private ArrayAdapter<String> arrayAdapterCodMgrps;
-    private DialogSelectTipoDocAndGroupArtBinding mBindings;
-
-    private RunnableArgs<DialogSelectMgrpDtipPairViewModel> currentOnFilterDone;
-    private TipiDocAndGruppiArtDTO mTipiDocAndGruppiArtDTO;
-    private TipiDocDTO mSelectedDtip;
-    private GruppiArticoloDTO mSelectedGrp;
-
-
-    public static DialogSelectMgrpDtipPairView newInstance(
-            TipiDocAndGruppiArtDTO tipiDocAndGruppiArtDTO,
-            TipiDocDTO tipiDocDTO,
-            GruppiArticoloDTO gruppiArticoloDTO,
-            RunnableArgs<DialogSelectMgrpDtipPairViewModel> onDismiss
-    ) {
-        return new DialogSelectMgrpDtipPairView(tipiDocAndGruppiArtDTO,tipiDocDTO,gruppiArticoloDTO, onDismiss);
-    }
-
-
-    private DialogSelectMgrpDtipPairView(TipiDocAndGruppiArtDTO tipiDocAndGruppiArtDTO,TipiDocDTO tipiDocDTO, GruppiArticoloDTO gruppiArticoloDTO,  RunnableArgs<DialogSelectMgrpDtipPairViewModel> onDismiss) {
-        super();
-        currentOnFilterDone = onDismiss;
-        mTipiDocAndGruppiArtDTO = tipiDocAndGruppiArtDTO;
-        mSelectedDtip = tipiDocDTO;
-        mSelectedGrp = gruppiArticoloDTO;
-    }
-
-    @Override
-    public void onDismiss(@NonNull DialogInterface dialog) {
-        super.onDismiss(dialog);
-        if (currentOnFilterDone != null) currentOnFilterDone.run(mViewModel);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.mCurrentContext = this.requireActivity();
-
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_select_tipo_doc_and_group_art, container, false);
-        mBindings.setLifecycleOwner(this);
-
-        MainApplication
-                .appComponent
-                .dialogSelectMgrpDtipPairComponent()
-                .create()
-                .inject(this);
-        mViewModel.init(mTipiDocAndGruppiArtDTO);
-        mBindings.setView(this);
-        mBindings.setViewmodel(mViewModel);
-
-        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        initView();
-
-
-        mBindings.positiveBtn.setOnClickListener(view -> {
-            if (this.isInputValid()) {
-                getDialog().dismiss();
-            }
-        });
-
-
-        return mBindings.getRoot();
-    }
-
-    private void initView() {
-        initArrayAdapters();
-        initBindables();
-        if (mSelectedDtip != null){
-            codDtip.set(mSelectedDtip.getLabel());
-        }
-        if (mSelectedGrp != null){
-            codMgrp.set(mSelectedGrp.getLabel());
-        }
-    }
-
-    private boolean isInputValid() {
-        if (this.mViewModel.getSelectedTipoDoc() == null) {
-            mBindings.inputCodDtip.setErrorEnabled(true);
-            mBindings.inputCodDtip.setError("Seleziona un tipo documento");
-            return false;
-        }
-        if (this.mViewModel.getSelectedGruppoArt() == null) {
-            mBindings.inputCodMgrps.setErrorEnabled(true);
-            mBindings.inputCodMgrps.setError("Seleziona un gruppo merceologico");
-            return false;
-        }
-
-        return true;
-    }
-
-    private void initArrayAdapters() {
-
-        arrayAdapterCodDtips = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_tipo_doc_and_group_art__single_item);
-        arrayAdapterCodDtips.addAll(mViewModel.getAvailableCodDtips());
-        mBindings.filledExposedDropdownCodDtips.setAdapter(arrayAdapterCodDtips);
-
-
-        arrayAdapterCodMgrps = new ArrayAdapter<>(mCurrentContext, R.layout.dialog_select_tipo_doc_and_group_art__single_item);
-        arrayAdapterCodMgrps.addAll(mViewModel.getAvailableCodMgrps());
-        mBindings.filledExposedDropdownCodMgrps.setAdapter(arrayAdapterCodMgrps);
-    }
-
-    public DialogSelectMgrpDtipPairView setCodDtip(String codDtip) {
-        this.codDtip.set(codDtip);
-        return this;
-    }
-
-    public DialogSelectMgrpDtipPairView setCodMgrp(String codMgrp) {
-        this.codMgrp.set(codMgrp);
-        return this;
-    }
-
-
-    private void initBindables() {
-
-        BindableString.registerListener(codDtip, mViewModel::setCodDtip);
-        BindableString.registerListener(codMgrp, mViewModel::setCodMgrp);
-
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectMgrpDtipPairViewModel.java

@@ -1,62 +0,0 @@
-package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
-
-import com.annimon.stream.Stream;
-
-import java.util.List;
-
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
-
-
-public class DialogSelectMgrpDtipPairViewModel {
-
-
-    private TipiDocAndGruppiArtDTO mTipiDocAndGruppiArtDTO;
-
-    private String mTipoDoc;
-    private String mGruppoArt;
-
-    public void init(TipiDocAndGruppiArtDTO initialList) {
-        this.mTipiDocAndGruppiArtDTO = initialList;
-    }
-
-    public String getCodDtip() {
-        return mTipoDoc;
-    }
-
-    public void setCodDtip(String codDtip) {
-        this.mTipoDoc = codDtip;
-    }
-
-    public String getCodMgrp() {
-        return mGruppoArt;
-    }
-
-    public void setCodMgrp(String codMgrp) {
-        this.mGruppoArt = codMgrp;
-    }
-
-    public List<String> getAvailableCodDtips() {
-        return Stream.of(mTipiDocAndGruppiArtDTO.getTipiDoc()).map(TipiDocDTO::getLabel).toList();
-    }
-
-    public List<String> getAvailableCodMgrps() {
-        return Stream.of(mTipiDocAndGruppiArtDTO.getGruppiArt()).map(GruppiArticoloDTO::getLabel).toList();
-    }
-
-    public TipiDocDTO getSelectedTipoDoc(){
-        if (mTipoDoc == null){
-            return null;
-        }
-        return Stream.of(mTipiDocAndGruppiArtDTO.getTipiDoc()).filter(x->x.getLabel().equals(mTipoDoc)).findFirstOrElse(null);
-    }
-
-    public GruppiArticoloDTO getSelectedGruppoArt(){
-        if (mGruppoArt == null){
-            return null;
-        }
-
-        return Stream.of(mTipiDocAndGruppiArtDTO.getGruppiArt()).filter(x->x.getLabel().equals(mGruppoArt)).findFirstOrElse(null);
-    }
-}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java

@@ -13,6 +13,10 @@ public class ColloDTO {
 	private String segno;
 	private String idDisp;
 	private String codDtip;
+	private String codAnag;
+	private String codVdes;
+	private Integer numDoc;
+	private Date dataDoc;
 	private List<ArtDTO> artRows = new ArrayList<>();
 	private RifOrd rifOrd;
 
@@ -88,6 +92,42 @@ public class ColloDTO {
 		return rifOrd;
 	}
 
+	public String getCodAnag() {
+		return codAnag;
+	}
+
+	public ColloDTO setCodAnag(String codAnag) {
+		this.codAnag = codAnag;
+		return this;
+	}
+
+	public Integer getNumDoc() {
+		return numDoc;
+	}
+
+	public ColloDTO setNumDoc(Integer numDoc) {
+		this.numDoc = numDoc;
+		return this;
+	}
+
+	public Date getDataDoc() {
+		return dataDoc;
+	}
+
+	public ColloDTO setDataDoc(Date dataDoc) {
+		this.dataDoc = dataDoc;
+		return this;
+	}
+
+	public String getCodVdes() {
+		return codVdes;
+	}
+
+	public ColloDTO setCodVdes(String codVdes) {
+		this.codVdes = codVdes;
+		return this;
+	}
+
 	public void setRifOrd(RifOrd rifOrd) {
 		this.rifOrd = rifOrd;
 	}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java

@@ -2,14 +2,15 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
 
 import java.util.List;
 
-public class TipiDocAndGruppiArtDTO {
+public class DocInterniSetupDTO {
 
 
     private List<TipiDocDTO> tipiDoc;
 
-
     private List<GruppiArticoloDTO> gruppiArt;
 
+    private List<FornitoreDTO> fornitori;
+
 
     public List<TipiDocDTO> getTipiDoc() {
         return tipiDoc;
@@ -26,4 +27,12 @@ public class TipiDocAndGruppiArtDTO {
     public void setGruppiArt(List<GruppiArticoloDTO> gruppiArt) {
         this.gruppiArt = gruppiArt;
     }
+
+    public List<FornitoreDTO> getFornitori() {
+        return fornitori;
+    }
+
+    public void setFornitori(List<FornitoreDTO> fornitori) {
+        this.fornitori = fornitori;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
+
+public class DocSetupDTO {
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java

@@ -0,0 +1,60 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
+
+public class FornitoreDTO {
+
+
+    private String codAnag;
+
+    private String descrizione;
+
+    private String codVdes;
+
+    private String tipoAnag;
+
+    private String gestioneAnag;
+
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodVdes() {
+        return codVdes;
+    }
+
+    public void setCodVdes(String codVdes) {
+        this.codVdes = codVdes;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public void setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+    }
+
+    public String getTipoAnag() {
+        return tipoAnag;
+    }
+
+    public void setTipoAnag(String tipoAnag) {
+        this.tipoAnag = tipoAnag;
+    }
+
+    public String getGestioneAnag() {
+        return gestioneAnag;
+    }
+
+    public void setGestioneAnag(String gestioneAnag) {
+        this.gestioneAnag = gestioneAnag;
+    }
+
+    public String getLabel() {
+        return this.codAnag + (this.codVdes != null ?  " - "+ this.codVdes : "") +" ( " + this.descrizione+" )";
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java

@@ -12,7 +12,12 @@ public class GrigliaAcquistiChildDTO {
     public BigDecimal merceDaRic;
     public BigDecimal mediaSett;
     public String flagQtaMultipla;
+    public String flagTracciabilita;
     public BigDecimal qtaMinOrdinabile;
+    private int ggScadenza;
+    private float giacenza;
+    private float qtaPrevistaVendita;
+    private float qtaProposta;
 
     public String getCodMart() {
         return codMart;
@@ -94,4 +99,49 @@ public class GrigliaAcquistiChildDTO {
         this.qtaMinOrdinabile = qtaMinOrdinabile;
         return this;
     }
+
+    public String getFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public GrigliaAcquistiChildDTO setFlagTracciabilita(String flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public GrigliaAcquistiChildDTO setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public GrigliaAcquistiChildDTO setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public GrigliaAcquistiChildDTO setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public GrigliaAcquistiChildDTO setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipiDocDTO.java

@@ -4,6 +4,8 @@ public class TipiDocDTO {
 
     private String codDtip;
     private String descrizione;
+    private String gestione;
+    private String gestioneDoc;
 
     public String getCodDtip() {
         return codDtip;
@@ -21,6 +23,21 @@ public class TipiDocDTO {
         this.descrizione = descrizione;
     }
 
+    public String getGestione() {
+        return gestione;
+    }
+
+    public void setGestione(String gestione) {
+        this.gestione = gestione;
+    }
+
+    public String getGestioneDoc() {
+        return gestioneDoc;
+    }
+
+    public void setGestioneDoc(String gestioneDoc) {
+        this.gestioneDoc = gestioneDoc;
+    }
     public String getLabel(){
         return this.codDtip +" - "+this.descrizione;
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java

@@ -3,35 +3,31 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.Html;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
-import com.ravikoradiya.liveadapter.LiveAdapter;
 
 import java.math.BigDecimal;
+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.BR;
 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.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.di.BindableInteger;
 import it.integry.integrywmsnative.core.di.BindableString;
@@ -44,10 +40,6 @@ import it.integry.integrywmsnative.databinding.ActivityContabDocInterniEditBindi
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiChildDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
-import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
-import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView;
-import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
@@ -57,8 +49,8 @@ import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQua
 
 public class DocInterniEditFormActivity extends BaseActivity implements DocInterniEditFormViewModel.Listener, BottomSheetMtbColrEditView.Listener {
 
-    private static String DATA_KEY_DOCUMENT = "document";
-    private static String DATA_KEY_PRODUCTS_LIST = "productsList";
+    private static final String DATA_KEY_DOCUMENT = "document";
+    private static final String DATA_KEY_PRODUCTS_LIST = "productsList";
 
     @Inject
     MtbColrRepository documentRowsRepository;
@@ -69,9 +61,11 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     private int mBarcodeScannerIstanceID;
     private ActivityContabDocInterniEditBinding binding;
     public BindableString documentHeader = new BindableString(true);
+    public BindableString documentRifHeader = new BindableString(true);
     public BindableString codDtip = new BindableString();
     public BindableString note = new BindableString();
     public BindableString codMgrp = new BindableString();
+    public BindableString codAnag = new BindableString();
     public BindableInteger prodsCount = new BindableInteger(0);
     public BindableBoolean isDocumentExportable = new BindableBoolean(false);
     private final ObservableArrayList<SqlMtbColr> documentRowsObservableList = new ObservableArrayList<>();
@@ -107,8 +101,24 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         SqlMtbColt document = this.viewModel.getDocument();
         this.codDtip.set(document.getCodDtipProvv());
         this.note.set(document.getAnnotazioni());
-        this.codMgrp.set(document.getCodMgrp());
+        if (document.getCodMgrp() != null) {
+            this.codMgrp.set(document.getCodMgrp());
+        } else {
+            binding.mtbGrupContainer.setVisibility(View.GONE);
+        }
+        if (document.getCodAnag() != null) {
+            this.codAnag.set(document.getCodAnag() + (document.getCodVdes() != null ? " - " + document.getCodVdes() : ""));
+        } else {
+            this.binding.supplierLayout.setVisibility(View.GONE);
+        }
+
         this.documentHeader.set(String.format(this.getString(R.string.doc_interni_doc_header), document.getId(), document.getCodDtipProvv()));
+
+        if (document.getNumDoc() != null && document.getDataDoc() != null) {
+            this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), document.getDataDoc()));
+        } else {
+            this.binding.docRifLayout.setVisibility(View.GONE);
+        }
     }
 
     private void initView() {
@@ -117,7 +127,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         setSupportActionBar(binding.toolbar);
         binding.toolbar.setTitle(R.string.edit_doc);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        FabMenuCustomAnimations.changeIconOnFocus(binding.closeActivityFab, R.drawable.ic_check_white_24dp, R.drawable.ic_close_24dp);
+        FabMenuCustomAnimations.changeIconOnFocus(binding.closeActivityFab, R.drawable.ic_menu_24dp, R.drawable.ic_close_24dp);
         binding.bottomSheetMtbColrEdit.setListener(this);
         binding.bottomSheetMtbColrEdit.init(binding.bottomSheetMtbColrEdit, binding.bottomSheetMtbColrEditBackground);
     }
@@ -126,6 +136,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         this.viewModel.setListeners(this);
         this.viewModel.setDocument(document);
         this.viewModel.setProductsList(productList);
+
     }
 
     private void initRecyclerView() {
@@ -145,15 +156,6 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         this.documentRowsObservableList.addAll(this.viewModel.docRows.getValue());
     }
 
-    public void editNote() {
-        BarcodeManager.disable();
-        DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre/codice articolo da cercare", note -> {
-            this.note.set(note);
-            this.viewModel.setNote(note);
-            BarcodeManager.enable();
-        }, BarcodeManager::enable).show();
-    }
-
 
     public void closeEdit() {
         this.onBackPressed();
@@ -161,7 +163,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     public void manualSearch() {
         BarcodeManager.disable();
-        DialogSimpleInputHelper.makeInputDialog(this, "Aggiungi delle annotazioni al documento", this.note.get(), this.viewModel::onSearch, BarcodeManager::enable).show();
+        DialogSimpleInputHelper.makeInputDialog(this, "Ricerca articolo", null, "Cod articolo / Barcode", this.viewModel::onSearch, BarcodeManager::enable).show();
     }
 
 
@@ -182,7 +184,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         }
 
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(this.viewModel::onScanSuccessful)
+                .setOnScanSuccessfull(this.viewModel::processBarcode)
                 .setOnScanFailed(this::onError));
         this.viewModel.fetchDocumentRows();
     }
@@ -206,7 +208,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     }
 
     @Override
-    public void onEditRowRequest(SqlMtbColr row) {
+    public void onEditRowRequest(SqlMtbColr row, boolean flagTracciabilita) {
         MtbAart mtbAart = new MtbAart();
         mtbAart.setBarCode(row.getCodBarre());
         mtbAart.setDiacod(row.getCodBarre());
@@ -215,6 +217,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         mtbAart.setQtaCnf(BigDecimal.valueOf(row.getQtaCnf()));
         mtbAart.setDescrizione(row.getDescrizione());
         mtbAart.setDescrizioneEstesa(row.getDescrizione());
+        mtbAart.setFlagTracciabilita(flagTracciabilita ? "S" : "N");
         mtbAart.setUntMis(row.getUntMis());
 
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
@@ -222,10 +225,23 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                 .setInitialNumCnf(BigDecimal.valueOf(row.getNumCnf()))
                 .setInitialQtaCnf(BigDecimal.valueOf(row.getQtaCnf()))
                 .setInitialQtaTot(BigDecimal.valueOf(row.getQtaCol()))
+                .setNote(row.getNote())
+                .setSaveOnImeDone(true)
+                .setPartitaMag(row.getPartitaMag())
                 .setDataScad(row.getDataScad())
                 .setCanOverflowOrderQuantity(false)
                 .setCanLUBeClosed(false)
-                .setCanPartitaMagBeChanged(false);
+                .setNotesAllowed(true)
+                .setDataScadMandatory(flagTracciabilita)
+                .setCanPartitaMagBeChanged(flagTracciabilita)
+                .setSuggestPartitaMag(data -> {
+                    Date dataScad = data.getDataScad();
+                    String partitaMag = null;
+                    if (dataScad != null) {
+                        partitaMag = new SimpleDateFormat("yyyymmdd").format(dataScad);
+                    }
+                    return partitaMag;
+                });
 
         DialogInputQuantityV2View
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
@@ -255,7 +271,8 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     @Override
     public void onMtbColrEdit(MtbColr mtbColr) {
-        this.viewModel.editRow(entityToSql(mtbColr));
+        GrigliaAcquistiChildDTO articolo = viewModel.getArticoloByCodMart(mtbColr.getCodMart());
+        this.viewModel.editRow(entityToSql(mtbColr), articolo.getFlagTracciabilita().equalsIgnoreCase("S"));
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java

@@ -4,6 +4,8 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -68,8 +70,8 @@ public class DocInterniEditFormViewModel {
 
     }
 
-    public void editRow(SqlMtbColr row) {
-        this.listener.onEditRowRequest(row);
+    public void editRow(SqlMtbColr row, boolean flagTracciabilita) {
+        this.listener.onEditRowRequest(row, flagTracciabilita);
     }
 
     private Integer getNextIdRiga() {
@@ -92,6 +94,18 @@ public class DocInterniEditFormViewModel {
         }, this::sendError);
     }
 
+    public void deleteDocument() {
+        this.sendOnLoadingStarted();
+        docInterniRESTConsumer.saveDoc(this.getSaveDto(), obj -> {
+            SqlMtbColt document = this.getDocument();
+            document.setCodDtip(document.getCodDtipProvv());
+            mtbColtRepository.update(document, doc -> {
+                this.sendOnLoadingEnded();
+                this.listener.onDocExported();
+            }, this::sendError);
+        }, this::sendError);
+    }
+
     public void holdDocument() {
         this.listener.onDocumentHoldRequest();
     }
@@ -105,7 +119,8 @@ public class DocInterniEditFormViewModel {
             return;
         }
         SqlMtbColr row = this.getRowForArticolo(articolo);
-        this.editRow(row);
+        this.sendOnLoadingEnded();
+        this.editRow(row, articolo.getFlagTracciabilita().equalsIgnoreCase("S"));
 
     }
 
@@ -136,7 +151,12 @@ public class DocInterniEditFormViewModel {
     }
 
     private GrigliaAcquistiChildDTO searchArticolo(String filter) {
-        return Stream.of(this.productsList).filter(dto -> dto.getCodMart().equalsIgnoreCase(filter) || dto.getBarcode().equalsIgnoreCase(filter)).findFirstOrElse(null);
+        return Stream.of(this.productsList).filter(dto ->
+                filter.equalsIgnoreCase(dto.getCodMart())
+                        || filter.equalsIgnoreCase(dto.getBarcode())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getCodMart())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getBarcode())
+        ).findFirstOrElse(null);
     }
 
     private SaveDTO getSaveDto() {
@@ -157,6 +177,10 @@ public class DocInterniEditFormViewModel {
         collo.setCreatedDate(UtilityDate.formatDate(document.getDataCollo(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
         collo.setAnnotazioni(document.getAnnotazioni());
         collo.setSegno(saveDTO.getSegno());
+        collo.setDataDoc(document.getDataDoc());
+        collo.setNumDoc(document.getNumDoc());
+        collo.setCodAnag(document.getCodAnag());
+        collo.setCodVdes(document.getCodVdes());
 
         for (SqlMtbColr row : this.getDocumentRows()) {
             ArtDTO artDto = new ArtDTO();
@@ -198,7 +222,7 @@ public class DocInterniEditFormViewModel {
         this.productsList = productsList;
     }
 
-    public void onScanSuccessful(BarcodeScanDTO dto) {
+    public void processBarcode(BarcodeScanDTO dto) {
         String code = dto.getStringValue();
         this.onSearch(code);
     }
@@ -207,6 +231,7 @@ public class DocInterniEditFormViewModel {
         row.setQtaCnf(resultDTO.getQtaCnf().floatValue());
         row.setNumCnf(resultDTO.getNumCnf().floatValue());
         row.setQtaCol(resultDTO.getQtaTot().floatValue());
+        row.setNote(resultDTO.getNote());
         row.setDataScad(resultDTO.getDataScad());
         if (row.getId() > 0) {
             this.mtbColrRepository.update(row, id -> {
@@ -233,13 +258,17 @@ public class DocInterniEditFormViewModel {
         return this.docRows.getValue();
     }
 
+    public GrigliaAcquistiChildDTO getArticoloByCodMart(String codMart) {
+        return Stream.of(productsList).filter(prod -> prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
+    }
+
     public interface Listener extends ILoadingListener {
 
         void onError(Exception ex);
 
         void onRowsChanged(List<SqlMtbColr> rows);
 
-        void onEditRowRequest(SqlMtbColr row);
+        void onEditRowRequest(SqlMtbColr row, boolean flagTracciabilita);
 
         void onDocumentHoldRequest();
 

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java

@@ -2,18 +2,15 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
 import com.google.gson.JsonObject;
 
-import java.util.List;
-
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -21,16 +18,16 @@ import retrofit2.Response;
 @Singleton
 public class DocInterniRESTConsumer extends _BaseRESTConsumer {
 
-    public void getDocTypesAndGroupArts(RunnableArgs<TipiDocAndGruppiArtDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getDocInterniSetup(RunnableArgs<DocInterniSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
         DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
-        service.getDocTypesAndGroupArts().enqueue(new Callback<>() {
+        service.getSetupDocInterni().enqueue(new Callback<>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<TipiDocAndGruppiArtDTO>> call, Response<ServiceRESTResponse<TipiDocAndGruppiArtDTO>> response) {
-                analyzeAnswer(response, "getDocTypesAndGroupArts", onComplete, onFailed);
+            public void onResponse(Call<ServiceRESTResponse<DocInterniSetupDTO>> call, Response<ServiceRESTResponse<DocInterniSetupDTO>> response) {
+                analyzeAnswer(response, "getSetupDocInterni", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<TipiDocAndGruppiArtDTO>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<DocInterniSetupDTO>> call, Throwable t) {
                 onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java

@@ -2,15 +2,10 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
 import com.google.gson.JsonObject;
 
-import java.util.List;
-
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.accettazione.dto.GetPickingListAccettazioneDTO;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
-import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocAndGruppiArtDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -20,8 +15,8 @@ import retrofit2.http.Query;
 
 public interface DocInterniRESTConsumerService {
 
-    @GET("getDocTypesAndArtsGroups")
-    Call<ServiceRESTResponse<TipiDocAndGruppiArtDTO>> getDocTypesAndGroupArts();
+    @GET("getDocInterniSetup")
+    Call<ServiceRESTResponse<DocInterniSetupDTO>> getSetupDocInterni();
 
     @POST("SM2SaveTerminalinoWMS")
     Call<ServiceRESTResponse<JsonObject>> save(@Body SaveDTO saveDTO);

app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java

@@ -1,16 +1,48 @@
 package it.integry.integrywmsnative.gest.login;
 
 import android.os.Bundle;
+import android.text.Html;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
 
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.SplashActivity;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityWindow;
 import it.integry.integrywmsnative.databinding.ActivityLoginBinding;
 import it.integry.integrywmsnative.gest.login.viewmodel.LoginViewModel;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends BaseActivity implements LoginViewModel.Listener {
+
+    ActivityLoginBinding mBindings;
+
+    @Inject
+    LoginViewModel mViewmodel;
+
+
+    public BindableString username = new BindableString();
+    public BindableString password = new BindableString();
+    public BindableString codAzienda = new BindableString();
+
+    public BindableBoolean customSettingsCheckboxEnabled = new BindableBoolean();
+    public BindableBoolean customSettingsCheckboxChecked = new BindableBoolean();
+
+    public BindableBoolean loginButtonEnabled = new BindableBoolean();
+
+
+    public BindableString usernameError = new BindableString();
+    public BindableString passwordError = new BindableString();
+    public BindableString codAziendaError = new BindableString();
 
 
     @Override
@@ -18,9 +50,44 @@ public class LoginActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         UtilityWindow.maximizeToFullScreen(this);
 
-        ActivityLoginBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_login);
-        LoginViewModel loginViewModel = new LoginViewModel(this);
-        binding.setLoginViewModel(loginViewModel);
+        mBindings = DataBindingUtil.setContentView(this, R.layout.activity_login);
+        mBindings.setView(this);
+
+        MainApplication.appComponent
+                .loginActivityComponent()
+                .create()
+                .inject(this);
+
+        mViewmodel.setListener(this);
+
+        loginButtonEnabled.set(true);
+
+        codAzienda.set(SettingsManager.i().getServer().getCodAzienda());
+
+        customSettingsCheckboxChecked.set(SettingsManager.i().getServer().getHost() == null);
+        customSettingsCheckboxEnabled.set(SettingsManager.i().getServer().getHost() != null);
+    }
+
+
+    public boolean validate(String username, String codAzienda) {
+        if (username.isEmpty() || username.length() < 3) {
+            usernameError.set(getText(R.string.username_error_not_valid).toString());
+            return false;
+        } else usernameError.set(null);
+
+        if (codAzienda.isEmpty() || codAzienda.length() < 3) {
+            codAziendaError.set(getText(R.string.server_cod_azienda_error_not_valid).toString());
+            return false;
+        } else codAziendaError.set(null);
+
+        return true;
+    }
+
+    public void login() {
+        if (validate(username.get(), codAzienda.get())) {
+            loginButtonEnabled.set(false);
+            mViewmodel.login(codAzienda.get(), username.get(), password.get());
+        }
     }
 
 
@@ -29,4 +96,65 @@ public class LoginActivity extends BaseActivity {
         // disable going back to the MainActivity
         moveTaskToBack(true);
     }
+
+    @Override
+    public void onLoginCompleted(String host, int port, String fullName, List<String> availableProfiles) {
+
+        this.onLoadingEnded();
+        runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(
+                "Benvenuto",
+                Html.fromHtml("Ciao <b>" + fullName + "</b>, la Integry le augura di svolgere al meglio il suo lavoro"),
+                null,
+                () -> showProfileDBSelectionDialog(host, port, availableProfiles))
+                .show(getSupportFragmentManager(), "tag"));
+
+    }
+
+
+    @Override
+    public void onError(Exception ex) {
+        super.onError(ex);
+        loginButtonEnabled.set(true);
+    }
+
+    private void showProfileDBSelectionDialog(final String host, final int port, final List<String> availableProfiles) {
+        Runnable onComplete = () -> {
+            SettingsManager.update();
+
+            startSplashActivity();
+        };
+
+        loginButtonEnabled.set(true);
+
+        if (availableProfiles != null && availableProfiles.size() == 1) {
+            SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(0));
+
+            mViewmodel.loadDepo(codAzienda.get(), host, port, username.get(), password.get(), onComplete);
+        } else {
+
+            // setup the alert builder
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.action_choose_profile_db);
+
+            // add a list
+            String[] profiles = new String[availableProfiles.size()];
+            profiles = availableProfiles
+                            .toArray(profiles);
+
+            builder.setItems(profiles, (dialog, which) -> {
+                SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which));
+
+                mViewmodel.loadDepo(codAzienda.get(), host, port, username.get(), password.get(), onComplete);
+            });
+
+            // create and show the alert dialog
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        }
+    }
+
+    private void startSplashActivity() {
+        finish();
+        SplashActivity.startActivity(this);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/login/LoginComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.login;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface LoginComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        LoginComponent create();
+    }
+
+    void inject(LoginActivity loginActivity);
+}

app/src/main/java/it/integry/integrywmsnative/gest/login/LoginModule.java

@@ -0,0 +1,25 @@
+package it.integry.integrywmsnative.gest.login;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumer;
+import it.integry.integrywmsnative.gest.login.viewmodel.LoginViewModel;
+
+@Module(subcomponents = LoginComponent.class)
+public class LoginModule {
+
+    @Provides
+    @Singleton
+    LoginRESTConsumer provideLoginRESTConsumer() {
+        return new LoginRESTConsumer();
+    }
+
+    @Provides
+    LoginViewModel providesSpedizioneViewModel(SystemRESTConsumer systemRESTConsumer, LoginRESTConsumer loginRESTConsumer) {
+        return new LoginViewModel(systemRESTConsumer, loginRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java

@@ -1,112 +0,0 @@
-package it.integry.integrywmsnative.gest.login.core;
-
-import android.content.Context;
-import android.util.Log;
-
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.model.EsitoType;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
-import it.integry.integrywmsnative.gest.login.dto.LoginDTO;
-import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumerService;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class LoginHelper {
-
-    private Context mContext;
-
-    private String mCodAzienda;
-    private String mUsername;
-    private String mPassword;
-
-    public LoginHelper(Context context, String codAzienda, String username, String password){
-        this.mContext = context;
-
-        this.mCodAzienda = codAzienda;
-        this.mUsername = username;
-        this.mPassword = password;
-    }
-
-
-    public void retrieveServerData(final ISimpleOperationCallback<LoginAziendaDTO> callback){
-
-        String host = CommonConst.Login.Azienda.host;
-        int port = CommonConst.Login.Azienda.port;
-
-        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false, true);
-        service.loginAzienda(mCodAzienda).enqueue(new Callback<ServiceRESTResponse<LoginAziendaDTO>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {
-                if(response.isSuccessful()) {
-
-                    if(response.body() != null) {
-                        if(response.body().getEsito() == EsitoType.OK) {
-                            callback.onSuccess(response.body().getDto());
-                        } else {
-                            Log.e("LoginAzienda", response.body().getErrorMessage());
-                            callback.onFailed(new Exception(response.body().getErrorMessage()));
-                        }
-                    } else {
-                        Log.e("LoginAzienda", response.message());
-                        callback.onFailed(new Exception(response.message()));
-                    }
-                } else {
-                    Log.e("LoginAzienda", "Status " + response.code() + ": " + response.message());
-                    callback.onFailed(new Exception("Status " + response.code() + ": " + response.message()));
-                }
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Throwable t) {
-                Log.e("LoginAzienda", t.toString());
-                callback.onFailed(new Exception(t));
-            }
-        });
-    }
-
-
-    public void doLogin(String host, int port, final ISimpleOperationCallback<LoginDTO> callback){
-        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false);
-        service.login(mUsername, mPassword).enqueue(new Callback<ServiceRESTResponse<LoginDTO>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<LoginDTO>> call, Response<ServiceRESTResponse<LoginDTO>> response) {
-
-                if(response.isSuccessful()) {
-
-                    if(response.body() != null) {
-                        if(response.body().getEsito() == EsitoType.OK) {
-                            callback.onSuccess(response.body().getDto());
-                        } else {
-                            Log.e("Login", response.body().getErrorMessage());
-                            callback.onFailed(new Exception(response.body().getErrorMessage()));
-                        }
-                    } else {
-                        Log.e("Login", response.message());
-                        callback.onFailed(new Exception(response.message()));
-                    }
-                } else {
-                    Log.e("Login", "Status " + response.code() + ": " + response.message());
-                    callback.onFailed(new Exception("Status " + response.code() + ": " + response.message()));
-                }
-
-
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<LoginDTO>> call, final Throwable t) {
-
-                Log.e("Login", t.toString());
-                callback.onFailed(new Exception(t));
-
-
-
-            }
-        });
-    }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java

@@ -2,10 +2,54 @@ package it.integry.integrywmsnative.gest.login.dto;
 
 public class LoginAziendaDTO {
 
-    public String profileDb;
-    public String endpointRestApi;
-    public String phpApi;
-    public String repoPhoto;
-    public String endpointPvm;
+    private String profileDb;
+    private String endpointRestApi;
+    private String phpApi;
+    private String repoPhoto;
+    private String endpointPvm;
 
+    public String getProfileDb() {
+        return profileDb;
+    }
+
+    public LoginAziendaDTO setProfileDb(String profileDb) {
+        this.profileDb = profileDb;
+        return this;
+    }
+
+    public String getEndpointRestApi() {
+        return endpointRestApi;
+    }
+
+    public LoginAziendaDTO setEndpointRestApi(String endpointRestApi) {
+        this.endpointRestApi = endpointRestApi;
+        return this;
+    }
+
+    public String getPhpApi() {
+        return phpApi;
+    }
+
+    public LoginAziendaDTO setPhpApi(String phpApi) {
+        this.phpApi = phpApi;
+        return this;
+    }
+
+    public String getRepoPhoto() {
+        return repoPhoto;
+    }
+
+    public LoginAziendaDTO setRepoPhoto(String repoPhoto) {
+        this.repoPhoto = repoPhoto;
+        return this;
+    }
+
+    public String getEndpointPvm() {
+        return endpointPvm;
+    }
+
+    public LoginAziendaDTO setEndpointPvm(String endpointPvm) {
+        this.endpointPvm = endpointPvm;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginDTO.java

@@ -4,7 +4,24 @@ import java.util.List;
 
 public class LoginDTO {
 
-    public String full_name;
-    public List<String> availableProfiles;
+    private String full_name;
+    private List<String> availableProfiles;
 
+    public String getFull_name() {
+        return full_name;
+    }
+
+    public LoginDTO setFull_name(String full_name) {
+        this.full_name = full_name;
+        return this;
+    }
+
+    public List<String> getAvailableProfiles() {
+        return availableProfiles;
+    }
+
+    public LoginDTO setAvailableProfiles(List<String> availableProfiles) {
+        this.availableProfiles = availableProfiles;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/login/exception/InvalidServerCodAziendaException.java

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.gest.login.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class InvalidServerCodAziendaException extends Exception {
+
+    public InvalidServerCodAziendaException(String codAzienda, Throwable cause) {
+        super(String.format(UtilityResources.getString(R.string.server_cod_azienda_not_valid), codAzienda), cause);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/login/exception/InvalidUserDepositException.java

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

app/src/main/java/it/integry/integrywmsnative/gest/login/exception/InvalidUsernameException.java

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

app/src/main/java/it/integry/integrywmsnative/gest/login/exception/ServerNotReachableException.java

@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.gest.login.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class ServerNotReachableException  extends Exception {
+
+    public ServerNotReachableException(String host, int port, Throwable cause) {
+        super(String.format(UtilityResources.getString(R.string.server_not_reachable), host, port), cause);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java

@@ -0,0 +1,61 @@
+package it.integry.integrywmsnative.gest.login.rest;
+
+import android.util.Log;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.CommonConst;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
+import it.integry.integrywmsnative.gest.login.dto.LoginDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class LoginRESTConsumer extends _BaseRESTConsumer {
+
+
+    public void retrieveServerData(String codAzienda, RunnableArgs<LoginAziendaDTO> onComplete, RunnableArgs<Exception> onFailed){
+
+        String host = CommonConst.Login.Azienda.host;
+        int port = CommonConst.Login.Azienda.port;
+
+        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false, true);
+        service.loginAzienda(codAzienda).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {
+                analyzeAnswer(response, "LoginAzienda", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Throwable t) {
+                Log.e("LoginAzienda", t.toString());
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+    public void authenticate(String host, int port, String username, String password, RunnableArgs<LoginDTO> onComplete, RunnableArgs<Exception> onFailed){
+        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false);
+        service.login(username, password).enqueue(new Callback<>() {
+
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<LoginDTO>> call, Response<ServiceRESTResponse<LoginDTO>> response) {
+                analyzeAnswer(response, "Login", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<LoginDTO>> call, final Throwable t) {
+                Log.e("Login", t.toString());
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java

@@ -1,167 +1,103 @@
 package it.integry.integrywmsnative.gest.login.viewmodel;
 
-import android.app.Dialog;
-import android.content.Intent;
-import android.text.Html;
-import android.text.SpannableString;
-import android.text.Spanned;
-
-import androidx.appcompat.app.AlertDialog;
+import com.annimon.stream.Stream;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.SplashActivity;
-import it.integry.integrywmsnative.core.di.BindableBoolean;
-import it.integry.integrywmsnative.core.di.BindableString;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityServer;
 import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.gest.login.LoginActivity;
-import it.integry.integrywmsnative.gest.login.core.LoginHelper;
-import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
-import it.integry.integrywmsnative.gest.login.dto.LoginDTO;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.gest.login.exception.InvalidServerCodAziendaException;
+import it.integry.integrywmsnative.gest.login.exception.InvalidUserDepositException;
+import it.integry.integrywmsnative.gest.login.exception.ServerNotReachableException;
+import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumer;
 
 public class LoginViewModel {
 
-    public BindableString username = new BindableString();
-    public BindableString password = new BindableString();
-    public BindableString codAzienda = new BindableString();
 
-    public BindableBoolean customSettingsCheckboxEnabled = new BindableBoolean();
-    public BindableBoolean customSettingsCheckboxChecked = new BindableBoolean();
+    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final LoginRESTConsumer mLoginRESTConsumer;
 
-    public BindableBoolean loginButtonEnabled = new BindableBoolean();
+    private Listener mListener;
 
-
-    public BindableString usernameError = new BindableString();
-    public BindableString passwordError = new BindableString();
-    public BindableString codAziendaError = new BindableString();
-
-
-    private LoginActivity mActivity;
-
-    private Dialog mProgress;
-
-    public LoginViewModel(LoginActivity activity) {
-        this.mActivity = activity;
-
-        loginButtonEnabled.set(true);
-
-        codAzienda.set(SettingsManager.i().getServer().getCodAzienda());
-
-        customSettingsCheckboxChecked.set(SettingsManager.i().getServer().getHost() == null);
-        customSettingsCheckboxEnabled.set(SettingsManager.i().getServer().getHost() != null);
+    @Inject
+    public LoginViewModel(SystemRESTConsumer systemRESTConsumer, LoginRESTConsumer loginRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+        this.mLoginRESTConsumer = loginRESTConsumer;
     }
 
 
-    public boolean validate() {
-        if (username.isEmpty() || username.get().length() < 3) {
-            usernameError.set(mActivity.getText(R.string.username_error_not_valid).toString());
-            return false;
-        } else usernameError.set(null);
+    public void login(String codAzienda, String username, String password) {
+        this.sendOnLoadingStarted();
 
-        if (codAzienda.isEmpty() || codAzienda.get().length() < 3) {
-            codAziendaError.set(mActivity.getText(R.string.server_cod_azienda_not_valid).toString());
-            return false;
-        } else codAziendaError.set(null);
+        mLoginRESTConsumer.retrieveServerData(codAzienda, value -> {
 
-        return true;
-    }
+            final String serverEndpoint = value.getEndpointRestApi();
 
+            URL u;
+            try {
+                u = new URL(serverEndpoint);
+            } catch (final MalformedURLException e) {
+                e.printStackTrace();
+                this.sendError(e);
+                return;
+            }
 
-    public void login(boolean areValidData) {
-        if (areValidData) {
-            loginButtonEnabled.set(false);
+            final String host = u.getHost();
+            final int port = u.getPort();
 
-            mProgress = UtilityProgress.createDefaultProgressDialog(mActivity);
+            UtilityServer.isEmsApiAvailable(host, port, value1 -> {
 
-            final LoginHelper loginHelper = new LoginHelper(mActivity, codAzienda.get(), username.get(), password.get());
+                if (value1) { //Is online
+                    mLoginRESTConsumer.authenticate(host, port, username, password, loginDTO -> {
 
-            loginHelper.retrieveServerData(new ISimpleOperationCallback<LoginAziendaDTO>() {
+                        SettingsManager.iDB().setAvailableProfiles(loginDTO.getAvailableProfiles());
 
-                @Override
-                public void onSuccess(LoginAziendaDTO value) {
+                        SettingsManager.i().createUserSession();
+                        SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.getFull_name()) ? loginDTO.getFull_name() : username);
 
-                    final String serverEndpoint = value.endpointRestApi;
-
-                    URL u;
-                    try {
-                        u = new URL(serverEndpoint);
-                    } catch (final MalformedURLException e) {
-                        e.printStackTrace();
-                        onLoginFailed(new SpannableString(e.toString()));
-                        return;
-                    }
-
-                    final String host = u.getHost();
-                    final int port = u.getPort();
-
-                    UtilityServer.isEmsApiAvailable(host, port, value1 -> {
-
-                        if (value1) { //Is online
-                            loginHelper.doLogin(host, port, new ISimpleOperationCallback<LoginDTO>() {
-                                @Override
-                                public void onSuccess(final LoginDTO loginDTO) {
-
-                                    SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles);
-
-                                    SettingsManager.i().createUserSession();
-                                    SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get());
-
-
-                                    mActivity.runOnUiThread(() -> onLoginSuccess(
-                                            "Benvenuto",
-                                            Html.fromHtml("Ciao <b>" + loginDTO.full_name + "</b>, la Integry le augura di svolgere al meglio il suo lavoro"),
-                                            host, port, loginDTO.availableProfiles));
-
-
-                                }
-
-                                @Override
-                                public void onFailed(final Exception ex) {
-                                    onLoginFailed(new SpannableString(ex.getMessage()));
-                                }
-                            });
-
-
-                        } else { //Is not online
-                            onLoginFailed(Html.fromHtml(String.format(mActivity.getText(R.string.server_not_reachable).toString(), host, port)));
+                        List<String> availableProfiles = null;
+                        if(loginDTO.getAvailableProfiles() != null && !loginDTO.getAvailableProfiles().isEmpty()) {
+                            availableProfiles = Stream.of(loginDTO.getAvailableProfiles())
+                                    .sorted()
+                                    .toList();
                         }
 
-                    });
+                        this.sendOnLoginCompleted(host, port, loginDTO.getFull_name(), availableProfiles);
+                    }, this::sendError);
+
+
+                } else { //Is not online
+                    this.sendError(new ServerNotReachableException(host, port, null));
                 }
 
-                @Override
-                public void onFailed(Exception ex) {
-                    onLoginFailed(Html.fromHtml(String.format(mActivity.getText(R.string.server_cod_azienda_not_valid).toString(), codAzienda.get())));
-                }
             });
-
-        }
+        }, ex -> {
+            this.sendError(new InvalidServerCodAziendaException(codAzienda, ex));
+        });
     }
 
 
-    private void loadDepo(String host, int port, Runnable onComplete) {
+    public void loadDepo(String codAzienda, String host, int port, String username, String password, Runnable onComplete) {
 
-        SettingsManager.i().getServer().setCodAzienda(codAzienda.get());
+        SettingsManager.i().getServer().setCodAzienda(codAzienda);
         SettingsManager.i().getServer().setHost(host);
         SettingsManager.i().getServer().setPort(port);
 
-        SettingsManager.i().getUser().setUsername(username.get());
-        SettingsManager.i().getUser().setPassword(password.get());
+        SettingsManager.i().getUser().setUsername(username);
+        SettingsManager.i().getUser().setPassword(password);
 
-        SystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
+        this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps);
 
             if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
-                onLoginFailed(Html.fromHtml(String.format(mActivity.getText(R.string.no_codmdep_available).toString())));
+                this.sendError(new InvalidUserDepositException());
                 return;
             }
 
@@ -169,72 +105,36 @@ public class LoginViewModel {
 
 
             if (onComplete != null) onComplete.run();
-        }, ex -> {
-            //BOH
-            onLoginFailed(new SpannableString(ex.getMessage()));
-        });
+        }, this::sendError);
     }
 
 
-    private void onLoginFailed(final Spanned message) {
-        mProgress.dismiss();
-        loginButtonEnabled.set(true);
-        mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeErrorDialog(
-                message,
-                null,
-                null)
-                .show(mActivity.getSupportFragmentManager(), "tag"));
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
     }
 
-
-    private void onLoginSuccess(final String title, final Spanned message, final String host, final int port, final List<String> availableProfiles) {
-        mProgress.dismiss();
-        mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(
-                title,
-                message,
-                null,
-                () -> showProfileDBSelectionDialog(host, port, availableProfiles))
-                .show(mActivity.getSupportFragmentManager(), "tag"));
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
     }
 
-    private void showProfileDBSelectionDialog(final String host, final int port, final List<String> availableProfiles) {
-        if (availableProfiles != null && availableProfiles.size() == 1) {
-            SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(0));
-
-            loadDepo(host, port, this::onLoginCompleted);
-        } else {
-
-            // setup the alert builder
-            AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
-            builder.setTitle(R.string.action_choose_profile_db);
-
-            // add a list
-            String[] profiles = new String[availableProfiles.size()];
-            profiles = availableProfiles.toArray(profiles);
-            builder.setItems(profiles, (dialog, which) -> {
-                SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which));
-
-                loadDepo(host, port, this::onLoginCompleted);
-            });
-
-            // create and show the alert dialog
-            AlertDialog dialog = builder.create();
-            dialog.show();
-        }
+    private void sendOnLoginCompleted(String host, int port, String fullName, List<String> availableProfiles) {
+        if (this.mListener != null)
+            mListener.onLoginCompleted(host, port, fullName, availableProfiles);
     }
 
-    public void onLoginCompleted() {
-        loginButtonEnabled.set(true);
-        SettingsManager.update();
-
-        startSplashActivity();
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
     }
 
+    public LoginViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
 
-    private void startSplashActivity() {
-        mActivity.finish();
-        Intent myIntent = new Intent(mActivity, SplashActivity.class);
-        mActivity.startActivity(myIntent);
+    public interface Listener extends ILoadingListener {
+        void onError(Exception ex);
+
+        void onLoginCompleted(String host, int port, String fullName, List<String> availableProfiles);
     }
 
 }

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

@@ -262,9 +262,12 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         mAppliedFilterViewModel.getCurrentDataConsPredicate().addOnPropertyChangedCallback(onPredicateChanged);
         mAppliedFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
-        List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
+        List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet())
+                .map(Map.Entry::getValue)
+                .sortBy(FilterChipDTO::getPosizione)
+                .toList();
 
-        for (FilterChipDTO filterChipDTO : filterList){
+        for (FilterChipDTO filterChipDTO : filterList) {
 
             FilterChipView filterChipView = new FilterChipView(
                     requireActivity(),
@@ -697,28 +700,29 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
         //new Thread(() -> {
 
-//            requireActivity().runOnUiThread(() -> {
-                List<OrdiniUscitaElencoDTO> tmpList;
+        requireActivity().runOnUiThread(() -> {
+            List<OrdiniUscitaElencoDTO> tmpList;
 
-                if (filteredList != null) {
-                    tmpList = filteredList;
-                } else if (mAppliedFilterViewModel != null) {
-                    mAppliedFilterViewModel.applyAllTests();
-                    tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-                } else {
-                    tmpList = mViewModel.getOrderList().getValue();
-                }
+            if (filteredList != null) {
+                tmpList = filteredList;
+            } else if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
+                tmpList = mViewModel.getOrderList().getValue();
+            }
 
-                var list = convertDataModelToListModel(tmpList);
+            var list = convertDataModelToListModel(tmpList);
 
-                this.mOrdiniInevasiMutableData.clear();
-                this.mOrdiniInevasiMutableData.addAll(list);
+            this.mOrdiniInevasiMutableData.clear();
+            this.mOrdiniInevasiMutableData.addAll(list);
 
-                fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
-                        .anyMatch(y -> y.getSelectedObservable().get()));
-//            });
+            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+                    .anyMatch(y -> y.getSelectedObservable().get()));
 
             this.onLoadingEnded();
+        });
+
         //}).start();
 
     }
@@ -831,7 +835,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
 
-
     @Override
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
@@ -848,8 +851,10 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
     private void initMtbGrupsCache(Runnable onComplete) {
         var codMgrpArts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrderList().getValue()))
-                .flatMap(x -> Stream.of(x.getAvailableClassMerc()))
+                .flatMap(x -> Stream.of(x.getAvailableClassMerc() != null ? x.getAvailableClassMerc() : new ArrayList<>()))
                 .map(OrdineUscitaInevasoDTO.AvailableClassMerc::getCodMgrp)
+                .withoutNulls()
+                .distinct()
                 .toList();
 
         this.mArticoloRESTConsumer.getArtsGroups(codMgrpArts, mtbGrupCache -> {

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/VenditaFiltroOrdiniViewModel.java

@@ -648,7 +648,10 @@ public class VenditaFiltroOrdiniViewModel {
 
     public List<MtbGrup> getAllGruppoMerc(List<MtbGrup> mtbGrupFullList) {
         var codMgrp = Stream.of(initialOrderList)
-                .flatMap(ordiniUscitaElencoDTO -> Stream.of(ordiniUscitaElencoDTO.getAvailableClassMerc()))
+                .flatMap(ordiniUscitaElencoDTO ->
+                        Stream.of(ordiniUscitaElencoDTO.getAvailableClassMerc() != null ?
+                                ordiniUscitaElencoDTO.getAvailableClassMerc() :
+                                new ArrayList<>()))
                 .map(OrdineUscitaInevasoDTO.AvailableClassMerc::getCodMgrp)
                 .withoutNulls()
                 .distinct()

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

@@ -289,9 +289,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     }
 
     @Override
-    public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         DialogChooseArtsFromListaArts
-                .newInstance(mtbColrsToPick, onComplete, () -> {
+                .newInstance(mtbColrsToPick, mtbAart, onComplete, () -> {
                     onAbort.run();
                     BarcodeManager.enable();
                 })

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

@@ -7,6 +7,7 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 
 @Module(subcomponents = {PickingLiberoComponent.class})
 public class PickingLiberoModule {
@@ -15,7 +16,9 @@ public class PickingLiberoModule {
     @Singleton
     PickingLiberoViewModel providesPickingLiberoViewModel(ArticoloRESTConsumer articoloRESTConsumer,
                                                           ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                                          BarcodeRESTConsumer barcodeRESTConsumer) {
-        return new PickingLiberoViewModel(articoloRESTConsumer, colliMagazzinoRESTConsumer, barcodeRESTConsumer);
+                                                          BarcodeRESTConsumer barcodeRESTConsumer,
+                                                          PosizioniRESTConsumer posizioniRESTConsumer
+    ) {
+        return new PickingLiberoViewModel(articoloRESTConsumer, colliMagazzinoRESTConsumer, barcodeRESTConsumer, posizioniRESTConsumer);
     }
 }

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

@@ -15,6 +15,7 @@ import javax.inject.Inject;
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUBaseOperationsListener;
@@ -23,18 +24,21 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.VtbDest;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 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.UtilityPosizione;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
@@ -48,6 +52,7 @@ public class PickingLiberoViewModel {
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
+    private final PosizioniRESTConsumer mPosizioniRESTConsumer;
 
 
     private boolean mFlagAskCliente;
@@ -60,10 +65,13 @@ public class PickingLiberoViewModel {
     @Inject
     public PickingLiberoViewModel(ArticoloRESTConsumer articoloRESTConsumer,
                                   ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                  BarcodeRESTConsumer barcodeRESTConsumer) {
+                                  BarcodeRESTConsumer barcodeRESTConsumer,
+                                  PosizioniRESTConsumer posizioniRESTConsumer
+    ) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
+        this.mPosizioniRESTConsumer = posizioniRESTConsumer;
     }
 
 
@@ -88,6 +96,10 @@ public class PickingLiberoViewModel {
             //Cerco gli articoli presenti nell'ul dell'etichetta anonima
             this.executeEtichettaLU(barcodeScanDTO.getStringValue(), onComplete);
 
+        } else if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO)) {
+            //Cerco tramite etichetta un collo in posizione mono ul
+            this.executeEtichettaPosizione(barcodeScanDTO, onComplete);
+
         } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             //Cerco tramite etichetta ean 128 (che può indicarmi una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
@@ -97,11 +109,41 @@ public class PickingLiberoViewModel {
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
         } else {
+            //Cerco tramite ean13  un collo  in posizione mono ul definita in anagrafica articolo, altrimenti se abilitato procedo con picking manuale
             this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
         }
     }
 
 
+    private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+        MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+                .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue()))
+                .single();
+        this.executePosizione(foundPosizione, null, onComplete);
+
+    }
+
+    private void executePosizione(MtbDepoPosizione posizione, MtbAart articolo, Runnable onComplete) {
+        this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
+
+            if (mtbColtList == null || mtbColtList.size() == 0) {
+                if (articolo != null) {
+                    this.dispatchArt(articolo, null);
+                } else {
+                    this.sendError(new NoLUFoundException());
+                }
+            } else if (mtbColtList.size() == 1) {
+                this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
+                    pickMerceULtoUL(mtbColt, articolo, onComplete);
+                }, this::sendError);
+            } else {
+                this.sendError(new TooManyLUFoundInMonoLUPositionException());
+            }
+
+        }, this::sendError);
+    }
+
     private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         try {
             Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
@@ -164,10 +206,18 @@ public class PickingLiberoViewModel {
         }
 
         mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
-
             if (mtbAartList != null && mtbAartList.size() > 0) {
-                this.dispatchArt(mtbAartList.get(0), ean128Model);
-                onComplete.run();
+                MtbAart articolo = mtbAartList.get(0);
+                MtbDepoPosizione posizione = UtilityPosizione.getFromCache(articolo.getPosizione());
+
+                if (posizione != null && posizione.isFlagMonoCollo()) {
+                    this.executePosizione(posizione, articolo, onComplete);
+                } else if(mDefaultGestione == GestioneEnum.VENDITA){
+                    this.dispatchArt(articolo, ean128Model);
+                    onComplete.run();
+                } else {
+                    this.sendError(new NoResultFromBarcodeException());
+                }
 
             } else {
                 this.sendError(new NoResultFromBarcodeException());
@@ -336,13 +386,16 @@ public class PickingLiberoViewModel {
                 });
     }
 
-
     private void pickMerceULtoUL(MtbColt sourceMtbColt, Runnable onComplete) {
+        pickMerceULtoUL(sourceMtbColt, null, onComplete);
+    }
+
+    private void pickMerceULtoUL(MtbColt sourceMtbColt, MtbAart mtbAart, Runnable onComplete) {
         List<MtbColr> mtbColrsToPick = Stream.of(sourceMtbColt.getMtbColr())
                 .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO))
                 .toList();
 
-        this.sendArtSelectionRequest(mtbColrsToPick, pickedAarts -> {
+        this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
             List<MtbColr> destNewMtbColr = new ArrayList<>();
 
             if (pickedAarts.size() > 0) {
@@ -369,7 +422,7 @@ public class PickingLiberoViewModel {
                                     .setNumCollo(null)
 
                                     .setDataColloRif(cloneMtbColr.getDataColloS())
-                                    .setDataCollo(null)
+                                    .setDataCollo((String) null)
 
                                     .setPesoLordoKg(null)
                                     .setPesoNettoKg(null);
@@ -480,46 +533,46 @@ public class PickingLiberoViewModel {
         new Thread(this::sendOnLoadingStarted).start();
 
 
-            final MtbColr mtbColr = new MtbColr()
-                    .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
-                    .setPartitaMag(partitaMag)
-                    .setDataScadPartita(dataScad)
-                    .setQtaCol(qtaTot)
-                    .setQtaCnf(qtaCnf)
-                    .setNumCnf(numCnf)
-                    .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
-                    .setDatetimeRow(UtilityDate.getDateInstance());
+        final MtbColr mtbColr = new MtbColr()
+                .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
+                .setPartitaMag(partitaMag)
+                .setDataScadPartita(dataScad)
+                .setQtaCol(qtaTot)
+                .setQtaCnf(qtaCnf)
+                .setNumCnf(numCnf)
+                .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
+                .setDatetimeRow(UtilityDate.getDateInstance());
 
-            mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+        mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
-            MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
-            cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
+        MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
+        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
 
-            cloneMtbColt.setMtbColr(new ObservableArrayList<>());
-            cloneMtbColt.getMtbColr().add((MtbColr) mtbColr.clone());
+        cloneMtbColt.setMtbColr(new ObservableArrayList<>());
+        cloneMtbColt.getMtbColr().add((MtbColr) mtbColr.clone());
 
-            if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
-                this.sendOnLoadingEnded();
-                return;
-            }
+        if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
+            this.sendOnLoadingEnded();
+            return;
+        }
 
-            mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
-                mtbColr
-                        .setDataCollo(value.getDataColloS())
-                        .setNumCollo(value.getNumCollo())
-                        .setGestione(value.getGestione())
-                        .setSerCollo(value.getSerCollo())
-                        .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
-                        .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
-                        .setMtbAart(pickingObjectDTO.getMtbAart());
+        mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
+            mtbColr
+                    .setDataCollo(value.getDataColloS())
+                    .setNumCollo(value.getNumCollo())
+                    .setGestione(value.getGestione())
+                    .setSerCollo(value.getSerCollo())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
+                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
+                    .setMtbAart(pickingObjectDTO.getMtbAart());
 
-                mCurrentMtbColt.getMtbColr().add(mtbColr);
+            mCurrentMtbColt.getMtbColr().add(mtbColr);
 
-                this.sendOnRowSaved();
-                this.sendOnLoadingEnded();
+            this.sendOnRowSaved();
+            this.sendOnLoadingEnded();
 
-                if (shouldCloseLU) closeLU(null);
-            }, this::sendError);
+            if (shouldCloseLU) closeLU(null);
+        }, this::sendError);
 
     }
 
@@ -763,9 +816,9 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onLUClienteRequired(onComplete, onAbort);
     }
 
-    private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         if (this.mListener != null)
-            mListener.onArtSelectionRequest(mtbColrsToPick, onComplete, onAbort);
+            mListener.onArtSelectionRequest(mtbColrsToPick, mtbAart, onComplete, onAbort);
     }
 
     private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
@@ -819,7 +872,7 @@ public class PickingLiberoViewModel {
 
         void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort);
 
-        void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
+        void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
 
         void onItemDispatched(PickingObjectDTO pickingObjectDTO,
                               MtbAart mtbAart,

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

@@ -33,6 +33,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -42,18 +43,18 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding;
+import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
 import it.integry.integrywmsnative.gest.picking_resi.ui.PickingResiListAdapter;
 import it.integry.integrywmsnative.gest.picking_resi.ui.PickingResiListModel;
-import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
 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.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 
 public class PickingResiActivity extends BaseActivity implements BottomSheetFragmentLUContentView.Listener, BottomSheetFragmentLUContentViewModel.Listener, PickingResiViewModel.Listener {
 
@@ -276,15 +277,15 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     }
 
     @Override
-    public void onNoteAggiuntiveRequired(RunnableArgs<String> onComplete, Runnable onAbort) {
-        NoteAggiuntiveLUDialog.make(this, onComplete, onAbort).show();
+    public void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+        InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
     }
 
     @Override
     public void onError(Exception ex) {
         this.closeProgress();
 
-        if(ex instanceof InvalidPesoKGException) {
+        if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
             UtilityExceptions.defaultException(this, ex, mCurrentProgress);
@@ -401,7 +402,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 null,
                 R.string.button_ignore_print,
                 onComplete)
-            .show(getSupportFragmentManager(), "tag");
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override

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

@@ -28,6 +28,7 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -161,11 +162,16 @@ public class PickingResiViewModel {
                     this.sendOnLoadingEnded();
                 });
             } else {
-                this.sendOnNoteAggiuntiveRequired(noteAggiuntive -> {
+                this.sendOnInfoAggiuntiveRequired((noteAggiuntive, tCol) -> {
 
                     if (!UtilityString.isNullOrEmpty(noteAggiuntive)) {
                         this.mCurrentMtbColt.setAnnotazioni(noteAggiuntive);
                     }
+                    if (tCol != null) {
+                        this.mCurrentMtbColt.setCodTcol(tCol.getCodTcol());
+                        this.mCurrentMtbColt.setMtbTCol(tCol);
+
+                    }
 
                     this.mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
 
@@ -185,9 +191,6 @@ public class PickingResiViewModel {
 
                     }, this::sendError);
 
-                }, () -> {
-                    this.sendLUClosed();
-                    this.sendOnLoadingEnded();
                 });
             }
         }, this::sendError);
@@ -720,8 +723,8 @@ public class PickingResiViewModel {
         return mPickingList;
     }
 
-    private void sendOnNoteAggiuntiveRequired(RunnableArgs<String> onComplete, Runnable onAbort) {
-        if (this.mListener != null) this.mListener.onNoteAggiuntiveRequired(onComplete, onAbort);
+    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+        if (this.mListener != null) this.mListener.onInfoAggiuntiveRequired(onComplete);
     }
 
     private void sendOnLoadingStarted() {
@@ -798,7 +801,7 @@ public class PickingResiViewModel {
 
     public interface Listener extends ILUPrintListener, ILoadingListener, ILUBaseOperationsListener {
 
-        void onNoteAggiuntiveRequired(RunnableArgs<String> onComplete, Runnable onAbort);
+        void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete);
 
         void onError(Exception ex);
 

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

@@ -82,7 +82,7 @@ public class PickingResiRESTConsumer {
 
 
                             if(onComplete != null) onComplete.run(values);
-                        }
+                        } else onComplete.run(new ArrayList<>());
 
                     }, onFailed);
 

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

@@ -107,7 +107,7 @@ 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(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_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());

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java

@@ -80,7 +80,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                 }.getType();
                 systemRESTConsumer.<List<MtbColt>>processSql(mtbColtSql, mtbColtTypeOfObjectsList, mtbColtList -> {
 
-                    if(mtbColtList == null) mtbColtList = new ArrayList<>();
+                    if (mtbColtList == null) mtbColtList = new ArrayList<>();
 
                     for (MtbColt mtbColt : mtbColtList) {
 
@@ -108,23 +108,21 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-
-
     public void importColloDaProduzione(ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
-        service.importColloDaProduzione(importColliDaProduzioneRequestDTO).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
+        service.importColloDaProduzione(importColliDaProduzioneRequestDTO).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+            public void onResponse(Call<ServiceRESTResponse<List<MtbColt>>> call, Response<ServiceRESTResponse<List<MtbColt>>> response) {
                 analyzeAnswer(response, "importColliDaProduzione", mtbColt -> {
-                    onComplete.run(mtbColt);
+                    onComplete.run(mtbColt.get(0));
                 }, ex -> {
-                    if(onFailed != null) onFailed.run(ex);
+                    if (onFailed != null) onFailed.run(ex);
                 });
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, Throwable t) {
                 Logger.e(t, "importColliDaProduzione");
                 onFailed.run(new Exception(t));
             }
@@ -140,7 +138,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                 analyzeAnswer(response, "deleteColloDaProduzione", mtbColt -> {
                     onComplete.run();
                 }, ex -> {
-                    if(onFailed != null) onFailed.run(ex);
+                    if (onFailed != null) onFailed.run(ex);
                 });
             }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java

@@ -13,10 +13,10 @@ public interface ProdRientroMerceOrderDetailRESTConsumerService {
 
 
     @POST("importColliDaProduzioneJson")
-    Call<ServiceRESTResponse<MtbColt>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
+    Call<ServiceRESTResponse<List<MtbColt>>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
 
     @POST("importColloDaProduzioneJson")
-    Call<ServiceRESTResponse<MtbColt>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
+    Call<ServiceRESTResponse<List<MtbColt>>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
 
     @POST("cancellaColloDaProduzione")
     Call<ServiceRESTResponse<Object>> deleteColloDaProduzione(@Body MtbColt mtbColtToDelete);

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

@@ -284,10 +284,16 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
             if (offsetCnf.floatValue() != 0 || offsetCol.floatValue() != 0){
                 if ( SettingsManager.iDB().isFlagForceAllToColli() || (majorOrder.getOriginalMtbAart() != null && !majorOrder.getOriginalMtbAart().isFlagQtaCnfFissaBoolean())) {
                     majorOrder.setNumCnfBigDecimal(majorOrder.getNumCnfBigDecimal().add(offsetCnf));
+                    majorOrder.getOriginalOrdineLavorazione().setNumCnfVersamento(majorOrder.getNumCnfBigDecimal().floatValue());
+
                     majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
+                    majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().floatValue());
                 } else {
                     majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
+                    majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().floatValue());
+
                     majorOrder.setNumCnfBigDecimal(UtilityBigDecimal.divide(majorOrder.getQtaBigDecimal(), qtaCnf));
+                    majorOrder.getOriginalOrdineLavorazione().setNumCnfVersamento(majorOrder.getNumCnfBigDecimal().floatValue());
                 }
             }
         }
@@ -319,6 +325,12 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
         this.openLU();
     }
 
+    @Override
+    public void onError(Exception ex, boolean requestClose) {
+        super.onError(ex);
+        if(requestClose) popMe();
+    }
+
     @Override
     public void onWarning(String warningText, Runnable action) {
         this.requireActivity().runOnUiThread(() -> {

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

@@ -77,8 +77,13 @@ public class ProdVersamentoMaterialeViewModel {
                         mtbDepoPosizione.getPosizione(),
                         getIdMaterialeFromCollo(mtbColt),
                         ordini -> {
-                            setCurrentOrders(ordini, mtbColt.getMtbColr().get(0));
-                            this.sendOnLoadingEnded();
+                            if(ordini == null || ordini.isEmpty())
+                                this.sendError(new Exception("Nessun ordine compatibile con " + getIdMaterialeFromCollo(mtbColt) + " sulla linea " + mtbDepoPosizione.getPosizione()), true);
+                            else {
+                                setCurrentOrders(ordini, mtbColt.getMtbColr().get(0));
+                                this.sendOnLoadingEnded();
+                            }
+
                         },
                         e -> this.sendWarning(e.getMessage(), this::sendRequestLUOpen));
             }
@@ -194,7 +199,11 @@ public class ProdVersamentoMaterialeViewModel {
     }
 
     private void sendError(Exception ex) {
-        if (this.mListener != null) mListener.onError(ex);
+        if (this.mListener != null) mListener.onError(ex, false);
+    }
+
+    private void sendError(Exception ex, boolean requestClose) {
+        if (this.mListener != null) mListener.onError(ex, requestClose);
     }
 
     private void sendOnDataSaved() {
@@ -205,7 +214,7 @@ public class ProdVersamentoMaterialeViewModel {
 
         void requestLUOpen();
 
-        void onError(Exception ex);
+        void onError(Exception ex, boolean requestClose);
 
         void onWarning(String warningText, Runnable action);
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java

@@ -183,13 +183,14 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity {
     }
 
     private void addArticolo(ArticoloOrdine articoloOrdine) {
-        runOnUiThread(() -> EditArticoloDialog.make(this, mhelper, articoloOrdine, articolo -> {
+
+        runOnUiThread(() -> EditArticoloDialog.newInstance(this, mhelper, articoloOrdine, articolo -> {
             BarcodeManager.enable();
             if (articolo != null) {
                 Toast.makeText(this, "Articolo aggiunto all'ordine!", Toast.LENGTH_SHORT).show();
             }
             fetchArticoli();
-        }).show());
+        }).show(this.getSupportFragmentManager(), "tag"));
     }
 
     private void fetchDetails() {

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java

@@ -1,177 +1,165 @@
 package it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog;
 
 import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.os.Bundle;
+import android.text.InputType;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.MutableLiveData;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.expansion.BaseDialog;
+import it.integry.integrywmsnative.core.di.BindableBigDecimal;
+import it.integry.integrywmsnative.core.di.BindableInteger;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityFocus;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.DialogPvEditArticoloBinding;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.helper.PVEditOrderHelper;
 
-public class EditArticoloDialog {
-
-    private Activity mContext;
-
-    private Dialog mDialog;
+public class EditArticoloDialog extends BaseDialogFragment {
 
+    private final Activity mContext;
     private DialogPvEditArticoloBinding mBinding;
-
-    private PVEditOrderHelper mHelper;
-
-    private ArticoloOrdine mArticolo;
-    private ArticoloOrdine mSavedArt;
-
+    private final PVEditOrderHelper mHelper;
+    private final MutableLiveData<ArticoloOrdine> mArticolo = new MutableLiveData<>();
+    private final RunnableArgs<ArticoloOrdine> onDialogDismiss;
     private boolean mLockedInput = false;
-    private Dialog mCurrentProgress;
 
+    public final BindableBigDecimal qtaOrd = new BindableBigDecimal(BigDecimal.ZERO);
+    public final BindableInteger numCnf = new BindableInteger(0);
+    public final BindableBigDecimal qtaCnf = new BindableBigDecimal(BigDecimal.ZERO);
 
-    public static Dialog make(Activity context, PVEditOrderHelper helper, ArticoloOrdine articolo, RunnableArgs<ArticoloOrdine> onDialogDismiss) {
-        return new EditArticoloDialog(context, helper, articolo, onDialogDismiss).mDialog;
+    public static EditArticoloDialog newInstance(Activity context, PVEditOrderHelper helper, ArticoloOrdine articolo, RunnableArgs<ArticoloOrdine> onDialogDismiss) {
+        return new EditArticoloDialog(context, helper, articolo, onDialogDismiss);
     }
 
-
     private EditArticoloDialog(Activity context, PVEditOrderHelper helper, ArticoloOrdine articolo, RunnableArgs<ArticoloOrdine> onDialogDismiss) {
         mContext = context;
-        mArticolo = articolo;
+        mArticolo.setValue(articolo);
         mHelper = helper;
+        qtaOrd.set(BigDecimal.valueOf(articolo.getQtaOrd()));
+        numCnf.set(BigDecimal.valueOf(articolo.getQtaOrd()).divide(BigDecimal.valueOf(articolo.getQtaCnf()),0,RoundingMode.CEILING).intValue());
+        qtaCnf.set(BigDecimal.valueOf(articolo.getQtaCnf()));
 
-        mSavedArt = null;
+        this.onDialogDismiss = onDialogDismiss;
 
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStyle(DialogFragment.STYLE_NORMAL, R.style.AppTheme_NewMaterial_Dialog_FullscreenDialog);
+
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        ArticoloOrdine articolo = mArticolo.getValue();
+        if (articolo != null && articolo.getQtaOrd() <= 0f){
+            articolo = null;
+        }
+        onDialogDismiss.run(articolo);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_pv_edit_articolo, null, false);
-        mBinding.setViewmodel(this);
+        mBinding.setView(this);
+        mBinding.toolbar.setTitle("Inserimento articolo");
+        mBinding.inputQtaOrd.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        initBindings();
 
-        mDialog = new BaseDialog(context);
-        mDialog.setContentView(mBinding.getRoot());
-        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
-        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        int qtaCnf = (int) Math.ceil(mArticolo.getQtaOrd() / mArticolo.getQtaCnf());
-        mBinding.qtaTot.setText(String.valueOf(mArticolo.getQtaOrd()));
-        mBinding.qtaCnf.setText(String.valueOf(qtaCnf));
-        mDialog.setOnShowListener(dialog -> {
-            UtilityFocus.focusTextBox(mContext, mBinding.qtaTot);
-        });
-
-        mDialog.setOnDismissListener(dialog -> {
-            onDialogDismiss.run(mSavedArt);
-        });
-        setListeners();
+        return mBinding.getRoot();
     }
 
-    private void setListeners() {
-        mBinding.qtaTot.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                setQtaOrd(s.toString().length() > 0 ? Float.parseFloat(s.toString()) : 0);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-        mBinding.qtaCnf.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                setQtaCnf(s.toString().length() > 0 ? Integer.parseInt(s.toString()) : 0);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
-            }
-        });
+    @Override
+    public void onStart() {
+        super.onStart();
+        UtilityFocus.focusTextBox(mContext, mBinding.inputQtaOrd);
     }
 
-    public void setQtaCnf(int qtaCnf) {
-        if (mLockedInput) {
-            mLockedInput = false;
-        } else {
-            mLockedInput = true;
+    private void initBindings() {
 
-            float qtaTot = qtaCnf * mArticolo.getQtaCnf();
-            mBinding.qtaTot.setText(String.valueOf(qtaTot));
-        }
-    }
+        BindableBigDecimal.registerListener(qtaOrd, qta -> {
+            if (!mLockedInput) {
+                mLockedInput = true;
 
-    public void setQtaOrd(float qtaOrd) {
-        mArticolo.setQtaOrd(qtaOrd);
-        if (mLockedInput) {
-            mLockedInput = false;
-        } else {
-            mLockedInput = true;
-            mBinding.qtaCnf.setText(String.valueOf((int) Math.ceil(qtaOrd / mArticolo.getQtaCnf())));
-        }
+                ArticoloOrdine articoloOrdine = mArticolo.getValue();
+                BigDecimal qtaCnf = BigDecimal.valueOf(articoloOrdine.getQtaCnf());
+                int cnf = 0;
+                if (qtaOrd.get() != null && qtaOrd.get().compareTo(BigDecimal.ZERO) > 0){
+                    cnf = qtaOrd.get().divide(qtaCnf, 0, RoundingMode.CEILING).intValue();
+                }
+                this.numCnf.set( cnf);
+                this.mBinding.executePendingBindings();
+
+                mLockedInput = false;
+            }
+        });
+        BindableInteger.registerListener(numCnf, qta -> {
+            if (!mLockedInput){
+                mLockedInput = true;
+
+                ArticoloOrdine articoloOrdine = mArticolo.getValue();
+                BigDecimal qtaCnf = BigDecimal.valueOf(articoloOrdine.getQtaCnf());
+                this.qtaOrd.set(BigDecimal.valueOf(numCnf.get() * qtaCnf.floatValue()).setScale(2, RoundingMode.CEILING));
+                this.mBinding.executePendingBindings();
+
+                mLockedInput = false;
+            }
+        });
     }
 
     public void saveAndExit() {
-        this.openProgress();
+        this.onLoadingStarted();
         try {
-            float qtaOrd = Float.parseFloat(mBinding.qtaTot.getText().toString());
-            if (qtaOrd <= 0) {
+            ArticoloOrdine articolo = mArticolo.getValue();
+            if (articolo == null) {
+                throw new Exception("Articolo non valido");
+            }
+            if (qtaOrd.get().compareTo(BigDecimal.ZERO) <= 0) {
                 throw new Exception("La quantità ordinata deve essere maggiore di 0");
             }
-            mArticolo.setQtaOrd(qtaOrd);
+
+            articolo.setQtaOrd(qtaOrd.get().floatValue());
+            mArticolo.postValue(articolo);
 
         } catch (Exception e) {
             mContext.runOnUiThread(() -> UtilityExceptions.defaultException(mContext, e));
-            this.closeProgress();
+            this.onLoadingEnded();
             return;
         }
-        mHelper.saveArticoloToOrdine(mArticolo, () -> {
-            mSavedArt = mArticolo;
-            this.closeProgress();
-            mDialog.dismiss();
+        mHelper.saveArticoloToOrdine(mArticolo.getValue(), () -> {
+            this.onLoadingEnded();
+            this.dismiss();
         }, e -> mContext.runOnUiThread(() -> UtilityExceptions.defaultException(mContext, e)));
     }
 
     public ArticoloOrdine getArticolo() {
-        return mArticolo;
+        return mArticolo.getValue();
     }
 
     public void cancel() {
-        mArticolo = null;
-        mDialog.dismiss();
-    }
-
-    protected void openProgress() {
-        mContext.runOnUiThread(() -> {
-            if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(mContext);
-            }
-        });
-    }
-
-    protected void closeProgress() {
-        mContext.runOnUiThread(() -> {
-            if (mCurrentProgress != null) {
-                mCurrentProgress.dismiss();
-                mCurrentProgress = null;
-            }
-        });
+        mArticolo.postValue(null);
+        this.dismiss();
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -95,15 +96,21 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         super.onCreate(savedInstanceState);
     }
 
+    @Override
+    public void onDestroy() {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        super.onDestroy();
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_rettifica_giacenze, container, false);
-
         MainApplication.appComponent
                 .rettificaGiacenzeComponent()
                 .create()
@@ -126,7 +133,6 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
         return mBinding.getRoot();
     }
 
-
     private void initVars() {
         thereIsAnOpenedUL.addOnPropertyChangedCallback(() -> {
             thereIsntAnOpenedUL.set(!thereIsAnOpenedUL.get());

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -174,7 +174,7 @@ public class SpedizioneViewModel {
 
     private void getEmptyPickingList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete) {
         List<String> codMarts = Stream.of(sitArtOrdList)
-                .map(SitArtOrdDTO::getCodMart)
+                .map(x -> x.getCodMart().trim())
                 .toList();
 
         this.mArticoloRESTConsumer.getByCodMarts(codMarts, listMtbAarts -> {
@@ -183,7 +183,7 @@ public class SpedizioneViewModel {
                         MtbAart mtbAart = null;
 
                         for (MtbAart mtbAartItem : listMtbAarts) {
-                            if (mtbAartItem.getCodMart().equalsIgnoreCase(sitArtOrdDTO.getCodMart())) {
+                            if (mtbAartItem.getCodMart().trim().equalsIgnoreCase(sitArtOrdDTO.getCodMart().trim())) {
                                 mtbAart = mtbAartItem;
                                 break;
                             }
@@ -776,34 +776,34 @@ public class SpedizioneViewModel {
 
             List<MtbPartitaMag> availableBatchLots = Stream.of(scannedMtbColrs)
                     .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) && (
-                                    x.getPartitaMag() == null ||
+                            x.getPartitaMag() == null ||
                                     UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) ||
                                     UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD())
-                            ))
+                    ))
                     .distinctBy(MtbColr::getPartitaMag)
                     .map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag())
                     .toList();
 
             //Controllo se una delle partite combacia con quella che voglio evadere
-            if(refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) {
+            if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) {
                 MtbPartitaMag refMtbPartitaMag = refMtbColr.getMtbPartitaMag();
 
                 Optional<MtbPartitaMag> matchPartitaMag = Stream.of(availableBatchLots)
                         .filter(availableBatchLot -> refMtbPartitaMag.getPartitaMag().equalsIgnoreCase(availableBatchLot.getPartitaMag()))
                         .findFirst();
 
-                if(matchPartitaMag.isPresent()) {
+                if (matchPartitaMag.isPresent()) {
                     availableBatchLots.clear();
                     availableBatchLots.add(refMtbPartitaMag);
                 }
             }
 
-            if(availableBatchLots.size() > 1) {
+            if (availableBatchLots.size() > 1) {
                 this.sendOnLoadingStarted();
 
                 List<MtbPartitaMag> tmp = new ArrayList<>();
 
-                if(Stream.of(availableBatchLots).anyMatch(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()))) {
+                if (Stream.of(availableBatchLots).anyMatch(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()))) {
                     tmp.addAll(
                             Stream.of(availableBatchLots)
                                     .filter(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()) && UtilityDate.getDateInstance().before(x.getDataScadD()))
@@ -811,7 +811,7 @@ public class SpedizioneViewModel {
                                     .toList());
                 }
 
-                if(Stream.of(availableBatchLots).anyMatch(x -> UtilityString.isNullOrEmpty(x.getDataScadS()))) {
+                if (Stream.of(availableBatchLots).anyMatch(x -> UtilityString.isNullOrEmpty(x.getDataScadS()))) {
                     tmp.addAll(
                             Stream.of(availableBatchLots)
                                     .filter(x -> UtilityString.isNullOrEmpty(x.getDataScadS()))
@@ -822,7 +822,7 @@ public class SpedizioneViewModel {
                 this.sendBatchLotSelectionRequest(tmp, selected -> {
                     this.sendOnLoadingEnded();
 
-                    if(selected != null) {
+                    if (selected != null) {
                         MtbColr scannedMtbColr = Stream.of(pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr())
                                 .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
                                         ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag())) ||
@@ -897,7 +897,7 @@ public class SpedizioneViewModel {
 //        }
 
 
-        if(refMtbColr != null) {
+        if (refMtbColr != null) {
             if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
                 if (UtilityBigDecimal.equalsOrLowerThan(refMtbColr.getQtaCol(), qtaDaEvadere)) {
                     numCnfDaPrelevare = refMtbColr.getNumCnf();
@@ -1456,7 +1456,7 @@ public class SpedizioneViewModel {
                             refMtbColt.getMtbColr().size() > 0 ?
                             refMtbColt.getMtbColr().get(0) : null;
 
-                    if(originalRefMtbColr != null) {
+                    if (originalRefMtbColr != null) {
                         refMtbColr.setId(originalRefMtbColr.getId());
                     }
 
@@ -1695,7 +1695,7 @@ public class SpedizioneViewModel {
                         .setRiga(null)
                         .setNumCollo(null)
                         .setGestione((String) null)
-                        .setDataCollo(null)
+                        .setDataCollo((String) null)
                         .setSerCollo(null)
                         .setCausale(MtbColr.Causale.VERSAMENTO);
 
@@ -1721,7 +1721,7 @@ public class SpedizioneViewModel {
             if (!shouldPrint) {
                 onComplete.run();
             } else {
-                    cyclicPrint(PrinterRESTConsumer.Type.PRIMARIA, mtbColtsToPrint.iterator(), onComplete, ex -> this.sendLUPrintError(ex, onComplete));
+                cyclicPrint(PrinterRESTConsumer.Type.PRIMARIA, mtbColtsToPrint.iterator(), onComplete, ex -> this.sendLUPrintError(ex, onComplete));
 
             }
 

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java

@@ -124,7 +124,7 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());

app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/ExpandableLayout.java

@@ -0,0 +1,333 @@
+package it.integry.integrywmsnative.ui.expandablelayout;
+
+import static it.integry.integrywmsnative.ui.expandablelayout.ExpandableLayout.State.COLLAPSED;
+import static it.integry.integrywmsnative.ui.expandablelayout.ExpandableLayout.State.COLLAPSING;
+import static it.integry.integrywmsnative.ui.expandablelayout.ExpandableLayout.State.EXPANDED;
+import static it.integry.integrywmsnative.ui.expandablelayout.ExpandableLayout.State.EXPANDING;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import it.integry.integrywmsnative.R;
+
+public class ExpandableLayout extends FrameLayout {
+    public interface State {
+        int COLLAPSED = 0;
+        int COLLAPSING = 1;
+        int EXPANDING = 2;
+        int EXPANDED = 3;
+    }
+
+    public static final String KEY_SUPER_STATE = "super_state";
+    public static final String KEY_EXPANSION = "expansion";
+
+    public static final int HORIZONTAL = 0;
+    public static final int VERTICAL = 1;
+
+    private static final int DEFAULT_DURATION = 300;
+
+    private int duration = DEFAULT_DURATION;
+    private float parallax;
+    private float expansion;
+    private int orientation;
+    private int state;
+
+    private Interpolator interpolator = new FastOutSlowInInterpolator();
+    private ValueAnimator animator;
+
+    private ExpandableLayout.OnExpansionUpdateListener listener;
+
+    public ExpandableLayout(Context context) {
+        this(context, null);
+    }
+
+    public ExpandableLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        if (attrs != null) {
+            TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ExpandableLayout);
+            duration = a.getInt(R.styleable.ExpandableLayout_el_duration, DEFAULT_DURATION);
+            expansion = a.getBoolean(R.styleable.ExpandableLayout_el_expanded, false) ? 1 : 0;
+            orientation = a.getInt(R.styleable.ExpandableLayout_android_orientation, VERTICAL);
+            parallax = a.getFloat(R.styleable.ExpandableLayout_el_parallax, 1);
+            a.recycle();
+
+            state = expansion == 0 ? COLLAPSED : EXPANDED;
+            setParallax(parallax);
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        Bundle bundle = new Bundle();
+
+        expansion = isExpanded() ? 1 : 0;
+
+        bundle.putFloat(KEY_EXPANSION, expansion);
+        bundle.putParcelable(KEY_SUPER_STATE, superState);
+
+        return bundle;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable parcelable) {
+        Bundle bundle = (Bundle) parcelable;
+        expansion = bundle.getFloat(KEY_EXPANSION);
+        state = expansion == 1 ? EXPANDED : COLLAPSED;
+        Parcelable superState = bundle.getParcelable(KEY_SUPER_STATE);
+
+        super.onRestoreInstanceState(superState);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+
+        int size = orientation == LinearLayout.HORIZONTAL ? width : height;
+
+        setVisibility(expansion == 0 && size == 0 ? GONE : VISIBLE);
+
+        int expansionDelta = size - Math.round(size * expansion);
+        if (parallax > 0) {
+            float parallaxDelta = expansionDelta * parallax;
+            for (int i = 0; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                if (orientation == HORIZONTAL) {
+                    int direction = -1;
+                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1 && getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+                        direction = 1;
+                    }
+                    child.setTranslationX(direction * parallaxDelta);
+                } else {
+                    child.setTranslationY(-parallaxDelta);
+                }
+            }
+        }
+
+        if (orientation == HORIZONTAL) {
+            setMeasuredDimension(width - expansionDelta, height);
+        } else {
+            setMeasuredDimension(width, height - expansionDelta);
+        }
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        if (animator != null) {
+            animator.cancel();
+        }
+        super.onConfigurationChanged(newConfig);
+    }
+
+    /**
+     * Get expansion state
+     *
+     * @return one of {@link ExpandableLayout.State}
+     */
+    public int getState() {
+        return state;
+    }
+
+    public boolean isExpanded() {
+        return state == EXPANDING || state == EXPANDED;
+    }
+
+    public void toggle() {
+        toggle(true);
+    }
+
+    public void toggle(boolean animate) {
+        if (isExpanded()) {
+            collapse(animate);
+        } else {
+            expand(animate);
+        }
+    }
+
+    public void expand() {
+        expand(true);
+    }
+
+    public void expand(boolean animate) {
+        setExpanded(true, animate);
+    }
+
+    public void collapse() {
+        collapse(true);
+    }
+
+    public void collapse(boolean animate) {
+        setExpanded(false, animate);
+    }
+
+    /**
+     * Convenience method - same as calling setExpanded(expanded, true)
+     */
+    public void setExpanded(boolean expand) {
+        setExpanded(expand, true);
+    }
+
+    public void setExpanded(boolean expand, boolean animate) {
+        if (expand == isExpanded()) {
+            return;
+        }
+
+        int targetExpansion = expand ? 1 : 0;
+        if (animate) {
+            animateSize(targetExpansion);
+        } else {
+            setExpansion(targetExpansion);
+        }
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    public void setInterpolator(Interpolator interpolator) {
+        this.interpolator = interpolator;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    public float getExpansion() {
+        return expansion;
+    }
+
+    public void setExpansion(float expansion) {
+        if (this.expansion == expansion) {
+            return;
+        }
+
+        // Infer state from previous value
+        float delta = expansion - this.expansion;
+        if (expansion == 0) {
+            state = COLLAPSED;
+        } else if (expansion == 1) {
+            state = EXPANDED;
+        } else if (delta < 0) {
+            state = COLLAPSING;
+        } else if (delta > 0) {
+            state = EXPANDING;
+        }
+
+        setVisibility(state == COLLAPSED ? GONE : VISIBLE);
+        this.expansion = expansion;
+        requestLayout();
+
+        if (listener != null) {
+            listener.onExpansionUpdate(expansion, state);
+        }
+    }
+
+    public float getParallax() {
+        return parallax;
+    }
+
+    public void setParallax(float parallax) {
+        // Make sure parallax is between 0 and 1
+        parallax = Math.min(1, Math.max(0, parallax));
+        this.parallax = parallax;
+    }
+
+    public int getOrientation() {
+        return orientation;
+    }
+
+    public void setOrientation(int orientation) {
+        if (orientation < 0 || orientation > 1) {
+            throw new IllegalArgumentException("Orientation must be either 0 (horizontal) or 1 (vertical)");
+        }
+        this.orientation = orientation;
+    }
+
+    public void setOnExpansionUpdateListener(ExpandableLayout.OnExpansionUpdateListener listener) {
+        this.listener = listener;
+    }
+
+    private void animateSize(int targetExpansion) {
+        if (animator != null) {
+            animator.cancel();
+            animator = null;
+        }
+
+        setLayerType(View.LAYER_TYPE_HARDWARE, null);
+
+        animator = ValueAnimator.ofFloat(expansion, targetExpansion);
+        animator.setInterpolator(interpolator);
+        animator.setDuration(duration);
+
+        animator.addUpdateListener(valueAnimator -> setExpansion((float) valueAnimator.getAnimatedValue()));
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+
+                setLayerType(View.LAYER_TYPE_NONE, null);
+            }
+        });
+
+        animator.addListener(new ExpandableLayout.ExpansionListener(targetExpansion));
+
+        animator.start();
+    }
+
+    public interface OnExpansionUpdateListener {
+        /**
+         * Callback for expansion updates
+         *
+         * @param expansionFraction Value between 0 (collapsed) and 1 (expanded) representing the the expansion progress
+         * @param state             One of {@link ExpandableLayout.State} repesenting the current expansion state
+         */
+        void onExpansionUpdate(float expansionFraction, int state);
+    }
+
+    private class ExpansionListener implements Animator.AnimatorListener {
+        private int targetExpansion;
+        private boolean canceled;
+
+        public ExpansionListener(int targetExpansion) {
+            this.targetExpansion = targetExpansion;
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+            state = targetExpansion == 0 ? COLLAPSING : EXPANDING;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!canceled) {
+                state = targetExpansion == 0 ? COLLAPSED : EXPANDED;
+                setExpansion(targetExpansion);
+            }
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            canceled = true;
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+    }
+}
+

app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/FastOutSlowInInterpolator.java

@@ -0,0 +1,45 @@
+package it.integry.integrywmsnative.ui.expandablelayout;
+
+public class FastOutSlowInInterpolator extends LookupTableInterpolator {
+
+    /**
+     * Lookup table values sampled with x at regular intervals between 0 and 1 for a total of
+     * 201 points.
+     */
+    private static final float[] VALUES = new float[] {
+            0.0000f, 0.0001f, 0.0002f, 0.0005f, 0.0009f, 0.0014f, 0.0020f,
+            0.0027f, 0.0036f, 0.0046f, 0.0058f, 0.0071f, 0.0085f, 0.0101f,
+            0.0118f, 0.0137f, 0.0158f, 0.0180f, 0.0205f, 0.0231f, 0.0259f,
+            0.0289f, 0.0321f, 0.0355f, 0.0391f, 0.0430f, 0.0471f, 0.0514f,
+            0.0560f, 0.0608f, 0.0660f, 0.0714f, 0.0771f, 0.0830f, 0.0893f,
+            0.0959f, 0.1029f, 0.1101f, 0.1177f, 0.1257f, 0.1339f, 0.1426f,
+            0.1516f, 0.1610f, 0.1707f, 0.1808f, 0.1913f, 0.2021f, 0.2133f,
+            0.2248f, 0.2366f, 0.2487f, 0.2611f, 0.2738f, 0.2867f, 0.2998f,
+            0.3131f, 0.3265f, 0.3400f, 0.3536f, 0.3673f, 0.3810f, 0.3946f,
+            0.4082f, 0.4217f, 0.4352f, 0.4485f, 0.4616f, 0.4746f, 0.4874f,
+            0.5000f, 0.5124f, 0.5246f, 0.5365f, 0.5482f, 0.5597f, 0.5710f,
+            0.5820f, 0.5928f, 0.6033f, 0.6136f, 0.6237f, 0.6335f, 0.6431f,
+            0.6525f, 0.6616f, 0.6706f, 0.6793f, 0.6878f, 0.6961f, 0.7043f,
+            0.7122f, 0.7199f, 0.7275f, 0.7349f, 0.7421f, 0.7491f, 0.7559f,
+            0.7626f, 0.7692f, 0.7756f, 0.7818f, 0.7879f, 0.7938f, 0.7996f,
+            0.8053f, 0.8108f, 0.8162f, 0.8215f, 0.8266f, 0.8317f, 0.8366f,
+            0.8414f, 0.8461f, 0.8507f, 0.8551f, 0.8595f, 0.8638f, 0.8679f,
+            0.8720f, 0.8760f, 0.8798f, 0.8836f, 0.8873f, 0.8909f, 0.8945f,
+            0.8979f, 0.9013f, 0.9046f, 0.9078f, 0.9109f, 0.9139f, 0.9169f,
+            0.9198f, 0.9227f, 0.9254f, 0.9281f, 0.9307f, 0.9333f, 0.9358f,
+            0.9382f, 0.9406f, 0.9429f, 0.9452f, 0.9474f, 0.9495f, 0.9516f,
+            0.9536f, 0.9556f, 0.9575f, 0.9594f, 0.9612f, 0.9629f, 0.9646f,
+            0.9663f, 0.9679f, 0.9695f, 0.9710f, 0.9725f, 0.9739f, 0.9753f,
+            0.9766f, 0.9779f, 0.9791f, 0.9803f, 0.9815f, 0.9826f, 0.9837f,
+            0.9848f, 0.9858f, 0.9867f, 0.9877f, 0.9885f, 0.9894f, 0.9902f,
+            0.9910f, 0.9917f, 0.9924f, 0.9931f, 0.9937f, 0.9944f, 0.9949f,
+            0.9955f, 0.9960f, 0.9964f, 0.9969f, 0.9973f, 0.9977f, 0.9980f,
+            0.9984f, 0.9986f, 0.9989f, 0.9991f, 0.9993f, 0.9995f, 0.9997f,
+            0.9998f, 0.9999f, 0.9999f, 1.0000f, 1.0000f
+    };
+
+    public FastOutSlowInInterpolator() {
+        super(VALUES);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/LookupTableInterpolator.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.ui.expandablelayout;
+
+import android.view.animation.Interpolator;
+
+abstract class LookupTableInterpolator implements Interpolator {
+
+    private final float[] mValues;
+    private final float mStepSize;
+
+    public LookupTableInterpolator(float[] values) {
+        mValues = values;
+        mStepSize = 1f / (mValues.length - 1);
+    }
+
+    @Override
+    public float getInterpolation(float input) {
+        if (input >= 1.0f) {
+            return 1.0f;
+        }
+        if (input <= 0f) {
+            return 0f;
+        }
+
+        // Calculate index - We use min with length - 2 to avoid IndexOutOfBoundsException when
+        // we lerp (linearly interpolate) in the return statement
+        int position = Math.min((int) (input * (mValues.length - 1)), mValues.length - 2);
+
+        // Calculate values to account for small offsets as the lookup table has discrete values
+        float quantized = position * mStepSize;
+        float diff = input - quantized;
+        float weight = diff / mStepSize;
+
+        // Linearly interpolate between the table values
+        return mValues[position] + weight * (mValues[position + 1] - mValues[position]);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java

@@ -77,12 +77,14 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
         this.mViewModel.getObservableMtbColt().addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
             @Override
             public void onPropertyChanged(Observable sender, int propertyId) {
-                if(mViewModel.getObservableMtbColt().get() != null) {
+                var mtbColt = mViewModel.getObservableMtbColt().get();
+
+                if (mtbColt != null) {
                     initAdapter();
 
                     onMtbColrItemChanged();
 
-                    mViewModel.getObservableMtbColt().get().getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() {
+                    mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() {
                         @Override
                         public void onChanged(ObservableList sender) {
                             onMtbColrItemChanged();
@@ -99,6 +101,7 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
         List<MtbColr> mtbColrs = mViewModel.getObservableMtbColt().get().getMtbColr();
         mBinding.textviewArtCounter.setText(String.valueOf(mtbColrs.size()));
         mBinding.textviewArtDescription.setText(mContext.getResources().getQuantityString(R.plurals.articles, mtbColrs.size()));
+        mViewModel.calcPesi();
     }
 
     public BottomSheetFragmentLUContentView setListener(Listener listener) {
@@ -129,12 +132,12 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
 
     @Override
     public void onMtbColrEdit(MtbColr mtbColr) {
-        if(mListener != null) this.mListener.onMtbColrEdit(mtbColr);
+        if (mListener != null) this.mListener.onMtbColrEdit(mtbColr);
     }
 
     @Override
     public void onMtbColrDelete(MtbColr mtbColr) {
-        if(mListener != null) this.mListener.onMtbColrDelete(mtbColr);
+        if (mListener != null) this.mListener.onMtbColrDelete(mtbColr);
     }
 
 

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java

@@ -2,16 +2,24 @@ package it.integry.integrywmsnative.view.bottom_sheet__lu_content;
 
 import androidx.databinding.ObservableField;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 
 public class BottomSheetFragmentLUContentViewModel {
 
     public ObservableField<MtbColt> mtbColt = new ObservableField<>();
+    public ObservableField<String> pesoKg = new ObservableField<>();
+    public ObservableField<String> pesoNettoKg = new ObservableField<>();
     private Listener mListener;
     private MtbColrListener mMtbColrListener;
 
     public void closeCurrentLU() {
-        if(this.mListener != null) this.mListener.onBottomSheetLUClose();
+        if (this.mListener != null) this.mListener.onBottomSheetLUClose();
     }
 
     public BottomSheetFragmentLUContentViewModel setMtbColt(MtbColt mtbColt) {
@@ -33,6 +41,26 @@ public class BottomSheetFragmentLUContentViewModel {
         return this;
     }
 
+    public void calcPesi() {
+        MtbColt collo = this.mtbColt.get();
+        if (collo != null) {
+            MtbTCol tipoPedana = collo.getMtbTCol();
+            BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
+            BigDecimal pesoNetto = BigDecimal.ZERO;
+            for (MtbColr mtbColr : collo.getMtbColr()) {
+                MtbAart articolo = mtbColr.getMtbAart();
+                if (articolo != null) {
+                    BigDecimal pesoRiga = articolo.isFlagQtaCnfFissaBoolean() ? mtbColr.getNumCnf().multiply(articolo.getPesoKg()) : mtbColr.getQtaCol();
+                    BigDecimal pesoTara = articolo.getTaraKg().multiply(mtbColr.getNumCnf());
+                    pesoRiga = pesoRiga.add(pesoTara);
+                    pesoNetto = pesoNetto.add(pesoRiga);
+                }
+            }
+            this.pesoNettoKg.set(pesoNetto.setScale(2, RoundingMode.CEILING).toString());
+            this.pesoKg.set(pesoNetto.add(taraPedana).setScale(2, RoundingMode.CEILING).toString());
+        }
+    }
+
     public interface Listener {
         void onBottomSheetLUClose();
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_versamento_automatico_ul/DialogAskShouldVersamentoAutomaticoULView.java

@@ -0,0 +1,75 @@
+package it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul;
+
+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 android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
+import org.jetbrains.annotations.NotNull;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.databinding.DialogAskShouldVersamentoAutomaticoUlBinding;
+
+public class DialogAskShouldVersamentoAutomaticoULView extends BaseDialogFragment {
+
+    private RunnableArgs<Boolean> mOnDismiss;
+    private DialogAskShouldVersamentoAutomaticoUlBinding mBindings;
+
+    private boolean returnValue = false;
+
+    public static DialogAskShouldVersamentoAutomaticoULView newInstance(@NotNull RunnableArgs<Boolean> onDismiss) {
+        return new DialogAskShouldVersamentoAutomaticoULView(onDismiss);
+    }
+
+    private DialogAskShouldVersamentoAutomaticoULView(@NotNull RunnableArgs<Boolean> onDismiss) {
+        super();
+
+        this.mOnDismiss = onDismiss;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_versamento_automatico_ul, container, false);
+        mBindings.setLifecycleOwner(this);
+
+        getDialog().setCanceledOnTouchOutside(false);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+
+        mBindings.setView(this);
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+
+        if (mOnDismiss != null) {
+            this.mOnDismiss.run(returnValue);
+        }
+    }
+
+
+    public void confirm() {
+        this.returnValue = true;
+        dismiss();
+    }
+
+    public void abort() {
+        this.returnValue = false;
+        dismiss();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.base;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
@@ -12,6 +11,7 @@ import androidx.databinding.DataBindingUtil;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding;
 
 /**
@@ -21,7 +21,7 @@ import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding;
 public class DialogSimpleInputHelper {
 
 
-    private static Dialog makeBase(Context mContext, String titleText, String valueText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
+    private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
         Dialog dialog = new Dialog(mContext);
         DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog);
 
@@ -39,10 +39,14 @@ public class DialogSimpleInputHelper {
 
         //Title VIEW
         mBinding.titleText.setText(titleText);
-        if (valueText != null){
-            mBinding.generalInput.setText(valueText);
+
+        if (!UtilityString.isNullOrEmpty(hintText)){
+            mBinding.generalInput.setHint(hintText);
+        }
+
+        if (!UtilityString.isNullOrEmpty(defaultTextValue)){
+            mBinding.generalInput.setText(defaultTextValue);
         }
-        ColorStateList colorStateList = ColorStateList.valueOf(Color.WHITE);
 
         //Content View
         dialog.setCancelable(true);
@@ -60,17 +64,19 @@ public class DialogSimpleInputHelper {
         return makeBase(mContext,
                 title,
                 null,
+                null,
                 onPositiveClick,
                 onNegativeClick);
 
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title,String value, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
+    public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
 
         return makeBase(mContext,
                 title,
-                value,
+                defaultTextValue,
+                hintText,
                 onPositiveClick,
                 onNegativeClick);
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java

@@ -62,11 +62,23 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     private final List<DialogChooseArtsFromListaArtsItemModel> mDataset;
 
     private int mBarcodeScannerIstanceID;
+    private Dialog mCurrentProgress;
+    private MtbAart selectedArt;
 
     public static DialogChooseArtsFromListaArts newInstance(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
         return new DialogChooseArtsFromListaArts(listaMtbColr, onItemsChoosed, onAbort);
     }
 
+    public static DialogChooseArtsFromListaArts newInstance(List<MtbColr> listaMtbColr, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
+        DialogChooseArtsFromListaArts dialog = newInstance(listaMtbColr, onItemsChoosed, onAbort);
+        dialog.setSelectedArt(mtbAart);
+        return dialog;
+    }
+
+    public void setSelectedArt(MtbAart mtbAart) {
+        this.selectedArt = mtbAart;
+    }
+
     private DialogChooseArtsFromListaArts(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
         super();
 
@@ -125,6 +137,14 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
         return mBindings.getRoot();
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (selectedArt != null) {
+            this.loadArticolo(selectedArt.getBarCode(), null);
+        }
+    }
 
     private void initRecyclerView() {
         mBindings.listaArts.setNestedScrollingEnabled(false);
@@ -229,8 +249,6 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     }
 
 
-
-
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
@@ -242,14 +260,15 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
         BarcodeManager.disable();
 
-        Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(context);
+        openProgress();
+
 
         if (UtilityBarcode.isEan13(data)) {
-            this.loadArticolo(data.getStringValue(), null, progressDialog);
+            this.loadArticolo(data.getStringValue(), null);
         } else if (UtilityBarcode.isEtichetta128(data)) {
-            this.executeEtichettaEan128(data, progressDialog);
+            this.executeEtichettaEan128(data);
         } else {
-            progressDialog.dismiss();
+            closeProgress();
             BarcodeManager.enable();
         }
 
@@ -257,7 +276,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     };
 
 
-    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) {
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO) {
         this.barcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
 
             String barcodeProd = null;
@@ -271,11 +290,11 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
 
                 if (!UtilityString.isNullOrEmpty(ean128Model.Gtin) || !UtilityString.isNullOrEmpty(ean128Model.Content)) {
-                    this.loadArticolo(barcodeProd, ean128Model, progressDialog);
+                    this.loadArticolo(barcodeProd, ean128Model);
                 } else {
                     DialogCommon.showNoArtFoundDialog(context, () -> {
                         BarcodeManager.enable();
-                        progressDialog.dismiss();
+                        closeProgress();
                     });
 
                 }
@@ -285,18 +304,19 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 DialogCommon.showNoArtFoundDialog(context, () -> {
                     BarcodeManager.enable();
-                    progressDialog.dismiss();
+                    closeProgress();
                 });
 
             }
         }, ex -> {
-            UtilityExceptions.defaultException(context, ex, progressDialog);
+            closeProgress();
+            UtilityExceptions.defaultException(context, ex);
             BarcodeManager.enable();
         });
     }
 
 
-    private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) {
+    private void loadArticolo(String barcodeProd, Ean128Model ean128Model) {
         if (barcodeProd.length() == 14) {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
@@ -310,19 +330,20 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                 this.searchArtInList(mtbAartList.get(0), ean128Model);
 
                 BarcodeManager.enable();
-                progressDialog.dismiss();
+                closeProgress();
 
             } else {
 
                 DialogCommon.showNoArtFoundDialog(context, () -> {
                     BarcodeManager.enable();
-                    progressDialog.dismiss();
+                    closeProgress();
                 });
             }
 
         }, ex -> {
+            closeProgress();
             BarcodeManager.enable();
-            UtilityExceptions.defaultException(context, ex, progressDialog);
+            UtilityExceptions.defaultException(context, ex);
         });
     }
 
@@ -364,5 +385,20 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
         this.dismiss();
     }
 
+    protected void openProgress() {
+        requireActivity().runOnUiThread(() -> {
+            if (this.mCurrentProgress == null) {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            }
+        });
+    }
 
+    protected void closeProgress() {
+        requireActivity().runOnUiThread(() -> {
+            if (mCurrentProgress != null) {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            }
+        });
+    }
 }