From db3eb1b0628f3c562dbfea21ba301b7532c4ef17 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 17 Jan 2024 09:14:44 +0100
Subject: [PATCH] Aggiunto nella sezione Approvvigionamento avanti elenco degli
 ordini e filtro per numOrd

---
 .idea/runConfigurations/app.xml               |   2 +-
 .../core/rest/consumers/MesRESTConsumer.java  |   4 +-
 .../consumers/MesRESTConsumerService.java     |   2 +-
 .../core/utility/UtilityDB.java               |  10 +
 .../core/utility/UtilityDate.java             |  10 +
 .../OrdiniUscitaElencoBindings.java           |   2 +-
 .../OrdiniUscitaElencoFragment.java           |   2 +-
 .../ProdOrdineProduzioneElencoBindings.java   |   2 +-
 .../ProdOrdineProduzioneElencoFragment.java   |   2 +-
 .../ProdFabbisognoLineeProdBindings.java      |  20 ++
 .../ProdFabbisognoLineeProdFragment.java      | 226 ++++++++++++++++--
 .../ProdFabbisognoLineeProdModule.java        |   7 +-
 .../ProdFabbisognoLineeProdViewModel.java     |  57 ++++-
 .../dto/GroupTitleModel.java                  |  22 ++
 .../dto/ProdFabbisognoLineeItemModelDto.java  |  23 ++
 ...rodFabbisognoLineeProdFilterViewModel.java |  74 ++++++
 .../ProdFabbisognoLineeProdRESTConsumer.java  |   4 +-
 ...abbisognoLineeProdRESTConsumerService.java |   4 +-
 .../dto/OrdineLavorazioneDTO.java             |  10 +
 .../filters/FilterNumeroOrdineLayoutView.java |   2 +-
 .../accettazione_main_list_group_model.xml    |   2 +
 ...ragment_main_ordini_uscita__list_model.xml |   2 +
 ...prod_fabbisogno_linee_list_single_item.xml | 127 ++++++++++
 .../fragment_prod_fabbisogno_linee_prod.xml   | 119 ++++++++-
 ...gment_prod_fabbisogno_linee_title_item.xml |  39 +++
 ...ent_prod_ordine_produzione__list_model.xml |  94 +++-----
 .../layout/layout_filter_numero_ordine.xml    |   2 +-
 ...layout_filter_numero_ordine__list_item.xml |   2 +-
 28 files changed, 761 insertions(+), 111 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/GroupTitleModel.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeItemModelDto.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
 rename app/src/main/java/it/integry/integrywmsnative/{gest/ordini_uscita_elenco => ui/filter_chips}/filters/FilterNumeroOrdineLayoutView.java (98%)
 create mode 100644 app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
 create mode 100644 app/src/main/res/layout/fragment_prod_fabbisogno_linee_title_item.xml

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index e0479975..72c17371 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS_Native.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
index 6ff91204..53c70d65 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
@@ -64,10 +64,10 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getOrdiniLavorazione(Date dateStart, String flagEvaso, String codJfas, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getOrdiniLavorazione(String flagEvaso, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
 
-        mesRESTConsumerService.getOrdiniLavorazione(UtilityDate.formatDate(dateStart, UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH), flagEvaso, codJfas)
+        mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
                 .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumerService.java
index bf919418..43422dad 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumerService.java
@@ -20,7 +20,7 @@ public interface MesRESTConsumerService {
 
 
     @GET("mes_v2/getOrdiniLavorazione")
-    Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazione(@Query("startDate") String startDate, @Query("flagEvaso") String flagEvaso, @Query("codJfas") String codJfas);
+    Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazione(@Query("flagEvaso") String flagEvaso);
 
     @GET("mes_v2/getOrdiniLavorazione")
     Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazione(@Query("startDate") String startDate, @Query("flagEvaso") String flagEvaso, @Query("codJfas") String codJfas, @Query("codAnag") String codAnag);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
index c80cc30e..5aa577b8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
@@ -1,7 +1,12 @@
 package it.integry.integrywmsnative.core.utility;
 
+import com.annimon.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 public class UtilityDB {
 
@@ -32,4 +37,9 @@ public class UtilityDB {
         return valueString;
     }
 
+    public static String listValueToString(List<String> lista) {
+        lista = Stream.of(lista).map(UtilityDB::valueToString).toList();
+        return StringUtils.join(lista,",");
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
index 9173db1c..20ff7fc9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
@@ -184,6 +184,16 @@ public class UtilityDate {
         } else return null;
     }
 
+    public static String formatDate(String dateToFormat, String format) {
+        if (dateToFormat != null) {
+            LocalDateTime data = recognizeLocalDateTimeWithExceptionHandler(dateToFormat);
+            if (data != null) {
+                DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format);
+                return data.format(dateTimeFormatter);
+            }else return null;
+        } else return null;
+    }
+
     public static boolean isBeforeToday(LocalDateTime inputDate) {
         return inputDate != null && inputDate.toLocalDate().isBefore(getNow());
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java
index 14683904..b4426983 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java
@@ -7,7 +7,7 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterAutom
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterClienteLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaeseLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
index e3fe910c..04534562 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -60,7 +60,7 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterAutom
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterClienteLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaeseLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
index ee2fb0e6..ecc01702 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione;
 
 import java.util.HashMap;
 
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
index 57f1df05..ba4bffce 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
@@ -41,7 +41,7 @@ import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElenc
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingActivity;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.OrdineProduzioneFilterViewModel;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoClienteListModel;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
new file mode 100644
index 00000000..02834f8c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
@@ -0,0 +1,20 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
+
+public class ProdFabbisognoLineeProdBindings {
+    public static final int NUM_ORD_FILTER_ID = 0;
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {{
+
+        put(NUM_ORD_FILTER_ID, new FilterChipDTO()
+                .setID(NUM_ORD_FILTER_ID)
+                .setFilterChipText("Numero ordine")
+                .setFilterLayoutView(new FilterNumeroOrdineLayoutView()));
+
+    }};
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
index 31fe9ee3..a1a320c1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
@@ -8,29 +8,53 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeListSingleItemBinding;
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBinding;
-import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaView;
+import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeTitleItemBinding;
+import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoClienteListModel;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoListModel;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.filters.ProdFabbisognoLineeProdFilterViewModel;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -39,12 +63,15 @@ import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbiso
  */
 public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ProdFabbisognoLineeProdViewModel.Listener {
 
+    public BindableBoolean fabVisible = new BindableBoolean(false);
+
     @Inject
     ProdFabbisognoLineeProdViewModel mViewModel;
 
     private final ArrayList<Runnable> mOnPreDestroyList = new ArrayList<>();
-
+    private final ObservableArrayList<Object> mProdFabbisognoItemModel = new ObservableArrayList<>();
     private FragmentProdFabbisognoLineeProdBinding mBindings;
+    private ProdFabbisognoLineeProdFilterViewModel mFilterViewModel = new ProdFabbisognoLineeProdFilterViewModel();
 
     public ProdFabbisognoLineeProdFragment() {
         // Required empty public constructor
@@ -66,13 +93,18 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                              Bundle savedInstanceState) {
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_fabbisogno_linee_prod, container, false);
 
-        mBindings.setLifecycleOwner(this);
-
         MainApplication.appComponent
                 .prodFabbisognoLineeProdComponent()
                 .create()
                 .inject(this);
 
+        mViewModel.setListener(this);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
+
+        this.initRecyclerView();
+        this.initFilters();
 
         return mBindings.getRoot();
     }
@@ -80,25 +112,162 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
     @Override
     public void onStart() {
         super.onStart();
-
-        this.mViewModel.setListener(this);
-
-        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
-
-        DialogAskMagazzinoProssimitaView
-                .newInstance((jtbFase, startDate, endDate) -> {
-//                    if (jtbFase == null) {
-//                        ((IPoppableActivity) getActivity()).pop();
-//                    } else {
-                        //Load fabbisogno
-                        this.mViewModel.loadFabbisogno(startDate, endDate, codMdep, this::startPickingActivity);
-//                    }
-                }, () -> {
-                    popMe();
-                })
-                .show(getActivity().getSupportFragmentManager(), "tag");
+        mViewModel.init();
     }
 
+    private void initRecyclerView() {
+        mViewModel.getOrdiniList().observe(getViewLifecycleOwner(), data -> {
+            mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
+
+            mFilterViewModel.init(mViewModel.getOrdiniList().getValue());
+            this.refreshList(null);
+        });
+
+        var itemTypeHeader = new Type<GroupTitleModel, FragmentProdFabbisognoLineeTitleItemBinding>(R.layout.fragment_prod_fabbisogno_linee_title_item, BR.item);
+        var itemType = new Type<ProdFabbisognoLineeItemModelDto, FragmentProdFabbisognoLineeListSingleItemBinding>(R.layout.fragment_prod_fabbisogno_linee_list_single_item, BR.item);
+
+        itemTypeHeader.onClick(x -> {
+            var item = x.getBinding().getItem();
+            item.getSelected().set(!item.getSelected().get());
+
+            Stream.of(mProdFabbisognoItemModel)
+                    .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) y).getOrdineLavorazioneDTO().getCodJfas().equals(item.getTitle()))
+                    .forEach(y -> {
+                        ((ProdFabbisognoLineeItemModelDto) y).getSelected().set(item.selected.get());
+                    });
+
+            fabVisible.set(Stream.of(mProdFabbisognoItemModel)
+                    .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto)
+                    .anyMatch(y -> ((ProdFabbisognoLineeItemModelDto) y).getSelected().get()));
+
+            return null;
+        });
+
+        itemType.onClick(x -> {
+            var item = x.getBinding().getItem();
+            item.getSelected().set(!item.getSelected().get());
+
+            fabVisible.set(Stream.of(mProdFabbisognoItemModel)
+                    .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto)
+                    .anyMatch(y -> ((ProdFabbisognoLineeItemModelDto) y).getSelected().get()));
+
+            return null;
+        });
+
+        new LiveAdapter(mProdFabbisognoItemModel)
+                .map(GroupTitleModel.class, itemTypeHeader)
+                .map(ProdFabbisognoLineeItemModelDto.class, itemType)
+                .into(this.mBindings.inventarioList);
+    }
+
+    private void refreshList(List<ProdFabbisognoLineeItemModelDto> filteredList) {
+        List<ProdFabbisognoLineeItemModelDto> tmpList;
+
+        if (filteredList != null) {
+            tmpList = filteredList;
+        } else if (mFilterViewModel != null) {
+            mFilterViewModel.applyAllTests();
+            tmpList = mFilterViewModel.getCurrentList().getValue();
+        } else {
+            tmpList = mViewModel.getOrdiniList().getValue();
+        }
+        this.mProdFabbisognoItemModel.clear();
+        if (tmpList != null) {
+            this.mProdFabbisognoItemModel.addAll(convertDataModelToListModel(tmpList));
+        }
+    }
+
+    private List<Object> convertDataModelToListModel(List<ProdFabbisognoLineeItemModelDto> itemModel) {
+
+        Stream.of(itemModel)
+                .sorted(Comparator.comparing(x -> x.getOrdineLavorazioneDTO().getCodJfas()))
+                .toList();
+
+        List<Object> listaFinale = new ArrayList<>();
+        String currentGroup = null;
+
+        for (ProdFabbisognoLineeItemModelDto item : itemModel) {
+            OrdineLavorazioneDTO ordineLavorazione = item.getOrdineLavorazioneDTO();
+            String codJfas = ordineLavorazione.getCodJfas();
+
+            if (!codJfas.equals(currentGroup)) {
+                listaFinale.add(new GroupTitleModel().setTitle(codJfas));
+                currentGroup = codJfas;
+            }
+
+            listaFinale.add(item);
+        }
+
+        return listaFinale;
+    }
+
+    private void initFilters() {
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList(null);
+            }
+        };
+
+        mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        for (var filterChipDTO : ProdFabbisognoLineeProdBindings.AVAILABLE_FILTERS.entrySet()) {
+
+            FilterChipView filterChipView = new FilterChipView(
+                    requireActivity(),
+                    filterChipDTO.getValue().getFilterChipText(),
+                    v -> initBottomSheetDialogFilter(filterChipDTO.getValue()));
+
+            if (filterChipDTO.getKey() == ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID) {
+                mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                    @Override
+                    public void run() {
+                        if (mFilterViewModel.getCurrentNumOrdsPredicate().get() == null) {
+                            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(() -> mFilterViewModel.getCurrentNumOrdsPredicate().set(null));
+            }
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+        filterChipDTO
+                .getFilterLayoutView()
+                .setFilterName(filterChipDTO.getFilterChipText())
+                .setContext(requireActivity());
+
+        var filterLayoutView = filterChipDTO
+                .getFilterLayoutView();
+
+        if (filterChipDTO.getID() == ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID) {
+            ((FilterNumeroOrdineLayoutView) filterLayoutView)
+                    .setAllNumOrds(mFilterViewModel.getAllNumOrds())
+                    .setAvailableNumOrds(mFilterViewModel.getAvailableNumOrds())
+                    .setOnFilterApplied(mFilterViewModel::setNumOrdFilter)
+                    .setPreSelectedNumOrds(Stream.of(Objects.requireNonNull(mViewModel.getOrdiniList().getValue()))
+                            .filter(mFilterViewModel.getCurrentNumOrdsPredicate().get() == null ?
+                                    x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentNumOrdsPredicate().get()))
+                            .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
+                            .toList());
+        }
+
+        if (!filterLayoutView.isAdded())
+            filterLayoutView.show(requireActivity().getSupportFragmentManager(), "TAG");
+
+    }
 
     @Override
     public void onDestroy() {
@@ -106,6 +275,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
             onPreDestroy.run();
         }
 
+        mViewModel.setListener(null);
         super.onDestroy();
     }
 
@@ -114,6 +284,18 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         titleText.setText(context.getText(R.string.prod_fabbisogno_linee_prod_title).toString());
     }
 
+    public void dispatchOrders() {
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
+        String ordini = UtilityDB.listValueToString(Stream.of(mProdFabbisognoItemModel)
+                .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
+                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString())
+                .toList());
+
+        this.mViewModel.loadFabbisogno(ordini, codMdep, this::startPickingActivity);
+
+    }
+
     private void startPickingActivity(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
@@ -150,8 +332,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 DialogRowInfoProdFabbisognoLineeProdView.class,
                 divideByGrpMerc);
 
-        popMe();
-
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdModule.java
index efc166a8..37e46c2b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdModule.java
@@ -2,14 +2,17 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 @Module(subcomponents = ProdFabbisognoLineeProdComponent.class)
 public class ProdFabbisognoLineeProdModule {
 
     @Provides
-    ProdFabbisognoLineeProdViewModel providesProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
-        return new ProdFabbisognoLineeProdViewModel(prodFabbisognoLineeProdRESTConsumer);
+    ProdFabbisognoLineeProdViewModel providesProdFabbisognoLineeProdViewModel(
+            ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer,
+            MesRESTConsumer mesRESTConsumer) {
+        return new ProdFabbisognoLineeProdViewModel(prodFabbisognoLineeProdRESTConsumer, mesRESTConsumer);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
index 19d76b92..e5b5d1c5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
@@ -1,44 +1,79 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
 import com.annimon.stream.Stream;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
 import it.integry.integrywmsnative.core.exception.NoOrdersScheduledException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 
 public class ProdFabbisognoLineeProdViewModel {
 
     private final ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer;
 
+    private final MesRESTConsumer mMesRESTConsumer;
+
     private Listener mListener;
 
-    public ProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+    private final MutableLiveData<List<ProdFabbisognoLineeItemModelDto>> ordiniList = new MutableLiveData<>();
+
+    public ProdFabbisognoLineeProdViewModel(
+            ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer,
+            MesRESTConsumer mesRESTConsumer) {
         this.mProdFabbisognoLineeProdRESTConsumer = prodFabbisognoLineeProdRESTConsumer;
+        this.mMesRESTConsumer = mesRESTConsumer;
     }
 
     public void init() {
-
+        loadData();
     }
 
-
-    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
+    public void loadData() {
         this.sendOnLoadingStarted();
 
-        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(startDate, endDate, codMdep, jtbFasi -> {
-            if (jtbFasi != null){
-                Stream.of(jtbFasi)
-                        .forEach(x -> x
-                                .setDataInizio(startDate)
-                                .setDataFine(endDate));
+        this.mMesRESTConsumer.getOrdiniLavorazione("I", ordini -> {
 
+            List<ProdFabbisognoLineeItemModelDto> itemModel = Stream.of(ordini)
+                    .filter(x -> x.getCodMdep().equals(SettingsManager.i().getUserSession().getDepo().getCodMdep()))
+                    .map(ord -> new ProdFabbisognoLineeItemModelDto()
+                            .setOrdineLavorazioneDTO(ord)
+                    )
+                    .sorted(Comparator.comparing(x -> x.getOrdineLavorazioneDTO().getCodJfas()))
+                    .toList();
+
+            ordiniList.postValue(itemModel);
+            this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+    public LiveData<List<ProdFabbisognoLineeItemModelDto>> getOrdiniList() {
+        return ordiniList;
+    }
+
+    public void loadFabbisogno(String ordini, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
+        this.sendOnLoadingStarted();
+
+        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(ordini, codMdep, jtbFasi -> {
+            if (jtbFasi != null) {
                 this.sendOnLoadingEnded();
                 onComplete.run(jtbFasi);
-            }else{
+            } else {
                 this.mListener.onError(new NoOrdersScheduledException());
             }
         }, this::sendError);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/GroupTitleModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/GroupTitleModel.java
new file mode 100644
index 00000000..50bdc39f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/GroupTitleModel.java
@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
+
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+
+public class GroupTitleModel {
+
+    public BindableBoolean selected = new BindableBoolean();
+    public String title;
+
+    public BindableBoolean getSelected() {
+        return selected;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public GroupTitleModel setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeItemModelDto.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeItemModelDto.java
new file mode 100644
index 00000000..cc425eee
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeItemModelDto.java
@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
+
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+
+public class ProdFabbisognoLineeItemModelDto {
+
+    public BindableBoolean selected = new BindableBoolean();
+    public OrdineLavorazioneDTO ordineLavorazioneDTO;
+
+    public BindableBoolean getSelected() {
+        return selected;
+    }
+
+    public OrdineLavorazioneDTO getOrdineLavorazioneDTO() {
+        return ordineLavorazioneDTO;
+    }
+
+    public ProdFabbisognoLineeItemModelDto setOrdineLavorazioneDTO(OrdineLavorazioneDTO ordineLavorazioneDTO) {
+        this.ordineLavorazioneDTO = ordineLavorazioneDTO;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
new file mode 100644
index 00000000..78c93831
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
@@ -0,0 +1,74 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.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.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
+
+public class ProdFabbisognoLineeProdFilterViewModel {
+    private final ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> currentNumOrdsPredicate = new ObservableField<>();
+
+    private List<ProdFabbisognoLineeItemModelDto> initialList;
+    private final MutableLiveData<List<ProdFabbisognoLineeItemModelDto>> currentList = new MutableLiveData<>();
+
+    public void init(List<ProdFabbisognoLineeItemModelDto> initialList){
+        this.initialList = initialList;
+        this.currentList.setValue(this.initialList);
+    }
+
+    public MutableLiveData<List<ProdFabbisognoLineeItemModelDto>> getCurrentList() {
+        return this.currentList;
+    }
+
+    public void setNumOrdFilter(List<Integer> numOrds){
+        if (numOrds == null || numOrds.isEmpty()) currentNumOrdsPredicate.set(null);
+        else{
+            currentNumOrdsPredicate.set(x -> numOrds.contains(x.getOrdineLavorazioneDTO().getNumOrd()));
+        }
+    }
+
+    public void applyAllTests(){
+        List<ProdFabbisognoLineeItemModelDto> returnList = null;
+
+        if (currentNumOrdsPredicate.get() == null){
+            returnList = this.initialList;
+        }else {
+            Stream<ProdFabbisognoLineeItemModelDto> tmpStream = Stream.of(this.initialList)
+                    .filter(x -> (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))));
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> getCurrentNumOrdsPredicate() {
+        return currentNumOrdsPredicate;
+    }
+
+    public List<Integer> getAllNumOrds(){
+        return Stream
+                .of(Objects.requireNonNull(initialList))
+                .filter(x -> x.getOrdineLavorazioneDTO().getNumOrd() != null)
+                .sortBy(x -> -x.getOrdineLavorazioneDTO().getNumOrd())
+                .map(x -> x.getOrdineLavorazioneDTO().getNumOrd() != null ? x.getOrdineLavorazioneDTO().getNumOrd() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<Integer> getAvailableNumOrds(){
+        if (currentNumOrdsPredicate.get() == null) return getAllNumOrds();
+        else {
+            return Stream.of(this.initialList)
+                    .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
+                    .distinct()
+                    .toList();
+        }
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
index 5c5cbdeb..d75d5188 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
@@ -32,9 +32,9 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void loadFabbisogno(String numOrd, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         ProdFabbisognoLineeProdRESTConsumerService prodFabbisognoLineeProdRESTConsumerService = RESTBuilder.getService(ProdFabbisognoLineeProdRESTConsumerService.class);
-        prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(UtilityDate.formatDate(startDate, "yyyy-MM-dd"), UtilityDate.formatDate(endDate, "yyyy-MM-dd"), codMdep)
+        prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(numOrd, codMdep)
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call,
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
index 90006097..49645361 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
@@ -13,7 +13,5 @@ import retrofit2.http.Query;
 public interface ProdFabbisognoLineeProdRESTConsumerService
 {
     @GET("wms/approvvigionamento/retrieveFabbisogno")
-    Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> loadFabbisogno(@Query("startDate") String startDate,
-                                                                               @Query("endDate") String endDate,
-                                                                               @Query("codMdep") String codMdep);
+    Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> loadFabbisogno(@Query("numOrd") String numOrd, @Query("codMdep") String codMdep);
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
index 8e720d90..f95f038e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
@@ -94,6 +94,8 @@ public class OrdineLavorazioneDTO {
 
     private String dataConsCommessa;
 
+    private String descrizioneAttivita;
+
     private BigDecimal prodStd;
 
     private Object mtbColtToEdit;
@@ -523,4 +525,12 @@ public class OrdineLavorazioneDTO {
         return progress;
     }
 
+    public String getDescrizioneAttivita() {
+        return descrizioneAttivita;
+    }
+
+    public OrdineLavorazioneDTO setDescrizioneAttivita(String descrizioneAttivita) {
+        this.descrizioneAttivita = descrizioneAttivita;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/FilterNumeroOrdineLayoutView.java b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterNumeroOrdineLayoutView.java
similarity index 98%
rename from app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/FilterNumeroOrdineLayoutView.java
rename to app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterNumeroOrdineLayoutView.java
index aaf6c17e..9714eac8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/FilterNumeroOrdineLayoutView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterNumeroOrdineLayoutView.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters;
+package it.integry.integrywmsnative.ui.filter_chips.filters;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/app/src/main/res/layout/accettazione_main_list_group_model.xml b/app/src/main/res/layout/accettazione_main_list_group_model.xml
index bbd81e4c..71c42cc4 100644
--- a/app/src/main/res/layout/accettazione_main_list_group_model.xml
+++ b/app/src/main/res/layout/accettazione_main_list_group_model.xml
@@ -21,6 +21,8 @@
             android:id="@+id/accettazione_main_list_group_item_container_checkBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:clickable="false"
+            android:enabled="false"
             tools:layout_editor_absoluteX="0dp"
             tools:layout_editor_absoluteY="1dp"
             app:checked="@{selected}" />
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_model.xml
index 2ee259a8..bf46c73f 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_model.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_model.xml
@@ -15,6 +15,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:checked="true"
+                    android:focusable="false"
+                    android:clickable="false"
                     android:enabled="false"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
new file mode 100644
index 00000000..86d5806c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+
+        <import type="android.view.View" />
+        <import type="android.text.Html" />
+        <import type="java.time.LocalDateTime" />
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="it.integry.integrywmsnative.core.di.BindableBoolean" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <variable
+            name="item"
+            type="it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto" />
+
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="2dp"
+        android:paddingEnd="4dp"
+        android:paddingVertical="2dp"
+        android:orientation="horizontal">
+
+        <View
+            android:id="@+id/empty_view"
+            android:layout_width="8dp"
+            android:layout_height="match_parent" />
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:paddingStart="2dp"
+            android:paddingEnd="8dp"
+            android:background="@color/full_white">
+
+            <CheckBox
+                android:id="@+id/checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:focusable="false"
+                android:clickable="false"
+                app:checked="@{item.selected}"/>
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true">
+
+<!--                <androidx.appcompat.widget.AppCompatTextView-->
+<!--                    android:id="@+id/right_descrizione"-->
+<!--                    android:background="@drawable/badge_round_corner"-->
+<!--                    android:backgroundTint="@color/colorPrimary"-->
+<!--                    android:textColor="@android:color/white"-->
+<!--                    android:textStyle="bold"-->
+<!--                    android:paddingLeft="8dp"-->
+<!--                    android:paddingTop="2dp"-->
+<!--                    android:paddingRight="8dp"-->
+<!--                    android:paddingBottom="2dp"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:text="@{item.getDescrizioneAttivita()}"-->
+<!--                    tools:text="PRODUZIONE PASTA SECCA"-->
+<!--                    android:layout_alignParentEnd="true"-->
+<!--                    style="@style/AppTheme.NewMaterial.Text.Small" />-->
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{Html.fromHtml(context.getString(R.string.doc_testata, item.getOrdineLavorazioneDTO().numOrd, UtilityDate.formatDate(item.getOrdineLavorazioneDTO().dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
+                    tools:text="n. 39 del 27 ott 2017"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="#000"
+                    android:layout_marginTop="4dp"
+                    android:layout_alignParentStart="true"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_toStartOf="@id/descrizione"/>
+
+<!--                <androidx.appcompat.widget.AppCompatTextView-->
+<!--                    android:id="@+id/right_sub_descrizione"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="4dp"-->
+<!--                    android:background="@drawable/badge_round_corner"-->
+<!--                    android:backgroundTint="@color/red_400"-->
+<!--                    android:layout_marginStart="8dp"-->
+<!--                    android:paddingLeft="8dp"-->
+<!--                    android:paddingTop="2dp"-->
+<!--                    android:paddingRight="8dp"-->
+<!--                    android:paddingBottom="2dp"-->
+<!--                    android:textColor="@android:color/white"-->
+<!--                    android:textStyle="bold"-->
+<!--                    android:text="@{item.getCodJfas()}"-->
+<!--                    tools:text="SL01"-->
+<!--                    android:layout_alignParentEnd="true"-->
+<!--                    android:layout_below="@id/descrizione"-->
+<!--                    style="@style/AppTheme.NewMaterial.Text.Small" />-->
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/sub_descrizione"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:text="@{item.getOrdineLavorazioneDTO().descrizioneProd}"
+                    tools:text="BUCATINI P13,5EPA T.60623/24"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_below="@+id/descrizione"
+                    android:layout_toStartOf="@id/right_sub_descrizione"/>
+
+            </RelativeLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
index b92e48c6..f15744da 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
@@ -1,8 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools">
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment" />
+
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         tools:context=".gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment">
-    </FrameLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.3"
+            android:visibility="gone">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.2" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="72dp"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_playlist_add_check_24dp" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/no_inventory_available_text" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <HorizontalScrollView
+                android:id="@+id/filter_chips"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/gray_050"
+                android:scrollbars="none">
+
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/filter_chips_group"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    app:chipSpacing="8dp"
+                    app:singleSelection="true" />
+            </HorizontalScrollView>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/inventario_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fadeScrollbars="true"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="?attr/floatingActionButtonPrimaryStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:contentDescription="Dispatch orders"
+            android:onClick="@{() -> view.dispatchOrders()}"
+            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:visibility="@{view.fabVisible}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_title_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_title_item.xml
new file mode 100644
index 00000000..ca00e08e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_title_item.xml
@@ -0,0 +1,39 @@
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="item"
+            type="it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel" />
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/mainOrange"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingStart="12dp"
+        xmlns:tools="http://schemas.android.com/tools">
+
+                <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:clickable="false"
+                    app:checked="@{item.selected}"
+                    android:enabled="false"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/group_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@android:color/white"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    style="@style/TextAppearance.Material3.TitleMedium"
+                    android:text="@{item.title}"
+                    tools:text="NOME GRUPPO"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</layout>
diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_model.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_model.xml
index c5bb17ba..d6fe0313 100644
--- a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_model.xml
+++ b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_model.xml
@@ -1,67 +1,49 @@
 <layout>
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+
+    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        xmlns:tools="http://schemas.android.com/tools">
+        android:orientation="vertical">
 
-
-        <!--<androidx.cardview.widget.CardView-->
-        <!--xmlns:card_view="http://schemas.android.com/apk/res-auto"-->
-        <!--android:id="@+id/card_view"-->
-        <!--android:layout_gravity="center"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--card_view:cardUseCompatPadding="true"-->
-        <!--card_view:cardCornerRadius="4dp"-->
-        <!--card_view:cardElevation="4dp">-->
-
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/mainGreen"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="12dp">
+
+            <CheckBox
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:clickable="false"
+                android:enabled="false"
+                android:focusable="false" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/ordine_produzione_main_list_group_header"
+                style="@style/TextAppearance.Material3.TitleMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="@android:color/white"
+                tools:text="NOME GRUPPO" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/ordine_produzione_main_list_group_item_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/mainGreen"
-                android:paddingStart="12dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp">
 
-                <CheckBox
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="true"
-                    android:enabled="false" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/ordine_produzione_main_list_group_header"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@android:color/white"
-                    android:textStyle="bold"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
-                    tools:text="NOME GRUPPO"/>
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/ordine_produzione_main_list_group_item_container">
-
-
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <!--</androidx.cardview.widget.CardView>-->
-
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 </layout>
diff --git a/app/src/main/res/layout/layout_filter_numero_ordine.xml b/app/src/main/res/layout/layout_filter_numero_ordine.xml
index 488331d0..68b4d1df 100644
--- a/app/src/main/res/layout/layout_filter_numero_ordine.xml
+++ b/app/src/main/res/layout/layout_filter_numero_ordine.xml
@@ -11,7 +11,7 @@
 
         <variable
             name="view"
-            type="it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView" />
+            type="it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView" />
     </data>
 
 
diff --git a/app/src/main/res/layout/layout_filter_numero_ordine__list_item.xml b/app/src/main/res/layout/layout_filter_numero_ordine__list_item.xml
index 849972b1..bdbbdca3 100644
--- a/app/src/main/res/layout/layout_filter_numero_ordine__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_numero_ordine__list_item.xml
@@ -12,7 +12,7 @@
 
         <variable
             name="item"
-            type="it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterNumeroOrdineLayoutView.ListModel" />
+            type="it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView.ListModel" />
     </data>
 
     <androidx.appcompat.widget.LinearLayoutCompat