Finish v1.28.0(294)

permettere il versamento di un articolo non compatibile con gli ordini aperti dopo richiesta conferma

precompilare input risorse da allocare

in input qta mantenere fissa la qtaCnf in entrambe le direzioni di calcolo

togliere popup di notifica versamento completato

.idea/deploymentTargetDropDown.xml

@@ -7,7 +7,16 @@
         <deviceKey>
           <Key>
             <type value="SERIAL_NUMBER" />
-            <value value="20119B1E55" />
+            <value value="adb-R52T60AZ93A-MF0VBc._adb-tls-connect._tcp" />
+          </Key>
+        </deviceKey>
+      </Target>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="21088B8EFD" />
           </Key>
         </deviceKey>
       </Target>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 284
-    def appVersionName = '1.26.1'
+    def appVersionCode = 294
+    def appVersionName = '1.28.0'
 
     signingConfigs {
         release {

app/src/main/AndroidManifest.xml

@@ -27,11 +27,18 @@
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
-        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
+        <activity
+            android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
-        <activity android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
+        <activity
+            android:name=".gest.prod_dettaglio_linea.ProdDettaglioLineaActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing" />
+        <activity
+            android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />

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

@@ -41,10 +41,14 @@ import it.integry.integrywmsnative.gest.picking_resi.PickingResiComponent;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiModule;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoComponent;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoModule;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaComponent;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneComponent;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneModule;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeComponent;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
@@ -61,6 +65,8 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComp
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListModule;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteComponent;
@@ -128,7 +134,10 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DocInterniEditFormModule.class,
         DialogSelectDocRowsModule.class,
         DialogAskClienteModule.class,
-        DialogEditArticoloModule.class
+        DialogEditArticoloModule.class,
+        DialogPrintOrderSSCCListModule.class,
+        ProdLineeProduzioneModule.class,
+        ProdDettaglioLineaModule.class
 })
 public interface MainApplicationComponent {
 
@@ -216,6 +225,12 @@ public interface MainApplicationComponent {
 
     DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
 
+    DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent();
+
+    ProdLineeProduzioneComponent.Factory prodLineeProduzioneComponent();
+
+    ProdDettaglioLineaComponent.Factory prodDettaglioLineaComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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

@@ -25,6 +25,7 @@ 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.ProductionLinesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
@@ -200,4 +201,10 @@ public class MainApplicationModule {
         return new InventarioService(giacenzaRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer() {
+        return new ProductionLinesRESTConsumer();
+    }
+
 }

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

@@ -8,6 +8,7 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoF
 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_linee_produzione.ProdLineeProduzioneFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
@@ -45,137 +46,145 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_black_latest_delivery)
                                         .setFragmentFactory(UltimiArriviFornitoreFragment::newInstance))
                 ).addGroup(
-                new MenuGroup()
-                        .setGroupText(R.string.checkout)
-                        .setGroupId(R.id.nav_group_spedizione)
-                        .setCodMenu("MM010")
+                        new MenuGroup()
+                                .setGroupText(R.string.checkout)
+                                .setGroupId(R.id.nav_group_spedizione)
+                                .setCodMenu("MM010")
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_spedizione)
+                                        .setCodMenu("MG046")
+                                        .setTitleText(R.string.vendita_title_fragment)
+                                        .setTitleIcon(R.drawable.ic_dashboard_spedizione)
+                                        .setDrawerIcon(R.drawable.ic_black_upload)
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_free_picking)
+                                        .setCodMenu("MG047")
+                                        .setTitleText(R.string.free_picking)
+                                        .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
+                                        .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
+                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA)))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_resi_cliente)
+                                        .setCodMenu("MG048")
+                                        .setTitleText(R.string.fragment_ultime_consegne_cliente_title)
+                                        .setTitleIcon(R.drawable.ic_latest_delivery_customer)
+                                        .setDrawerIcon(R.drawable.ic_black_latest_delivery)
+                                        .setFragmentFactory(UltimeConsegneClienteFragment::newInstance))
+                ).addGroup(new MenuGroup()
+                        .setGroupText(R.string.manufacture)
+                        .setGroupId(R.id.nav_group_produzione)
+                        .setCodMenu("MM009")
 
                         .addItem(new MenuItem()
-                                .setID(R.id.nav_spedizione)
-                                .setCodMenu("MG046")
-                                .setTitleText(R.string.vendita_title_fragment)
-                                .setTitleIcon(R.drawable.ic_dashboard_spedizione)
-                                .setDrawerIcon(R.drawable.ic_black_upload)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
+                                .setID(R.id.nav_prod_ordine_produzione)
+                                .setCodMenu("MG049")
+                                .setTitleText(R.string.prod_ordine_produzione_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance))
 
                         .addItem(new MenuItem()
-                                .setID(R.id.nav_free_picking)
-                                .setCodMenu("MG047")
-                                .setTitleText(R.string.free_picking)
-                                .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
-                                .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
-                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA)))
+                                .setID(R.id.nav_prod_ordine_lavorazione)
+                                .setCodMenu("MG050")
+                                .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
 
                         .addItem(new MenuItem()
-                                .setID(R.id.nav_resi_cliente)
-                                .setCodMenu("MG048")
-                                .setTitleText(R.string.fragment_ultime_consegne_cliente_title)
-                                .setTitleIcon(R.drawable.ic_latest_delivery_customer)
-                                .setDrawerIcon(R.drawable.ic_black_latest_delivery)
-                                .setFragmentFactory(UltimeConsegneClienteFragment::newInstance))
-        ).addGroup(new MenuGroup()
-                .setGroupText(R.string.manufacture)
-                .setGroupId(R.id.nav_group_produzione)
-                .setCodMenu("MM009")
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_prod_ordine_produzione)
-                        .setCodMenu("MG049")
-                        .setTitleText(R.string.prod_ordine_produzione_title_fragment)
-                        .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
-                        .setDrawerIcon(R.drawable.ic_black_external)
-                        .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance))
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_prod_ordine_lavorazione)
-                        .setCodMenu("MG050")
-                        .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
-                        .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
-                        .setDrawerIcon(R.drawable.ic_black_external)
-                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_free_lav_picking)
-                        .setCodMenu("MG051")
-                        .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking)
-                        .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
-                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
-                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_prod_posizionamento_da_ord)
-                        .setCodMenu("MG052")
-                        .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
-                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
-                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
-                        .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_prod_versamento_materiale)
-                        .setCodMenu("MG053")
-                        .setTitleText(R.string.prod_versamento_materiale_title_fragment)
-                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
-                        .setDrawerIcon(R.drawable.ic_black_external)
-                        .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance))
-
-                .addItem(new MenuItem()
-                        .setID(R.id.nav_prod_recupero_materiale)
-                        .setCodMenu("MG054")
-                        .setTitleText(R.string.prod_recupero_materiale_title_fragment)
-                        .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)
-                        .setGroupId(R.id.nav_group_movimentazione_interna)
-                        .setCodMenu("MM011")
+                                .setID(R.id.nav_free_lav_picking)
+                                .setCodMenu("MG051")
+                                .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
 
                         .addItem(new MenuItem()
-                                .setID(R.id.nav_versamento_merce)
-                                .setCodMenu("MG055")
-                                .setTitleText(R.string.versamento_merce_fragment_title)
-                                .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
-                                .setDrawerIcon(R.drawable.ic_black_load_shelf)
-                                .setFragmentFactory(VersamentoMerceFragment::newInstance))
+                                .setID(R.id.nav_prod_posizionamento_da_ord)
+                                .setCodMenu("MG052")
+                                .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))
 
                         .addItem(new MenuItem()
-                                .setID(R.id.nav_rettifica_giacenze)
-                                .setCodMenu("MG056")
-                                .setTitleText(R.string.rettifica_giacenze_fragment_title)
-                                .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
-                                .setDrawerIcon(R.drawable.ic_black_empty_box)
-                                .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
-
-
-        ).addGroup(
-                new MenuGroup()
-                        .setCodMenu("MM012")
-                        .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita)
-                        .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita)
+                                .setID(R.id.nav_prod_versamento_materiale)
+                                .setCodMenu("MG053")
+                                .setTitleText(R.string.prod_versamento_materiale_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance))
 
                         .addItem(new MenuItem()
-                                .setCodMenu("MG057")
-                                .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto)
-                                .setTitleText(it.integry.integrywmsnative.R.string.generate_orders)
-                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
-                                .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance))
+                                .setID(R.id.nav_prod_recupero_materiale)
+                                .setCodMenu("MG054")
+                                .setTitleText(R.string.prod_recupero_materiale_title_fragment)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance))
+
                         .addItem(new MenuItem()
-                                .setCodMenu("MG058")
-                                .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
-                                .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
-                                .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
-                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
-                                .setFragmentFactory(DocInterniFragment::newInstance))
+                                .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))
+
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_prod_linee)
+                                .setCodMenu("MG061")
+                                .setTitleText(it.integry.integrywmsnative.R.string.nav_prod_linee_title)
+                                .setTitleIcon(R.drawable.ic_production_line)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_production_line)
+                                .setFragmentFactory(ProdLineeProduzioneFragment::newInstance))
+                ).addGroup(
+                        new MenuGroup()
+                                .setGroupText(R.string.internal_handling)
+                                .setGroupId(R.id.nav_group_movimentazione_interna)
+                                .setCodMenu("MM011")
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_versamento_merce)
+                                        .setCodMenu("MG055")
+                                        .setTitleText(R.string.versamento_merce_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
+                                        .setDrawerIcon(R.drawable.ic_black_load_shelf)
+                                        .setFragmentFactory(VersamentoMerceFragment::newInstance))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_rettifica_giacenze)
+                                        .setCodMenu("MG056")
+                                        .setTitleText(R.string.rettifica_giacenze_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
+
+
+                ).addGroup(
+                        new MenuGroup()
+                                .setCodMenu("MM012")
+                                .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita)
+
+                                .addItem(new MenuItem()
+                                        .setCodMenu("MG057")
+                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.generate_orders)
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                        .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance))
+                                .addItem(new MenuItem()
+                                        .setCodMenu("MG058")
+                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
+                                        .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setFragmentFactory(DocInterniFragment::newInstance))
 
 //                                .addItem(new MenuItem()
 //                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi)
@@ -183,7 +192,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 //                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
 //                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
 //                                        .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance()))
-        );
+                );
 
     }
 

app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java

@@ -8,7 +8,7 @@ import java.util.UUID;
 
 public class DataCache {
 
-    private static List<DataCacheDTO> dataCacheList = new ArrayList<>();
+    private static final List<DataCacheDTO> dataCacheList = new ArrayList<>();
 
 
     public static String addItem(Object item) {

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

@@ -19,7 +19,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 = 8, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 9, exportSchema = false)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class

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

@@ -6,7 +6,10 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import org.json.JSONObject;
+
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
@@ -202,6 +205,14 @@ public class ArticoloGriglia {
         this.newNoPromo = newNoPromo;
     }
 
+    public String generateSystemNote() {
+        HashMap<String, String> pairs = new HashMap<>();
+        pairs.put("qta_proposta", String.valueOf(qtaProposta));
+        pairs.put("giacenza", String.valueOf(giacenza));
+
+        return new JSONObject(pairs).toString();
+    }
+
     public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
         ArticoloOrdine articolo = new ArticoloOrdine();
 
@@ -222,6 +233,7 @@ public class ArticoloGriglia {
         articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
         articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
         articolo.setNewNoPromo(this.isNewNoPromo());
+        articolo.setSystemNote(generateSystemNote());
 
         articolo.setQtaOrd(0);
 

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

@@ -70,6 +70,9 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "new_no_promo")
     private boolean newNoPromo;
 
+    @ColumnInfo(name = "system_note")
+    private String systemNote;
+
     @Ignore
     private int ggScadenza = 0;
 
@@ -266,4 +269,12 @@ public class ArticoloOrdine {
         this.bgTint = bgTint;
         return this;
     }
+
+    public String getSystemNote() {
+        return systemNote;
+    }
+
+    public void setSystemNote(String systemNote) {
+        this.systemNote = systemNote;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/di/binders/ImageViewBinders.java

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.di.binders;
+
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.databinding.BindingAdapter;
+
+public class ImageViewBinders {
+    @BindingAdapter("tint")
+    public static void bindImageViewTint(final AppCompatImageView view, final int color) {
+        view.setColorFilter(color, android.graphics.PorterDuff.Mode.MULTIPLY);
+    }
+
+}

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

@@ -99,9 +99,17 @@ public abstract class BaseFragment extends Fragment {
         }
     }
 
+    public boolean onBackPressed() {
+        return false;
+    }
+
     protected void popMe() {
-        requireActivity().runOnUiThread(() -> {
-            ((IPoppableActivity) requireActivity()).pop();
-        });
+        if (requireActivity() instanceof IPoppableActivity) {
+            requireActivity().runOnUiThread(() -> {
+                ((IPoppableActivity) requireActivity()).pop();
+            });
+        } else {
+            requireActivity().getSupportFragmentManager().popBackStack();
+        }
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/IOrdersLoadingListener.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.interfaces.viewmodel_listeners;
+
+public interface IOrdersLoadingListener {
+
+    void onOrderLoadingStarted();
+
+    void onOrderLoadingEnded();
+
+}

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

@@ -26,8 +26,6 @@ public class CommonRESTException {
             put(MESSAGE_KEY, "Barcode non letto correttamente");
             put(EXCEPTION_KEY, NoResultFromBarcodeException.class);
         }});
-
-
     }};
 
 

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

@@ -50,7 +50,7 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
 
         mesRESTConsumerService.getOrdiniLavorazione(flagEvaso, codJfas)
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);

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

@@ -56,7 +56,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                                         .groupBy(ArticoloDTO::getCodMart)
                                         .forEach(entry -> {
 
-                                            if(entry.getValue().size() == 1) {
+                                            if (entry.getValue().size() == 1) {
                                                 listaArticoli.add(entry.getValue().get(0));
                                             } else {
                                                 for (ArticoloDTO articolo : entry.getValue()) {
@@ -93,7 +93,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         int i = 0;
         for (ArticoloOrdine art : articoli) {
             i++;
-            artRows.add(convertArtToDTO(art,i));
+            artRows.add(convertArtToDTO(art, i));
         }
 
         ordineDTO.setChiaveGriglia(griglia.getCodAlis());
@@ -109,9 +109,9 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new Callback<List<ServiceRESTResponse<DtbOrdt>>>() {
                     @Override
                     public void onResponse(Call<List<ServiceRESTResponse<DtbOrdt>>> call, Response<List<ServiceRESTResponse<DtbOrdt>>> response) {
-                        if (response.body() != null && response.body().size() > 0){
-                            analyzeListOfAnswers(response, "getArticoliListino", dtoList-> {
-                                if (dtoList.size() > 0){
+                        if (response.body() != null && response.body().size() > 0) {
+                            analyzeListOfAnswers(response, "getArticoliListino", dtoList -> {
+                                if (dtoList.size() > 0) {
                                     DtbOrdt dto = dtoList.get(0);
                                     ordine.setTransmitted(true);
                                     ordine.setTransmissionDate(UtilityDate.getDateInstance());
@@ -120,7 +120,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                                     ordine.setCodMdep(dto.getCodMdep());
                                     ordine.setNumOrd(dto.getNumOrd());
                                     onSuccess.run(ordine);
-                                }else{
+                                } else {
                                     onFailed.run(new Exception("Nessun ordine generato"));
                                 }
                             }, onFailed);
@@ -128,7 +128,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<List<ServiceRESTResponse<DtbOrdt>>>call, Throwable t) {
+                    public void onFailure(Call<List<ServiceRESTResponse<DtbOrdt>>> call, Throwable t) {
                         Log.e("saveOrdineTerminale_pv", t.toString());
                         UtilityLogger.errorMe(new Exception(t));
                         onFailed.run(new Exception(t));
@@ -136,7 +136,6 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                 });
 
 
-
     }
 
     private ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
@@ -147,6 +146,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         dto.setDescrizione(art.getDescrizione());
         dto.setDataInsD(art.getDataIns());
         dto.setUntMis(art.getUntMis());
+        dto.setSystemNote(art.getSystemNote());
         dto.setQta(BigDecimal.valueOf(art.getQtaOrd()));
         dto.setQtaCnf(BigDecimal.valueOf(art.getQtaCnf()));
         dto.setColli(BigDecimal.ZERO);

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

@@ -20,6 +20,7 @@ import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -155,5 +156,26 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         printReportType(reportType, codMdep, null, params, onComplete, onFailed);
     }
 
+    public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240);
+        Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                analyzeAnswer(response, "printCollo", data -> {
+                    onComplete.run();
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                if (t.getMessage().contains("Printer not found")) {
+                    onFailed.run(new NoPrintersFoundException());
+                } else onFailed.run(new Exception(t));
+            }
+        });
+    }
+
 
 }

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

@@ -6,6 +6,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.JasperDTO;
 import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
@@ -37,4 +38,10 @@ public interface PrinterRESTConsumerService {
             @Body MtbColt mtbColtToPrint
     );
 
+    @POST("wms/printClosedOrders")
+    Call<ServiceRESTResponse<Object>> printClosedOrders(
+            @Query("codMdep") String codMdep,
+            @Body PrintOrderCloseDTO printOrderCloseDTO
+    );
+
 }

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

@@ -0,0 +1,112 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import com.annimon.stream.Stream;
+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.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
+
+    public void avviaLineaDiProduzione(String codJfas, Integer hrNum, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        Call<ServiceRESTResponse<JsonObject>> callable = restService.avviaLineaDiProduzione(codJfas, hrNum);
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
+                analyzeAnswer(response, "avviaLineaDiProduzione", data -> {
+                    onComplete.run();
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+    public void arrestaLineaDiProduzione(String codJfas, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        Call<ServiceRESTResponse<JsonObject>> callable = restService.arrestaLineaDiProduzione(codJfas);
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
+                analyzeAnswer(response, "arrestaLineaDiProduzione", data -> {
+                    onComplete.run();
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+    public void avviaProduzioneArticoloSuLinea(String codJfas, String codMart, String partitaMag, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class, 300);
+        Call<ServiceRESTResponse<JsonObject>> callable = restService.avviaProduzioneArticoloSuLinea(codJfas, codMart, partitaMag);
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
+                analyzeAnswer(response, "avviaProduzioneArticoloSuLinea", data -> {
+                    onComplete.run();
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+    public void getStatoLinee(String codMdep, RunnableArgs<List<ProdLineStatusDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> callable = restService.getStatoLinee(codMdep);
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Response<ServiceRESTResponse<List<ProdLineStatusDTO>>> response) {
+                analyzeAnswer(response, "getStatoLinee", onComplete::run, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+    public void getLineDetails(ProdLineStatusDTO lineaProd, RunnableArgs<ProdLineStatusDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> callable = restService.getStatoLinee(lineaProd.getCodMdepLav());
+        callable.enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Response<ServiceRESTResponse<List<ProdLineStatusDTO>>> response) {
+                analyzeAnswer(response, "getLineDetails", (lines) -> {
+                    ProdLineStatusDTO newLine = Stream.of(lines).filter(dto -> dto.getCodJfas().equalsIgnoreCase(lineaProd.getCodJfas())).findFirstOrElse(null);
+                    onComplete.run(newLine);
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+  
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import com.google.gson.JsonObject;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+public interface ProductionLinesRESTConsumerService {
+
+    @POST("mes_v2/avviaLineaDiProduzione")
+    Call<ServiceRESTResponse<JsonObject>> avviaLineaDiProduzione(@Query("codJfas") String codJfas, @Query("hrNum") Integer hrNum);
+
+    @POST("mes_v2/arrestaLineaDiProduzione")
+    Call<ServiceRESTResponse<JsonObject>> arrestaLineaDiProduzione(@Query("codJfas") String codJfas);
+
+    @POST("mes_v2/avviaProduzioneArticoloSuLinea")
+    Call<ServiceRESTResponse<JsonObject>> avviaProduzioneArticoloSuLinea(@Query("codJfas") String codJfas, @Query("codMart") String codMart, @Query("partitaMag") String partitaMag);
+
+    @GET("mes_v2/statoLineeProd")
+    Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> getStatoLinee(@Query("codMdep") String codMdep);
+}

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

@@ -26,6 +26,7 @@ public class SitArtOrdDTO {
     private String descrizioneMsgr;
     private String codMsfa;
     private String descrizioneMsfa;
+    private String untord;
 
     private final HashMap<String, Object> extraInfo = new HashMap<>();
 
@@ -212,4 +213,13 @@ public class SitArtOrdDTO {
     public HashMap<String, Object> getExtraInfo() {
         return extraInfo;
     }
+
+    public String getUntord() {
+        return untord;
+    }
+
+    public SitArtOrdDTO setUntord(String untord) {
+        this.untord = untord;
+        return this;
+    }
 }

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

@@ -45,6 +45,7 @@ public class DBSettingsModel {
     private boolean flagPrintPackingListOnOrderClose;
     private boolean flagPrintEtichetteOnOrderClose;
     private int onNumCnfInputChanged = 1;
+    private int onQtaTotInputChanged = 1;
     private boolean flagAccettazioneUseQtaOrd = false;
     private boolean flagPickLiberoAllowEmptyDest = false;
 
@@ -309,6 +310,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public int getOnQtaTotInputChanged() {
+        return onQtaTotInputChanged;
+    }
+
+    public DBSettingsModel setOnQtaTotInputChanged(int onQtaTotInputChanged) {
+        this.onQtaTotInputChanged = onQtaTotInputChanged;
+        return this;
+    }
+
     public List<String> getNotePerditaDocInterni() {
         return notePerditaDocInterni;
     }

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

@@ -270,14 +270,6 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_CAN_SELECT_MULTIPLE_ORDERS"));
-        stbGestSetupList.add(new StbGestSetup()
-                .setGestName("PICKING")
-                .setSection("SPEDIZIONE")
-                .setKeySection("FLAG_PRINT_PACKING_LIST_ON_CLOSE"));
-        stbGestSetupList.add(new StbGestSetup()
-                .setGestName("PICKING")
-                .setSection("SPEDIZIONE")
-                .setKeySection("FLAG_PRINT_ETICHETTE_ON_CLOSE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -286,6 +278,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SETUP")
                 .setKeySection("ON_NUM_CNF_INPUT_CHANGED"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ON_QTA_TOT_INPUT_CHANGED"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PVM")
                 .setSection("DOC_INTERNI")
@@ -331,8 +327,6 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
-//            dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", Boolean.class));
-//            dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
             dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
             dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
@@ -349,11 +343,16 @@ public class SettingsManager {
             if (onNumCnfInputChanged != null) {
                 dbSettingsModelIstance.setOnNumCnfInputChanged(onNumCnfInputChanged);
             }
+
+            Integer onQtaTotInputChanged = getValueFromList(list, "SETUP", "ON_QTA_TOT_INPUT_CHANGED", Integer.class);
+            if (onQtaTotInputChanged != null) {
+                dbSettingsModelIstance.setOnQtaTotInputChanged(onQtaTotInputChanged);
+            }
             String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
             GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", codMdep, (value) -> {
                 dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(value);
-                GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", codMdep, (gestSetupDTO) -> {
-                    dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(value);
+                GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", codMdep, (setupValue) -> {
+                    dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(setupValue);
                     if (onComplete != null) onComplete.run();
                 }, onFailed);
             }, onFailed);

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

@@ -32,6 +32,10 @@ public class UtilityBarcode {
         return barcodeScanDTO != null && (barcodeScanDTO.getType() == BarcodeType.CODE128 || barcodeScanDTO.getType() == BarcodeType.EAN128);
     }
 
+    public static boolean isEan128(BarcodeScanDTO barcodeScanDTO) {
+        return barcodeScanDTO != null && barcodeScanDTO.getType() == BarcodeType.EAN128;
+    }
+
     public static boolean isEtichettaPosizione(BarcodeScanDTO barcodeScanDTO) {
         return isEtichettaPosizione(barcodeScanDTO, true);
     }

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

@@ -439,6 +439,7 @@ public class PickingLiberoViewModel {
                             mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
                                 for (int i = 0; i < mtbColrObservableField.size(); i++) {
                                     MtbColr initialMtbColr = mtbColrObservableField.get(i);
+                                    var startIdx = (value.getMtbColr().size() - mtbColrObservableField.size());
 
                                     initialMtbColr
                                             .setDataCollo(value.getDataColloS())
@@ -446,7 +447,7 @@ public class PickingLiberoViewModel {
                                             .setGestione(value.getGestione())
                                             .setSerCollo(value.getSerCollo());
 
-                                    initialMtbColr.setRiga(value.getMtbColr().get(i).getRiga());
+                                    initialMtbColr.setRiga(value.getMtbColr().get(startIdx + i).getRiga());
                                     mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i));
                                 }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java

@@ -0,0 +1,355 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.InputType;
+import android.text.SpannableString;
+import android.widget.Toast;
+
+import androidx.databinding.Observable;
+import androidx.databinding.ObservableField;
+
+import com.google.android.material.chip.Chip;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.data_cache.DataCache;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.core.utility.UtilityToast;
+import it.integry.integrywmsnative.databinding.ActivityProdDettaglioLineaBinding;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs.BottomSheetLineAction;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs.DialogStartProduction;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+
+public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDettaglioLineaViewModel.Listener {
+
+    private static final String DATA_KEY_LINE = "keyLinea";
+    private static final String DATA_KEY_FRAGMENT_LISTENER = "onFragmentClose";
+
+    private ActivityProdDettaglioLineaBinding mBinding;
+    public final ObservableField<String> listaOrd = new ObservableField<>();
+    public final BindableString lineaLabel = new BindableString();
+    public final BindableBoolean isStarted = new BindableBoolean(false);
+    public final BindableBoolean isPaused = new BindableBoolean(false);
+    public final BindableBoolean flagShowProdInfo = new BindableBoolean(false);
+    public final BindableString hrNum = new BindableString();
+    public final BindableString codMart = new BindableString();
+    public final BindableString partitaMag = new BindableString();
+    public final BindableString productDescription = new BindableString();
+    private Runnable onResumeRunnable = null;
+
+    private int barcodeScannerIstanceID = -1;
+
+    @Inject
+    ProdDettaglioLineaViewModel mViewModel;
+
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
+
+    public static Intent newInstance(Context context, ProdLineStatusDTO prodLine) {
+        Intent myIntent = new Intent(context, ProdDettaglioLineaActivity.class);
+        String keyLine = DataCache.addItem(prodLine);
+        myIntent.putExtra(DATA_KEY_LINE, keyLine);
+        return myIntent;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = ActivityProdDettaglioLineaBinding.inflate(getLayoutInflater());
+        setContentView(mBinding.getRoot());
+        setSupportActionBar(mBinding.toolbar);
+        setTitle(R.string.line_details);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        ProdLineStatusDTO lineaProd = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_LINE));
+        if (lineaProd == null) {
+            Toast.makeText(this, "Selezionare una linea di produzione e riprovare", Toast.LENGTH_SHORT).show();
+            close();
+            return;
+        }
+
+        MainApplication.appComponent
+                .prodDettaglioLineaComponent()
+                .create()
+                .inject(this);
+
+
+        mViewModel.setListener(this);
+        mBinding.setViewModel(mViewModel);
+        mBinding.setView(this);
+        this.init();
+        mViewModel.init(lineaProd);
+
+    }
+
+    private void init() {
+        initBarcodeReader();
+        mViewModel.lineaProd.observe(this, lineaProd -> {
+            this.listaOrd.set(lineaProd.getListaOrd());
+            this.lineaLabel.set(lineaProd.getLabel());
+            this.isStarted.set(lineaProd.isStarted());
+            this.isPaused.set(lineaProd.isPaused());
+            this.partitaMag.set(lineaProd.getPartitaMag());
+            this.codMart.set(lineaProd.getCodMart());
+            this.productDescription.set(lineaProd.getDescrizioneProd());
+            this.flagShowProdInfo.set(lineaProd.isStarted() && !UtilityString.isNullOrEmpty(lineaProd.getCodMart()));
+            this.hrNum.set(lineaProd.getQtaAllocate().toString());
+        });
+        listaOrd.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                renderOrdersChips();
+            }
+        });
+        getSupportFragmentManager()
+                .setFragmentResultListener(DATA_KEY_FRAGMENT_LISTENER, this, (requestKey, result) -> {
+                    if (onResumeRunnable != null) {
+                        onResumeRunnable.run();
+                        onResumeRunnable = null;
+                    }
+                });
+    }
+
+    private void renderOrdersChips() {
+        mBinding.ordersList.removeAllViews();
+        String listaOrdString = listaOrd.get();
+        if (!UtilityString.isNullOrEmpty(listaOrdString)) {
+            for (String ord : listaOrdString.split("\\|")) {
+                Chip chip = new Chip(this);
+                chip.setClickable(false);
+                chip.setText(ord);
+                mBinding.ordersList.addView(chip);
+            }
+        }
+    }
+
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    @Override
+    public void onSettingsRequest(ProdLineStatusDTO lineaProd) {
+        BottomSheetLineAction.newInstance(lineaProd, this::requestResources, this::requestOrderChange, this::requestProductionStop, this::requestMaterialRecover, BarcodeManager::enable).show(getSupportFragmentManager(), "BottomSheetLineAction");
+    }
+
+    @Override
+    public void confirmInconsistentDeposit(Runnable onConfirm) {
+        this.runOnUiThread(() -> {
+            DialogSimpleMessageView.makeWarningDialog(
+                    Html.fromHtml("L'articolo che si vuole versare non è compatibile con nessun ordine presente sulla linea!"
+                            + "<br /> <br/>" +
+                            "Vuoi versarlo comunque?"),
+                    null,
+                    onConfirm,
+                    () -> {
+                        onLoadingEnded();
+                        BarcodeManager.enable();
+                    }
+            ).show(getSupportFragmentManager(), "confirmOrderClose");
+        });
+    }
+
+    @Override
+    public void requestQtaVersamento(MtbColr mtbColr,
+                                     RunnableArgs<PickedQuantityDTO> onComplete) {
+        onLoadingStarted();
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(mtbColr.getMtbAart())
+                .setInitialNumCnf(mtbColr.getNumCnf())
+                .setInitialQtaCnf(mtbColr.getQtaCnf())
+                .setInitialQtaTot(mtbColr.getQtaCol())
+                .setTotalQtaAvailable(mtbColr.getQtaCol())
+                .setTotalNumCnfAvailable(mtbColr.getNumCnf())
+                .setQtaCnfAvailable(mtbColr.getQtaCnf())
+                .setPartitaMag(mtbColr.getPartitaMag())
+                .setDataScad(mtbColr.getDataScadPartitaD())
+                .setCanOverflowOrderQuantity(false)
+                .setCanPartitaMagBeChanged(false)
+                .setCanLUBeClosed(false)
+                .setFocusOnStart(false);
+
+        if (!mDialogInputQuantityV2View.isVisible())
+            this.runOnUiThread(() -> {
+                onLoadingEnded();
+                mDialogInputQuantityV2View
+                        .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                        .setOnComplete((resultDTO, shouldCloseLU) -> {
+
+                            PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                                    .setNumCnf(resultDTO.getNumCnf())
+                                    .setQtaCnf(resultDTO.getQtaCnf())
+                                    .setQtaTot(resultDTO.getQtaTot())
+                                    .setPartitaMag(resultDTO.getPartitaMag())
+                                    .setDataScad(resultDTO.getDataScad());
+
+                            onComplete.run(pickedQuantityDTO);
+
+                        })
+                        .setOnAbort(this::onLoadingEnded)
+                        .show(this.getSupportFragmentManager(), "tag");
+            });
+        else this.onLoadingEnded();
+    }
+
+    public void onLineStop() {
+        onBackPressed();
+    }
+
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(this::onError));
+
+        BarcodeManager.enable();
+    }
+
+
+    public void requestResources() {
+        this.onLoadingEnded();
+        BarcodeManager.disable();
+        this.runOnUiThread(() -> {
+
+            DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il numero di risorse da allocare", this.hrNum.get(), "n. risorse", qta -> {
+                this.onLoadingStarted();
+                try {
+                    Integer hrNum = Integer.parseInt(qta);
+                    this.mViewModel.startProductionLine(hrNum);
+                } catch (NumberFormatException ex) {
+                    this.onError(new Exception("Inserire un numero di risorse valido"));
+                }
+            }, BarcodeManager::enable, InputType.TYPE_CLASS_NUMBER).show();
+        });
+    }
+
+    public void requestOrderChange() {
+        this.onLoadingEnded();
+        this.runOnUiThread(() -> {
+            DialogStartProduction.newInstance((dto) -> {
+                this.mViewModel.checkBarcodeAndStartOrdine(dto);
+            }).show(getSupportFragmentManager(), "DialogStartProduction");
+        });
+    }
+
+    public void requestProductionStop() {
+        this.onLoadingEnded();
+        BarcodeManager.disable();
+        ProdLineStatusDTO lineaProd = mViewModel.getLineaProd();
+        if (UtilityString.isNullOrEmpty(lineaProd.getListaOrd())) {
+            mViewModel.stopProduction();
+        } else {
+            this.confirmOrderClose(() -> {
+                mViewModel.stopProduction();
+            });
+        }
+
+
+    }
+
+    public void requestMaterialRecover() {
+        this.onLoadingEnded();
+        BarcodeManager.disable();
+        this.runOnUiThread(() -> {
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .add(R.id.frame_layout_container,
+                            ProdRecuperoMaterialeFragment.newInstance(mViewModel.lineaProd.getValue().getCodJfas(), DATA_KEY_FRAGMENT_LISTENER))
+                    .addToBackStack("ProdRecuperoMaterialeFragment")
+                    .commit();
+
+        });
+
+
+    }
+
+    @Override
+    public void successDialog(String message, Runnable onComplete) {
+        BarcodeManager.disable();
+
+        this.runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(getResources().getString(R.string.success),
+                new SpannableString(message), null, onComplete).show(getSupportFragmentManager(), "successDialog"));
+
+    }
+
+    @Override
+    public void showToast(String message, Runnable onComplete) {
+        this.runOnUiThread(() -> {
+            UtilityToast.showToast(message);
+            onComplete.run();
+        });
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.onLoadingStarted();
+
+        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
+
+    };
+
+
+    @Override
+    public void confirmOrderClose(Runnable onConfirm) {
+        this.onLoadingEnded();
+        this.runOnUiThread(() -> {
+            DialogSimpleMessageView.makeWarningDialog(
+                    Html.fromHtml("Per completare l'operazione è necessario chiudere gli ordini attualmente aperti sulla linea."
+                            + "<br /> <br/>" +
+                            "Continuare?"),
+                    null,
+                    () -> {
+                        DialogSimpleMessageView.makeInfoDialog(
+                                null,
+                                Html.fromHtml("Vuoi recuperare del materiale prima di chiudere gli ordini?"),
+                                null,
+                                () -> {
+                                    onResumeRunnable = onConfirm;
+                                    this.requestMaterialRecover();
+                                },
+                                onConfirm
+                        ).show(getSupportFragmentManager(), "confirmOrderClose");
+                    },
+                    BarcodeManager::enable
+            ).show(getSupportFragmentManager(), "confirmOrderClose");
+        });
+    }
+
+
+    public void close() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onBackPressed() {
+        int count = getSupportFragmentManager().getBackStackEntryCount();
+        if (count > 0) {
+            getSupportFragmentManager().popBackStack();
+        } else {
+            BarcodeManager.removeCallback(barcodeScannerIstanceID);
+            super.onBackPressed();
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaComponent.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdDettaglioLineaComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+
+        ProdDettaglioLineaComponent create();
+    }
+
+    void inject(ProdDettaglioLineaActivity prodDettaglioLineaActivity);
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaModule.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+
+@Module(subcomponents = ProdDettaglioLineaComponent.class)
+public class ProdDettaglioLineaModule {
+
+
+    @Provides
+    ProdDettaglioLineaViewModel providesProdDettaglioLineaViewModel(ProductionLinesRESTConsumer productionLinesRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
+        return new ProdDettaglioLineaViewModel(productionLinesRESTConsumer, barcodeRESTConsumer, colliMagazzinoRESTConsumer, mesRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java

@@ -0,0 +1,236 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea;
+
+import androidx.lifecycle.MutableLiveData;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.exception.NoLUFoundException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+
+public class ProdDettaglioLineaViewModel {
+
+    private Listener mListener;
+
+    private final ProductionLinesRESTConsumer productionLinesRESTConsumer;
+    private final ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer;
+    private final MesRESTConsumer mesRESTConsumer;
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
+    public final MutableLiveData<ProdLineStatusDTO> lineaProd = new MutableLiveData<>();
+
+
+    @Inject
+    public ProdDettaglioLineaViewModel(ProductionLinesRESTConsumer productionLinesRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer magazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
+        this.productionLinesRESTConsumer = productionLinesRESTConsumer;
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
+        this.colliMagazzinoRESTConsumer = magazzinoRESTConsumer;
+        this.mesRESTConsumer = mesRESTConsumer;
+    }
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
+            this.executeEtichettaAnonima(barcodeScanDTO, onComplete);
+        } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+            this.executeEAN128(barcodeScanDTO, onComplete);
+        } else {
+            onComplete.run();
+        }
+    }
+
+    private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        handleSSCCBarcode(barcodeScanDTO.getStringValue(), onComplete);
+    }
+
+    private void handleSSCCBarcode(String sscc, Runnable onComplete) {
+        this.colliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
+
+            if (mtbColt == null) {
+                this.sendError(new NoLUFoundException());
+            } else {
+                if (mtbColt.getMtbColr().size() <= 0) {
+                    this.sendError(new Exception("E' stata scansionata una UL già vuota"));
+                } else {
+                    this.sendOnLUSelected(mtbColt);
+                }
+            }
+        }, this::sendError);
+    }
+
+    private void sendOnLUSelected(MtbColt mtbColt) {
+        this.sendOnLoadingStarted();
+        this.checkOrdersCompatibility(mtbColt, () -> {
+            MtbColr row = mtbColt.getMtbColr().get(0);
+            mListener.requestQtaVersamento(
+                    row,
+                    dto -> {
+                        sendOnLoadingStarted();
+                        row.setQtaCnf(dto.getQtaCnf());
+                        row.setNumCnf(dto.getNumCnf());
+                        row.setQtaCol(dto.getQtaTot());
+                        row.setPesoLordoKg(null);
+                        row.setPesoNettoKg(null);
+                        ProdLineStatusDTO prodLine = lineaProd.getValue();
+                        MtbDepoPosizione posizione = new MtbDepoPosizione();
+                        posizione.setPosizione(prodLine.getCodJfas());
+                        posizione.setCodMdep(prodLine.getCodMdepLav());
+                        posizione.setFlagLineaProduzione("S");
+                        this.colliMagazzinoRESTConsumer.createColloScaricoDaCarico(mtbColt, posizione,
+                                generatedMtbColt -> {
+                                    this.sendOnLoadingEnded();
+                                    this.mListener.showToast("Versamento completato!", BarcodeManager::enable);
+                                }, this::sendError);
+                    });
+        });
+    }
+
+    private void checkOrdersCompatibility(MtbColt mtbColt, Runnable onComplete) {
+        mesRESTConsumer.getOrdiniLavorazioneMateriale(lineaProd.getValue().getCodJfas(), getIdMaterialeFromCollo(mtbColt), ordini -> {
+            if (ordini != null && ordini.size() > 0) {
+                onComplete.run();
+            } else {
+                this.mListener.confirmInconsistentDeposit(onComplete);
+            }
+        }, this::sendError);
+    }
+
+    private String getIdMaterialeFromCollo(MtbColt mtbColt) {
+        MtbAart articolo = mtbColt.getMtbColr().get(0).getMtbAart();
+        return UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui();
+    }
+
+
+    private void executeEAN128(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
+            if (ean128Model != null && !UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
+                handleSSCCBarcode(ean128Model.Sscc, onComplete);
+            } else {
+                this.sendError(new NoLUFoundException());
+            }
+
+        }, this::sendError);
+    }
+
+    public void settings() {
+        this.mListener.onSettingsRequest(lineaProd.getValue());
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public void startProductionLine(Integer hrNum) {
+        this.sendOnLoadingStarted();
+        ProdLineStatusDTO prodLine = lineaProd.getValue();
+        this.productionLinesRESTConsumer.avviaLineaDiProduzione(prodLine.getCodJfas(),
+                hrNum,
+                () -> this.mListener.successDialog("Operazione completata", this::loadLineDetails),
+                this::sendError);
+    }
+
+
+    private void startProduction(String codMart, String partitaMag) {
+        this.sendOnLoadingStarted();
+        ProdLineStatusDTO prodLine = lineaProd.getValue();
+        this.productionLinesRESTConsumer.avviaProduzioneArticoloSuLinea(prodLine.getCodJfas(), codMart, partitaMag,
+                () -> this.mListener.successDialog("Operazione completata", this::loadLineDetails),
+                this::sendError);
+    }
+
+    public void stopProduction() {
+        this.sendOnLoadingStarted();
+        ProdLineStatusDTO prodLine = lineaProd.getValue();
+        this.productionLinesRESTConsumer.arrestaLineaDiProduzione(prodLine.getCodJfas(),
+                () -> this.mListener.successDialog("Operazione completata", this::onLineStop),
+                this::sendError);
+    }
+
+    private void onLineStop() {
+        this.mListener.onLineStop();
+    }
+
+    public void checkBarcodeAndStartOrdine(BarcodeScanDTO dto) {
+        this.sendOnLoadingStarted();
+        ProdLineStatusDTO prodLine = lineaProd.getValue();
+        mBarcodeRESTConsumer.decodeEan128(dto, (ean128) -> {
+            String codMart = ean128.Content;
+            String partitaMag = ean128.BatchLot;
+            if (!prodLine.isStarted()) {
+                this.sendError(new Exception("Impossibile avviare una produzione su una linea ferma!"));
+            } else if (UtilityString.isNullOrEmpty(prodLine.getListaOrd())) {
+                this.startProduction(codMart, partitaMag);
+            } else {
+                this.mListener.confirmOrderClose(() -> {
+                    this.startProduction(codMart, partitaMag);
+                });
+            }
+        }, this::sendError);
+    }
+
+    public void loadLineDetails() {
+        sendOnLoadingStarted();
+        if (lineaProd.getValue() == null) {
+            this.sendError(new Exception("Nessuna linea selezionata!"));
+            return;
+        }
+        productionLinesRESTConsumer.getLineDetails(lineaProd.getValue(), linea -> {
+            this.lineaProd.postValue(linea);
+            sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+    public void init(ProdLineStatusDTO lineaProd) {
+        this.lineaProd.setValue(lineaProd);
+        this.loadLineDetails();
+    }
+
+    public ProdLineStatusDTO getLineaProd() {
+        return lineaProd.getValue();
+    }
+
+
+    public interface Listener extends ILoadingListener {
+        void onError(Exception ex);
+
+        void successDialog(String message, Runnable onComplete);
+
+        void showToast(String message, Runnable onComplete);
+
+        void requestQtaVersamento(MtbColr mtbColr, RunnableArgs<PickedQuantityDTO> onComplete);
+
+        void onSettingsRequest(ProdLineStatusDTO lineaProd);
+
+        void confirmInconsistentDeposit(Runnable onConfirm);
+
+        void onLineStop();
+
+        void confirmOrderClose(Runnable onConfirm);
+    }
+
+    public ProdDettaglioLineaViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/dialogs/BottomSheetLineAction.java

@@ -0,0 +1,124 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs;
+
+import android.content.DialogInterface;
+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 com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import it.integry.integrywmsnative.databinding.BottomSheetLineActionsBinding;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+
+public class BottomSheetLineAction extends BottomSheetDialogFragment {
+
+    private BottomSheetLineActionsBinding mBinding;
+
+    private ProdLineStatusDTO prodLine;
+    private Runnable onChangeResourcesRequest;
+    private Runnable onChangeOrdersRequest;
+    private Runnable onLineCloseRequest;
+    private Runnable onRecoverRequest;
+    private Runnable onCancelAction;
+
+    public static BottomSheetLineAction newInstance(ProdLineStatusDTO dto, Runnable onChangeResourcesRequest, Runnable onChangeOrdersRequest, Runnable onLineCloseRequest, Runnable onRecoverRequest, Runnable onCancel) {
+        BottomSheetLineAction fragment = new BottomSheetLineAction();
+        fragment
+                .setProdLine(dto)
+                .setOnChangeResourcesRequest(onChangeResourcesRequest)
+                .setOnChangeOrdersRequest(onChangeOrdersRequest)
+                .setOnRecoverRequest(onRecoverRequest)
+                .setOnLineCloseRequest(onLineCloseRequest)
+                .setOnCancelAction(onCancel);
+        return fragment;
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = BottomSheetLineActionsBinding.inflate(inflater, container, false);
+        mBinding.setLifecycleOwner(this);
+        mBinding.setView(this);
+        mBinding.setListModel(this.prodLine);
+
+        return mBinding.getRoot();
+    }
+
+    public BottomSheetLineAction setOnCancelAction(Runnable onCancelAction) {
+        this.onCancelAction = onCancelAction;
+        return this;
+    }
+
+    public BottomSheetLineAction setOnChangeResourcesRequest(Runnable onChangeResourcesRequest) {
+        this.onChangeResourcesRequest = onChangeResourcesRequest;
+        return this;
+    }
+
+
+    public BottomSheetLineAction setOnChangeOrdersRequest(Runnable onChangeOrdersRequest) {
+        this.onChangeOrdersRequest = onChangeOrdersRequest;
+        return this;
+    }
+
+    public BottomSheetLineAction setOnRecoverRequest(Runnable onRecoverRequest) {
+        this.onRecoverRequest = onRecoverRequest;
+        return this;
+    }
+
+
+    public BottomSheetLineAction setOnLineCloseRequest(Runnable onLineCloseRequest) {
+        this.onLineCloseRequest = onLineCloseRequest;
+        return this;
+    }
+
+    public ProdLineStatusDTO getProdLine() {
+        return prodLine;
+    }
+
+    public BottomSheetLineAction setProdLine(ProdLineStatusDTO prodLine) {
+        this.prodLine = prodLine;
+        return this;
+    }
+
+    public void onResourcesClicked() {
+        if (this.onChangeResourcesRequest != null) {
+            this.onChangeResourcesRequest.run();
+        }
+        this.dismiss();
+
+    }
+
+    public void onPlayClicked() {
+        if (this.onChangeOrdersRequest != null) {
+            this.onChangeOrdersRequest.run();
+        }
+        this.dismiss();
+    }
+
+    public void onStopClicked() {
+        if (this.onLineCloseRequest != null) {
+            this.onLineCloseRequest.run();
+        }
+        this.dismiss();
+    }
+
+    public void onRecoverClicked() {
+        if (this.onRecoverRequest != null) {
+            this.onRecoverRequest.run();
+        }
+        this.dismiss();
+    }
+
+    @Override
+    public void onCancel(@NonNull DialogInterface dialog) {
+        if (this.onCancelAction != null) {
+            onCancelAction.run();
+        }
+        super.onCancel(dialog);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/dialogs/DialogRecoverUl.java

@@ -0,0 +1,77 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs;
+
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.databinding.DialogStartProductionBinding;
+
+public class DialogRecoverUl extends BaseDialogFragment {
+    private int barcodeScannerIstanceID = -1;
+    private RunnableArgs<BarcodeScanDTO> onScanSuccessful;
+    private DialogStartProductionBinding mBinding;
+
+    public static DialogRecoverUl newInstance(RunnableArgs<BarcodeScanDTO> onScanSuccessful) {
+
+        Bundle args = new Bundle();
+
+        DialogRecoverUl fragment = new DialogRecoverUl();
+        fragment.setArguments(args);
+        fragment.setOnScanSuccessful(onScanSuccessful);
+        return fragment;
+    }
+
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
+        super.onDismiss(dialog);
+    }
+
+    public DialogRecoverUl setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessful) {
+        this.onScanSuccessful = onScanSuccessful;
+        return this;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = DialogStartProductionBinding.inflate(inflater, container, false);
+        mBinding.setLifecycleOwner(this);
+        this.initBarcodeReader();
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(true);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        return mBinding.getRoot();
+    }
+
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(this::processBarcode)
+                .setOnScanFailed(this::onError));
+        BarcodeManager.enable();
+    }
+
+    private void processBarcode(BarcodeScanDTO barcodeScanDTO) {
+        if (UtilityBarcode.isEan128(barcodeScanDTO)) {
+            this.onScanSuccessful.run(barcodeScanDTO);
+            this.dismiss();
+        } else {
+            this.onError(new Exception("Il barcode scansionato non è valido!"));
+        }
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/dialogs/DialogStartProduction.java

@@ -0,0 +1,105 @@
+package it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs;
+
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.DialogStartProductionBinding;
+
+public class DialogStartProduction extends BaseDialogFragment {
+    private int barcodeScannerIstanceID = -1;
+    private RunnableArgs<BarcodeScanDTO> onScanSuccessful;
+    private DialogStartProductionBinding mBinding;
+    private String title;
+    private String label;
+
+    public static DialogStartProduction newInstance(RunnableArgs<BarcodeScanDTO> onScanSuccessful) {
+
+        Bundle args = new Bundle();
+
+        DialogStartProduction fragment = new DialogStartProduction();
+        fragment.setArguments(args);
+        fragment.setOnScanSuccessful(onScanSuccessful);
+        return fragment;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public DialogStartProduction setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public DialogStartProduction setLabel(String label) {
+        this.label = label;
+        return this;
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
+        super.onDismiss(dialog);
+    }
+
+    public DialogStartProduction setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessful) {
+        this.onScanSuccessful = onScanSuccessful;
+        return this;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = DialogStartProductionBinding.inflate(inflater, container, false);
+        mBinding.setLifecycleOwner(this);
+        this.initBarcodeReader();
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(true);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        if (!UtilityString.isNullOrEmpty(title)) {
+            mBinding.titleText.setText(title);
+        }
+
+        if (!UtilityString.isNullOrEmpty(label)) {
+            mBinding.scanLabel.setText(label);
+        }
+        return mBinding.getRoot();
+    }
+
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(this::processBarcode)
+                .setOnScanFailed(this::onError));
+        BarcodeManager.enable();
+    }
+
+    private void processBarcode(BarcodeScanDTO barcodeScanDTO) {
+        if (UtilityBarcode.isEan128(barcodeScanDTO)) {
+            this.dismiss();
+            this.onScanSuccessful.run(barcodeScanDTO);
+        } else {
+            this.onError(new Exception("Il barcode scansionato non è valido!"));
+        }
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdLineeProduzioneComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ProdLineeProduzioneComponent create();
+    }
+
+    void inject(ProdLineeProduzioneFragment prodLineeProduzioneFragment);
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java

@@ -0,0 +1,151 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.SpannableString;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.databinding.FragmentLineeProdBinding;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaActivity;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ui.LinesListAdapter;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+
+public class ProdLineeProduzioneFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ProdLineeProduzioneViewModel.Listener {
+
+
+    @Inject
+    ProdLineeProduzioneViewModel mViewModel;
+
+    private final ObservableArrayList<ProdLineStatusDTO> mLinesObservableList = new ObservableArrayList<>();
+    private FragmentLineeProdBinding mBinding;
+    private ElevatedToolbar mToolbar;
+    private int barcodeScannerIstanceID = -1;
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.onLoadingStarted();
+
+        this.mViewModel.processBarcodeDTO(data);
+    };
+
+    public static ProdLineeProduzioneFragment newInstance() {
+        return new ProdLineeProduzioneFragment();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBinding = FragmentLineeProdBinding.inflate(inflater, container, false);
+        MainApplication.appComponent
+                .prodLineeProduzioneComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+        mBinding.setLifecycleOwner(this);
+        this.initRecyclerView();
+        this.initBarcodeReader();
+
+        return mBinding.getRoot();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mViewModel.init();
+    }
+
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(this::onError));
+    }
+
+    @Override
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
+    }
+
+    public void refreshLineeProd(List<ProdLineStatusDTO> linesList) {
+        this.mLinesObservableList.clear();
+        if (linesList != null) {
+
+            this.mLinesObservableList.addAll(linesList);
+        }
+    }
+
+    private void initRecyclerView() {
+        this.mViewModel.getProdLinesList().observe(getViewLifecycleOwner(), this::refreshLineeProd);
+        LinesListAdapter prodLinesListAdapter = new LinesListAdapter(this.requireActivity(), this.mLinesObservableList);
+        prodLinesListAdapter.setEmptyView(this.mBinding.linesListEmptyView);
+        this.mBinding.linesMainList.setAdapter(prodLinesListAdapter);
+        this.mBinding.linesMainList.setLayoutManager(new LinearLayoutManager(this.requireActivity()));
+        prodLinesListAdapter.setOnItemClicked(this.mViewModel::onLineSelected);
+        if (mToolbar != null)
+            mToolbar.setRecyclerView(this.mBinding.linesMainList);
+    }
+
+    public void requestResources(ProdLineStatusDTO prodLine) {
+        this.onLoadingEnded();
+        BarcodeManager.disable();
+        requireActivity().runOnUiThread(() -> {
+
+            DialogSimpleInputHelper.makeInputDialog(requireContext(), "Inserisci il numero di risorse da allocare", prodLine.getQtaAllocate().toString(), "n. risorse", qta -> {
+                this.onLoadingStarted();
+                try {
+                    Integer hrNum = Integer.parseInt(qta);
+                    this.mViewModel.startProductionLine(prodLine, hrNum);
+                } catch (NumberFormatException ex) {
+                    this.onError(new Exception("Inserire un numero di risorse valido"));
+                }
+            }, BarcodeManager::enable, InputType.TYPE_CLASS_NUMBER).show();
+        });
+    }
+
+    @Override
+    public void successDialog(String message, Runnable onComplete) {
+        BarcodeManager.disable();
+        requireActivity().runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(getResources().getString(R.string.success),
+                new SpannableString(message), null, onComplete).show(getChildFragmentManager(), "successDialog"));
+
+    }
+
+    @Override
+    public void selectLine(ProdLineStatusDTO dto) {
+        this.onLoadingEnded();
+        BarcodeManager.disable();
+        if (!dto.isStarted()) {
+            this.requestResources(dto);
+        } else {
+            requireActivity().startActivity(ProdDettaglioLineaActivity.newInstance(requireActivity(), dto));
+        }
+    }
+
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.nav_prod_linee_title).toString());
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneModule.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
+
+@Module(subcomponents = ProdRientroMerceComponent.class)
+public class ProdLineeProduzioneModule {
+
+    @Provides
+    ProdLineeProduzioneViewModel providesProdRientroMerceViewModel(ProductionLinesRESTConsumer productionLinesRESTConsumer) {
+        return new ProdLineeProduzioneViewModel(productionLinesRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneViewModel.java

@@ -0,0 +1,100 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione;
+
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+
+public class ProdLineeProduzioneViewModel {
+
+
+    private final ProductionLinesRESTConsumer productionLinesRESTConsumer;
+    private final MutableLiveData<List<ProdLineStatusDTO>> prodLines = new MutableLiveData<>();
+
+    private Listener mListener;
+
+    @Inject
+    public ProdLineeProduzioneViewModel(ProductionLinesRESTConsumer productionLinesRESTConsumer) {
+        this.productionLinesRESTConsumer = productionLinesRESTConsumer;
+    }
+
+    public void init() {
+        reloadLines();
+    }
+
+    private void reloadLines() {
+        sendOnLoadingStarted();
+        BarcodeManager.disable();
+        this.productionLinesRESTConsumer.getStatoLinee(SettingsManager.i().getUserSession().getDepo().getCodMdep(), lineeProdList -> {
+            BarcodeManager.enable();
+            prodLines.postValue(lineeProdList);
+            this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+    public MutableLiveData<List<ProdLineStatusDTO>> getProdLinesList() {
+        return prodLines;
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) {
+        String codJfas = barcodeScanDTO.getStringValue();
+        ProdLineStatusDTO prodLine = prodLines.getValue() != null ? Stream.of(prodLines.getValue()).filter(x -> x.getCodJfas().equalsIgnoreCase(codJfas)).findFirstOrElse(null) : null;
+        if (prodLine != null) {
+            this.onLineSelected(prodLine);
+        } else {
+            this.sendError(new Exception("Linea di produzione " + codJfas + " non trovata"));
+        }
+    }
+
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public void startProductionLine(ProdLineStatusDTO prodLine, Integer hrNum) {
+        this.sendOnLoadingStarted();
+        this.productionLinesRESTConsumer.avviaLineaDiProduzione(prodLine.getCodJfas(),
+                hrNum,
+                () -> this.mListener.successDialog("Operazione completata", this::reloadLines),
+                this::sendError);
+    }
+
+    public void onLineSelected(ProdLineStatusDTO lineSelected) {
+        mListener.selectLine(lineSelected);
+    }
+
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+        void successDialog(String message, Runnable onComplete);
+
+        void selectLine(ProdLineStatusDTO prodLineStatusDTO);
+
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/dto/ProdLineStatusDTO.java

@@ -0,0 +1,162 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione.dto;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+
+public class ProdLineStatusDTO {
+
+    private String codJfas;
+
+    private String descrizione;
+
+    private String codMdepLav;
+
+    private Date datetimeStart;
+
+    private Date datetimeEnd;
+
+    private String codMart;
+
+    private String partitaMag;
+
+    private BigDecimal maxAllocazione;
+
+    private Integer qtaAllocate;
+
+    private String listaOrd;
+
+    private String descrizioneProd;
+
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdLineStatusDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public ProdLineStatusDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getCodMdepLav() {
+        return codMdepLav;
+    }
+
+    public ProdLineStatusDTO setCodMdepLav(String codMdepLav) {
+        this.codMdepLav = codMdepLav;
+        return this;
+    }
+
+    public Date getDatetimeStart() {
+        return datetimeStart;
+    }
+
+    public ProdLineStatusDTO setDatetimeStart(Date datetimeStart) {
+        this.datetimeStart = datetimeStart;
+        return this;
+    }
+
+    public Date getDatetimeEnd() {
+        return datetimeEnd;
+    }
+
+    public ProdLineStatusDTO setDatetimeEnd(Date datetimeEnd) {
+        this.datetimeEnd = datetimeEnd;
+        return this;
+    }
+
+    public BigDecimal getMaxAllocazione() {
+        return maxAllocazione;
+    }
+
+    public ProdLineStatusDTO setMaxAllocazione(BigDecimal maxAllocazione) {
+        this.maxAllocazione = maxAllocazione;
+        return this;
+    }
+
+    public Integer getQtaAllocate() {
+        return qtaAllocate;
+    }
+
+    public ProdLineStatusDTO setQtaAllocate(Integer qtaAllocate) {
+        this.qtaAllocate = qtaAllocate;
+        return this;
+    }
+
+    public String getListaOrd() {
+        return listaOrd;
+    }
+
+    public ProdLineStatusDTO setListaOrd(String listaOrd) {
+        this.listaOrd = listaOrd;
+        return this;
+    }
+
+    public boolean isStarted() {
+        return datetimeStart != null && datetimeEnd == null;
+    }
+
+
+    public boolean isPaused() {
+        if (datetimeEnd == null) {
+            return false;
+        }
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.MILLISECOND, 0);
+        today.set(Calendar.SECOND, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        Calendar lastCloseTime = Calendar.getInstance();
+        lastCloseTime.setTime(datetimeEnd);
+        lastCloseTime.set(Calendar.MILLISECOND, 0);
+        lastCloseTime.set(Calendar.SECOND, 0);
+        lastCloseTime.set(Calendar.MINUTE, 0);
+        lastCloseTime.set(Calendar.HOUR_OF_DAY, 0);
+        return datetimeStart != null && datetimeEnd != null && today.equals(lastCloseTime);
+    }
+
+    public String getLabel() {
+        return codJfas + " - " + descrizione;
+    }
+
+    public String getRisorseLabel() {
+        return qtaAllocate + (maxAllocazione != null && maxAllocazione.compareTo(BigDecimal.ZERO) > 0 ? "/" + maxAllocazione : "");
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ProdLineStatusDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public ProdLineStatusDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+
+    public String getDescrizioneProd() {
+        return descrizioneProd;
+    }
+
+    public ProdLineStatusDTO setDescrizioneProd(String descrizioneProd) {
+        this.descrizioneProd = descrizioneProd;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java

@@ -0,0 +1,62 @@
+package it.integry.integrywmsnative.gest.prod_linee_produzione.ui;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView;
+import it.integry.integrywmsnative.databinding.FragmentLineeProdMainListModelBinding;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
+
+public class LinesListAdapter extends ExtendedRecyclerView<ProdLineStatusDTO, LinesListAdapter.SingleItemViewHolder> {
+    private Context mContext;
+
+    private RunnableArgs<ProdLineStatusDTO> mOnItemClicked;
+
+    public LinesListAdapter(Context context, ObservableArrayList<ProdLineStatusDTO> myDataset) {
+        super(myDataset);
+        this.mContext = context;
+    }
+
+    @NonNull
+    @Override
+    public LinesListAdapter.SingleItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        FragmentLineeProdMainListModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.fragment_linee_prod_main_list_model, parent, false);
+        return new LinesListAdapter.SingleItemViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull LinesListAdapter.SingleItemViewHolder holder, int position) {
+        final ProdLineStatusDTO line = mDataset.get(position);
+
+        holder.binding.setListModel(line);
+        holder.binding.executePendingBindings();
+        holder.binding.getRoot().setOnClickListener(v -> {
+            if (this.mOnItemClicked != null)
+                this.mOnItemClicked.run(line);
+        });
+    }
+
+
+    public void setOnItemClicked(RunnableArgs<ProdLineStatusDTO> onItemClicked) {
+        this.mOnItemClicked = onItemClicked;
+    }
+
+    static class SingleItemViewHolder extends RecyclerView.ViewHolder {
+
+        FragmentLineeProdMainListModelBinding binding;
+
+        SingleItemViewHolder(FragmentLineeProdMainListModelBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
+
+}

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

@@ -59,6 +59,8 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     private FragmentProdRecuperoMaterialeBinding mBinding;
 
     private int barcodeScannerIstanceID = -1;
+    private String codJfas;
+    private String fragmentResultKeyString;
 
     private final ObservableArrayList<HistoryULsListModel> mHistoryULMutableData = new ObservableArrayList<>();
 
@@ -67,10 +69,22 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     }
 
     public static ProdRecuperoMaterialeFragment newInstance() {
+        return newInstance(null, null);
+    }
+
+    public static ProdRecuperoMaterialeFragment newInstance(String codJfas, String keyString) {
         ProdRecuperoMaterialeFragment fragment = new ProdRecuperoMaterialeFragment();
+        if (keyString != null) {
+            fragment.setFragmentResultKeyString(keyString);
+        }
+        fragment.setCodJfas(codJfas);
         return fragment;
     }
 
+    public static ProdRecuperoMaterialeFragment newInstance(String codJfas) {
+        return newInstance(codJfas, null);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -89,6 +103,14 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
         this.initBarcodeReader();
         this.initRecyclerView();
 
+        this.addOnPreDestroy(() -> {
+            if (!UtilityString.isNullOrEmpty(fragmentResultKeyString)) {
+                Bundle result = new Bundle();
+                result.putString(fragmentResultKeyString, "result");
+                getParentFragmentManager().setFragmentResult(fragmentResultKeyString, result);
+            }
+        });
+
         return mBinding.getRoot();
     }
 
@@ -96,8 +118,12 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     @Override
     public void onStart() {
         super.onStart();
-
-        mViewModel.init();
+        this.addOnPreDestroy(() -> {
+            if (barcodeScannerIstanceID > -1) {
+                BarcodeManager.removeCallback(barcodeScannerIstanceID);
+            }
+        });
+        mViewModel.init(codJfas);
     }
 
 
@@ -115,6 +141,24 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
         BarcodeManager.enable();
     }
 
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdRecuperoMaterialeFragment setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getFragmentResultKeyString() {
+        return fragmentResultKeyString;
+    }
+
+    public ProdRecuperoMaterialeFragment setFragmentResultKeyString(String fragmentResultKeyString) {
+        this.fragmentResultKeyString = fragmentResultKeyString;
+        return this;
+    }
+
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         this.onLoadingStarted();
 
@@ -133,7 +177,9 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
 
         mBinding.prodRecuperoMaterialeMainList.setAdapter(adapter);
 
-        mToolbar.setRecyclerView(mBinding.prodRecuperoMaterialeMainList);
+        if (mToolbar != null)
+            mToolbar.setRecyclerView(mBinding.prodRecuperoMaterialeMainList);
+
     }
 
     private void refreshList(List<HistoryVersamentoProdULDTO> filteredList) {
@@ -230,11 +276,11 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
         DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+                        new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 

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

@@ -51,11 +51,11 @@ public class ProdRecuperoMaterialeViewModel {
         this.mPrinterRESTConsumer = printerRESTConsumer;
     }
 
-    public void init() {
+    public void init(String codJfas) {
         this.sendOnLoadingStarted();
         new Thread(() -> {
 
-            mProdRecuperMaterialeRESTConsumer.loadLastULVersate(ulList -> {
+            mProdRecuperMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
                 this.mUlList.setValue(ulList);
 
                 this.sendOnLoadingEnded();
@@ -115,7 +115,10 @@ public class ProdRecuperoMaterialeViewModel {
         qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
 
         if (!UtilityBigDecimal.equalsTo(qtaDaEvadere, BigDecimal.ZERO)) {
-            numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
+
+            if(item.getMtbAart().isFlagQtaCnfFissaBoolean())
+                numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
+            else numCnfDaEvadere = item.getNumCnf();
         }
 
         this.sendOnItemDispatched(item,
@@ -151,27 +154,64 @@ public class ProdRecuperoMaterialeViewModel {
         BigDecimal totalSumOfQtaCol = BigDecimal.ZERO;
         BigDecimal totalSumOfNumCnf = BigDecimal.ZERO;
 
-        for (HistoryVersamentoProdULDTO.OrdineDto ordine : item.getOrdini()) {
+        if (SettingsManager.iDB().isFlagVersamentoDirettoProduzione()) {
+            for (HistoryVersamentoProdULDTO.OrdineDto ordine : item.getOrdini()) {
 
+                BigDecimal qtaColToSave;
+                BigDecimal numCnfToSave;
+
+                if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                    numCnfToSave = UtilityBigDecimal.divideAndRoundToInteger(inputNumCnf.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                    qtaColToSave = numCnfToSave.multiply(inputQtaCnf).setScale(0, BigDecimal.ROUND_FLOOR);
+                } else {
+                    qtaColToSave = UtilityBigDecimal.divideAndRoundToInteger(inputQtaTot.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                    numCnfToSave = UtilityBigDecimal.divide(qtaColToSave, item.getQtaCnf(), RoundingMode.FLOOR);
+                }
+
+
+                totalSumOfQtaCol = totalSumOfQtaCol.add(qtaColToSave);
+                totalSumOfNumCnf = totalSumOfNumCnf.add(numCnfToSave);
+
+                numCnfToSave = numCnfToSave.multiply(BigDecimal.valueOf(-1));
+                qtaColToSave = qtaColToSave.multiply(BigDecimal.valueOf(-1));
+
+
+                final MtbColr mtbColrScarico = new MtbColr()
+                        .setCodMart(item.getCodMart())
+                        .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
+                        .setQtaCol(qtaColToSave)
+                        .setQtaCnf(inputQtaCnf)
+                        .setNumCnf(numCnfToSave)
+                        .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
+                        .setDatetimeRow(UtilityDate.getDateInstance())
+                        .setNumColloRif(item.getNumColloRif())
+                        .setDataColloRif(item.getDataColloRif())
+                        .setGestioneRif(item.getGestioneRif())
+                        .setSerColloRif(item.getSerColloRif())
+                        .setDataOrd(ordine.getData())
+                        .setNumOrd(ordine.getNumero())
+                        .setRigaOrd(ordine.getRigaOrd());
+
+                mtbColrScarico.setOperation(CommonModelConsts.OPERATION.INSERT);
+                mtbColtScarico.getMtbColr().add(mtbColrScarico);
+            }
+        } else {
             BigDecimal qtaColToSave;
             BigDecimal numCnfToSave;
-
             if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                numCnfToSave = UtilityBigDecimal.divideAndRoundToInteger(inputNumCnf.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                numCnfToSave = inputNumCnf;
                 qtaColToSave = numCnfToSave.multiply(inputQtaCnf).setScale(0, BigDecimal.ROUND_FLOOR);
             } else {
-                qtaColToSave = UtilityBigDecimal.divideAndRoundToInteger(inputQtaTot.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
+                qtaColToSave = inputQtaTot;
                 numCnfToSave = UtilityBigDecimal.divide(qtaColToSave, item.getQtaCnf(), RoundingMode.FLOOR);
             }
 
-
-            totalSumOfQtaCol = totalSumOfQtaCol.add(qtaColToSave);
-            totalSumOfNumCnf = totalSumOfNumCnf.add(numCnfToSave);
+            totalSumOfQtaCol = qtaColToSave;
+            totalSumOfNumCnf = numCnfToSave;
 
             numCnfToSave = numCnfToSave.multiply(BigDecimal.valueOf(-1));
             qtaColToSave = qtaColToSave.multiply(BigDecimal.valueOf(-1));
 
-
             final MtbColr mtbColrScarico = new MtbColr()
                     .setCodMart(item.getCodMart())
                     .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
@@ -183,10 +223,7 @@ public class ProdRecuperoMaterialeViewModel {
                     .setNumColloRif(item.getNumColloRif())
                     .setDataColloRif(item.getDataColloRif())
                     .setGestioneRif(item.getGestioneRif())
-                    .setSerColloRif(item.getSerColloRif())
-                    .setDataOrd(ordine.getData())
-                    .setNumOrd(ordine.getNumero())
-                    .setRigaOrd(ordine.getRigaOrd());
+                    .setSerColloRif(item.getSerColloRif());
 
             mtbColrScarico.setOperation(CommonModelConsts.OPERATION.INSERT);
             mtbColtScarico.getMtbColr().add(mtbColrScarico);

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java

@@ -16,6 +16,9 @@ import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 
@@ -32,6 +35,10 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
 
 
     public void loadLastULVersate(RunnableArgs<List<HistoryVersamentoProdULDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        loadLastULVersate(null, onComplete, onFailed);
+    }
+
+    public void loadLastULVersate(String codJfas, RunnableArgs<List<HistoryVersamentoProdULDTO>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String sql = "WITH ul_list AS ( " +
                 "    SELECT jtb_fasi.cod_jfas, " +
@@ -68,7 +75,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "        AND mtb_colr.data_collo = mtb_colt.data_collo " +
                 "        AND mtb_colr.ser_collo = mtb_colt.ser_collo " +
                 "        AND mtb_colr.gestione = mtb_colt.gestione " +
-                "             INNER JOIN dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " +
+                "             " + (SettingsManager.iDB().isFlagVersamentoDirettoProduzione() ? "INNER" : "LEFT OUTER") + " join dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " +
                 "        AND dtb_ord_steps.gestione = mtb_colr.gestione " +
                 "        AND dtb_ord_steps.num_ord = mtb_colr.num_ord " +
                 "        AND dtb_ord_steps.data_iniz is not null " +
@@ -76,6 +83,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "             INNER JOIN mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart " +
                 "             LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
                 "    WHERE jtb_fasi.cod_jfas IS NOT NULL " +
+                (UtilityString.isNullOrEmpty(codJfas) ? "" : " AND jtb_fasi.cod_jfas = " + UtilityDB.valueToString(codJfas)) +
                 "      AND segno = -1 " +
                 "      AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " +
                 "    GROUP BY jtb_fasi.cod_jfas, " +
@@ -177,7 +185,8 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "            ISNULL(max_ul.hr, '') = ISNULL(ul_list.hr, '') AND " +
                 "            max_ul.max_datetime_row = ul_list.datetime_row";
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdULRestDTO>>() {}.getType();
+        Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdULRestDTO>>() {
+        }.getType();
         this.mSystemRESTConsumer.<ArrayList<HistoryVersamentoProdULRestDTO>>processSql(sql, typeOfObjectsList, ulList -> {
 
             if (ulList == null) {

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java

@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableField;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +20,9 @@ import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.MtbColr;
@@ -32,9 +35,18 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
-public class ProdRientroMerceFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ProdRientroMerceViewModel.Listener, BottomSheetFragmentLUContentView.Listener, BottomSheetMtbColrEditView.Listener {
+public class ProdRientroMerceFragment extends BaseFragment implements
+        ITitledFragment,
+        IScrollableFragment,
+        ILifecycleFragment,
+        ProdRientroMerceViewModel.Listener,
+        BottomSheetFragmentLUContentView.Listener,
+        BottomSheetMtbColrEditView.Listener,
+        ProdRientroMerceOrderListFragment.OnRefreshListener {
 
 
+    public final ObservableField<Boolean> isLargeLayout = new ObservableField<>(false);
+
     @Inject
     ProdRientroMerceViewModel mViewModel;
 
@@ -56,20 +68,47 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
 
+        boolean isLargeLayout = getResources().getBoolean(R.bool.large_layout);
+        this.isLargeLayout.set(isLargeLayout);
+
         mProdRientroMerceOrderListFragment = ProdRientroMerceOrderListFragment.newInstance(mToolbar);
         mProdRientroMerceOrderDetailFragment = ProdRientroMerceOrderDetailFragment.newInstance();
 
-        mProdRientroMerceOrderListFragment.setOnItemSelectedRunnable(mProdRientroMerceOrderDetailFragment::setOrder);
+
+
+        mProdRientroMerceOrderListFragment
+                .setOnItemSelectedRunnable(order -> {
+                    if (!isLargeLayout) {
+                        getChildFragmentManager()
+                                .beginTransaction()
+                                .show(mProdRientroMerceOrderDetailFragment)
+                                .addToBackStack(ProdRientroMerceOrderDetailFragment.class.getName())
+                                .commit();
+                    }
+
+                    mProdRientroMerceOrderDetailFragment.setOrder(order);
+                })
+                .setOnRefreshListener(this);
         mProdRientroMerceOrderDetailFragment.setOnMtbColtClicked(item -> {
             mBindings.bottomSheetMtbColrEdit.setMtbColr(item.getMtbColr().get(0));
             mBindings.bottomSheetMtbColrEdit.expand();
         });
 
-        getChildFragmentManager()
-                .beginTransaction()
-                .replace(R.id.order_list_fragment, mProdRientroMerceOrderListFragment)
-                .replace(R.id.order_detail_fragment, mProdRientroMerceOrderDetailFragment)
-                .commit();
+        if (isLargeLayout) {
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .replace(R.id.left_side_fragment_container, mProdRientroMerceOrderListFragment)
+                    .replace(R.id.right_side_fragment_container, mProdRientroMerceOrderDetailFragment)
+                    .commit();
+        } else {
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .add(R.id.full_width_container, mProdRientroMerceOrderListFragment)
+                    .add(R.id.full_width_container, mProdRientroMerceOrderDetailFragment)
+                    .hide(mProdRientroMerceOrderDetailFragment)
+                    .commit();
+        }
+
 
         MainApplication.appComponent
                 .prodRientroMerceComponent()
@@ -82,6 +121,8 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra
                              @Nullable Bundle savedInstanceState) {
         mBindings = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_prod_rientro_merce, container, false);
         mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
 
         mViewModel.setListener(this);
 
@@ -94,13 +135,13 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        if(savedInstanceState == null) {
+        if (savedInstanceState == null) {
             this.mViewModel.getOrdiniLavorazioneAperti().observe(this.getViewLifecycleOwner(), this::ordersUpdated);
-
-            mViewModel.init();
+            mViewModel.refreshOrderList();
         }
     }
 
+
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         mAppBarTitle = titleText;
@@ -139,7 +180,6 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra
     }
 
 
-
     private void initBottomSheet() {
         mBindings.bottomSheetMtbColrEdit.setListener(this);
         mBindings.bottomSheetMtbColrEdit.disableEditButton();
@@ -157,7 +197,33 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra
         DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
                 null,
                 () -> mProdRientroMerceOrderDetailFragment.deleteMtbColr(mtbColr),
-                () -> {}
-        ).show(getActivity().getSupportFragmentManager(), "tag");
+                () -> {
+                }
+        ).show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onOrderLoadingStarted() {
+        BarcodeManager.disable();
+        this.mProdRientroMerceOrderListFragment.onOrderLoadingStarted();
+    }
+
+    @Override
+    public void onOrderLoadingEnded() {
+        BarcodeManager.enable();
+        this.mProdRientroMerceOrderListFragment.onOrderLoadingEnded();
+    }
+
+    @Override
+    public void onRefresh() {
+        this.mViewModel.refreshOrderList();
+    }
+
+    @Override
+    public void onPreDestroy(Runnable onComplete) {
+        if(getChildFragmentManager().getBackStackEntryCount() > 0)
+            getChildFragmentManager().popBackStack();
+
+        else onComplete.run();
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java

@@ -7,6 +7,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.IOrdersLoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadException;
@@ -25,12 +26,12 @@ public class ProdRientroMerceViewModel {
         this.mMesRESTConsumer = mesRESTConsumer;
     }
 
-    public void init() {
-        new Thread(this::sendOnLoadingStarted).start();
+    public void refreshOrderList() {
+        new Thread(this::sendOnOrdersLoadingStarted).start();
 
         this.mMesRESTConsumer.getOrdiniLavorazione("I", null, ordiniLavorazioneList -> {
             this.mOrdiniLavorazioneAperti.postValue(ordiniLavorazioneList);
-            this.sendOnLoadingEnded();
+            this.sendOnOrdersLoadingEnded();
         }, ex -> this.sendError(new OrdersLoadException(ex)));
     }
 
@@ -51,12 +52,20 @@ public class ProdRientroMerceViewModel {
         if (this.mListener != null) mListener.onLoadingEnded();
     }
 
+    private void sendOnOrdersLoadingStarted() {
+        if (this.mListener != null) mListener.onOrderLoadingStarted();
+    }
+
+    private void sendOnOrdersLoadingEnded() {
+        if (this.mListener != null) mListener.onOrderLoadingEnded();
+    }
+
     private void sendError(Exception ex) {
         if (this.mListener != null) mListener.onError(ex);
     }
 
 
-    public interface Listener extends ILoadingListener {
+    public interface Listener extends ILoadingListener, IOrdersLoadingListener {
 
         void onDataSaved();
 

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

@@ -113,11 +113,14 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
         mViewModel.setListener(this);
 
+        if(currentOrder.getValue() != null)
+            refreshOrder();
         this.mViewModel.mtbColtsOfOrder.observe(getViewLifecycleOwner(), this::refreshList);
 
         this.initRecyclerView();
         this.initULScaleBluetoothConnection();
 
+        mBindings.executePendingBindings();
         return mBindings.getRoot();
     }
 
@@ -182,11 +185,15 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     }
 
     public void setOrder(OrdineLavorazioneDTO order) {
-        currentOrder.postValue(order);
-        mBindings.invalidateAll();
-        mAdapter.clearDataset();
+        currentOrder.setValue(order);
 
-        mViewModel.setOrder(order);
+        refreshOrder();
+    }
+
+    private void refreshOrder() {
+        if(mBindings != null) mBindings.invalidateAll();
+        if(mAdapter != null) mAdapter.clearDataset();
+        if(mViewModel != null) mViewModel.setOrder(currentOrder.getValue());
     }
 
     private void refreshList(List<MtbColt> mtbColts) {

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

@@ -70,7 +70,7 @@ public class ProdRientroMerceOrderDetailViewModel {
                             .setCodJcom(currentOrder.getCodJcom())
                             .setCodJfas(pickedQuantityDTO.getJtbFasi() != null ? pickedQuantityDTO.getJtbFasi().getCodJfas() : null)
                             .setCodMart(currentOrder.getCodProd())
-                            .setCodTcol(pickedQuantityDTO.getMtbTCol().getCodTcol())
+                            .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
                             .setDataCollo(new Date())
                             .setDataOrd(currentOrder.getDataOrdD())
                             .setNumOrd(currentOrder.getNumOrd())

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java

@@ -36,12 +36,10 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 public class ProdRientroMerceOrderListFragment extends Fragment {
 
     private final ObservableArrayList<ProdRientroMerceOrderListModel> mOrdiniApertiMutableData = new ObservableArrayList<>();
-
     private FragmentProdRientroMerceOrderListBinding mBindings = null;
-
     private RunnableArgs<OrdineLavorazioneDTO> mOnItemSelectedRunnable;
-
     private ElevatedToolbar mToolbar;
+    private OnRefreshListener onRefreshListener;
 
     public ProdRientroMerceOrderListFragment() {
         // Required empty public constructor
@@ -93,6 +91,10 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
         this.mBindings.mainList.setLayoutManager(new LinearLayoutManager(getActivity()));
 
         this.mToolbar.setRecyclerView(mBindings.mainList);
+
+        this.mBindings.swiperefresh.setOnRefreshListener(() -> {
+            if(onRefreshListener != null) onRefreshListener.onRefresh();
+        });
     }
 
     public void pushOrderList(List<OrdineLavorazioneDTO> orderList) {
@@ -101,6 +103,14 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
 
     }
 
+    public void onOrderLoadingStarted() {
+        this.mBindings.swiperefresh.setRefreshing(true);
+    }
+
+    public void onOrderLoadingEnded() {
+        this.mBindings.swiperefresh.setRefreshing(false);
+    }
+
 
     private List<ProdRientroMerceOrderListModel> convertDataModelToListModel(List<OrdineLavorazioneDTO> dataList) {
 
@@ -164,4 +174,13 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
     public RecyclerView getList() {
         return mBindings.mainList;
     }
+
+    public ProdRientroMerceOrderListFragment setOnRefreshListener(OnRefreshListener onRefreshListener) {
+        this.onRefreshListener = onRefreshListener;
+        return this;
+    }
+
+    public interface OnRefreshListener {
+        void onRefresh();
+    }
 }

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

@@ -163,6 +163,7 @@ public class PVOrdineAcquistoEditViewModel {
                             articolo.setMerceDaRic(artGrid.getMerceDaRic());
                             articolo.setNewNoPromo(artGrid.isNewNoPromo());
                             articolo.setFlagQtaMultipla(artGrid.getFlagQtaMultipla());
+                            articolo.setSystemNote(artGrid.generateSystemNote());
 
                             onSuccess.run(articolo);
                         } else {

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dto/ArtDTO.java

@@ -28,6 +28,8 @@ public class ArtDTO {
 
     private String dataScad;
 
+    private String systemNote;
+
     public Integer getRigaOrd() {
         return rigaOrd;
     }
@@ -63,6 +65,7 @@ public class ArtDTO {
     public String getDataIns() {
         return dataIns;
     }
+
     public Date getDataInsD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataIns());
     }
@@ -70,6 +73,7 @@ public class ArtDTO {
     public void setDataIns(String dataIns) {
         this.dataIns = dataIns;
     }
+
     public void setDataInsD(Date dataIns) {
         setDataIns(UtilityDate.formatDate(dataIns, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
     }
@@ -122,6 +126,7 @@ public class ArtDTO {
     public void setDataScad(String dataScad) {
         this.dataScad = dataScad;
     }
+
     public Date getDataScadD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataScad());
     }
@@ -130,5 +135,12 @@ public class ArtDTO {
         setDataScad(UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
     }
 
+    public String getSystemNote() {
+        return systemNote;
+    }
 
+    public ArtDTO setSystemNote(String systemNote) {
+        this.systemNote = systemNote;
+        return this;
+    }
 }

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

@@ -37,7 +37,6 @@ import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
-import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
@@ -319,18 +318,18 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
         this.currentMtbColtObs.set(null);
         thereIsAnOpenedUL.set(false);
 
-
-        if (getActivity() != null) ((IPoppableActivity) getActivity()).pop();
+        this.mViewModel.requestLU();
+        /*if (getActivity() != null) ((IPoppableActivity) getActivity()).pop();*/
     }
 
     @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)
-        )
+                        null,
+                        () -> onComplete.run(true),
+                        () -> onComplete.run(false)
+                )
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
@@ -448,11 +447,11 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
         DialogSimpleMessageView.makeInfoDialog(
-                getActivity().getResources().getString(R.string.action_print_ul),
-                new SpannableString(getActivity().getResources().getString(R.string.ask_print_message)),
-                null,
-                () -> onComplete.run(true),
-                () -> onComplete.run(false))
+                        getActivity().getResources().getString(R.string.action_print_ul),
+                        new SpannableString(getActivity().getResources().getString(R.string.ask_print_message)),
+                        null,
+                        () -> onComplete.run(true),
+                        () -> onComplete.run(false))
                 .show(getActivity().getSupportFragmentManager(), "tag");
         ;
     }
@@ -460,11 +459,11 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+                        new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(getActivity().getSupportFragmentManager(), "tag");
     }
 
@@ -496,6 +495,6 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     @Override
     public void onPreDestroy(Runnable onComplete) {
         BarcodeManager.removeCallback(barcodeScannerIstanceID);
-        mViewModel.closeLU(false, onComplete);
+        mViewModel.closeLU(false);
     }
 }

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

@@ -85,15 +85,18 @@ public class RettificaGiacenzeViewModel {
 
             this.sendOnLoadingEnded();
 
-            this.sendOnLUOpenRequest((mtbColt, created) -> {
-                this.mCurrentMtbColt = mtbColt;
-                this.mIsCreatedLU = created;
-
-                this.sendLUOpened(mtbColt);
-            });
+            this.requestLU();
         }, this::sendError);
     }
 
+    public void requestLU() {
+        this.sendOnLUOpenRequest((mtbColt, created) -> {
+            this.mCurrentMtbColt = mtbColt;
+            this.mIsCreatedLU = created;
+
+            this.sendLUOpened(mtbColt);
+        });
+    }
 
     public RettificaGiacenzeViewModel setListener(RettificaGiacenzeViewModel.Listener listener) {
         this.mListener = listener;

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

@@ -56,10 +56,12 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.ActivitySpedizioneBinding;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListView;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
 import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListAdapter;
 import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListModel;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
@@ -722,11 +724,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
         DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+                        new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(getSupportFragmentManager(), "tag");
         ;
     }
@@ -747,10 +749,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     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)
-        )
+                        null,
+                        () -> onComplete.run(true),
+                        () -> onComplete.run(false)
+                )
                 .show(getSupportFragmentManager(), "tag");
     }
 
@@ -849,12 +851,58 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         }).show();
     }
 
+    public void askShouldPrintPackingList(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs<PrintOrderCloseDTO> onComplete) {
+        DialogSimpleMessageView.makeInfoDialog(
+                        getResources().getString(R.string.action_close_order),
+                        new SpannableString(getResources().getString(R.string.message_print_packing_list_on_close_order)),
+                        null,
+                        () -> {
+                            printOrderCloseDTO.setFlagPrintPackingList(true);
+                            if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) {
+                                this.askShouldPrintSSCC(printOrderCloseDTO, onComplete);
+                            } else {
+                                onComplete.run(printOrderCloseDTO);
+                            }
+                        },
+                        () -> {
+                            printOrderCloseDTO.setFlagPrintPackingList(false);
+                            if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) {
+                                this.askShouldPrintSSCC(printOrderCloseDTO, onComplete);
+                            } else {
+                                onComplete.run(printOrderCloseDTO);
+                            }
+                        }
+                )
+                .show(getSupportFragmentManager(), "tag");
+    }
+
+    public void askShouldPrintSSCC(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs<PrintOrderCloseDTO> onComplete) {
+        DialogPrintOrderSSCCListView.newInstance(printOrderCloseDTO, onComplete).show(this.getSupportFragmentManager(), "dialogPrintOrderSSCCListView");
+    }
+
     @Override
     public void onBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots, RunnableArgs<MtbPartitaMag> onComplete) {
         DialogChooseBatchLotView.newInstance(availableBatchLots, onComplete)
                 .show(getSupportFragmentManager(), "tag");
     }
 
+    @Override
+    public void onCloseOrderPrintRequest(RunnableArgs<PrintOrderCloseDTO> onComplete) {
+        PrintOrderCloseDTO printOrderCloseDTO = new PrintOrderCloseDTO();
+        if (SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
+            this.askShouldPrintPackingList(printOrderCloseDTO, onComplete);
+        } else if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) {
+            this.askShouldPrintSSCC(printOrderCloseDTO, onComplete);
+        }
+
+    }
+
+    @Override
+    public void onOrderClosed() {
+        this.onLoadingEnded();
+        this.onBackPressed();
+    }
+
     @Override
     public void onRowSaved() {
         FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);

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

@@ -36,6 +36,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUBaseOp
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUPrintListener;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
+import it.integry.integrywmsnative.core.model.DtbOrdt;
 import it.integry.integrywmsnative.core.model.FiltroOrdineDTO;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
@@ -67,6 +68,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUEx
 import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
 
 public class SpedizioneViewModel {
 
@@ -303,6 +305,14 @@ public class SpedizioneViewModel {
         if (this.mListener != null) mListener.onLoadingStarted();
     }
 
+    private void sendOnCloseOrderPrintRequest(RunnableArgs<PrintOrderCloseDTO> onComplete) {
+        if (this.mListener != null) mListener.onCloseOrderPrintRequest(onComplete);
+    }
+
+    private void sendOnOrderClosed() {
+        if (this.mListener != null) mListener.onOrderClosed();
+    }
+
     private void sendOnLoadingEnded() {
         if (this.mListener != null) mListener.onLoadingEnded();
     }
@@ -747,6 +757,9 @@ public class SpedizioneViewModel {
                 this.getPickingList().postValue(pickingList);
             } else {
                 MtbColt refMtbColt = matchedItem.getRefMtbColt();
+                if (matchedItem.getMtbColts() != null && matchedItem.getMtbColts().size() == 1) {
+                    refMtbColt = matchedItem.getMtbColts().get(0);
+                }
                 MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
                 this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null);
             }
@@ -1851,29 +1864,37 @@ public class SpedizioneViewModel {
 
     public void closeOrder() {
         this.sendOnLoadingStarted();
-
-        Runnable printEtichetteOrderRunnable = () -> {
-            if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) {
-                cyclicPrintListEtichette(
-                        this.mTestateOrdini.iterator(),
-                        this::sendOnLoadingEnded,
-                        ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
-            }
-
-        };
-
-        if (SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
-
-            cyclicPrintPackingList(
-                    this.mTestateOrdini.iterator(),
-
-                    printEtichetteOrderRunnable,
-                    ex -> this.sendLUPrintError(ex, printEtichetteOrderRunnable));
-        } else {
-            printEtichetteOrderRunnable.run();
+        if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
+            this.sendOnCloseOrderPrintRequest(this::onCloseOrderPrintRequest);
         }
+    }
+
+    private void onCloseOrderPrintRequest(PrintOrderCloseDTO dto) {
+        if (!dto.isFlagPrintPackingList() && !dto.isFlagPrintSSCC()) {
+            this.sendOnOrderClosed();
+            return;
+        }
+        List<DtbOrdt> closedOrders = Stream.of(this.mTestateOrdini).map(ord -> {
+            DtbOrdt ordV = new DtbOrdt();
+            ordV.setDataOrd(ord.getDataOrdS())
+                    .setNumOrd(ord.getNumOrd())
+                    .setGestione(ord.getGestione())
+                    .setCodAnag(ord.getCodAnagOrd());
+            return ordV;
+        }).toList();
+
+        dto.setPrintList(closedOrders);
+        printClosedOrders(dto, this::sendOnOrderClosed, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
+    }
+
+    private void printClosedOrders(PrintOrderCloseDTO dto, Runnable onSuccess, RunnableArgs<Exception> onAbort) {
 
 
+        this.mPrinterRESTConsumer.printClosedOrders(
+                dto,
+                SettingsManager.i().getUserSession().getDepo().getCodMdep(),
+                onSuccess,
+                onAbort);
     }
 
     private void cyclicPrintPackingList(@NotNull Iterator<OrdineUscitaInevasoDTO> sourceTestateOrdineVenditaIterator, Runnable onComplete, RunnableArgs<Exception> onAbort) {
@@ -1975,6 +1996,10 @@ public class SpedizioneViewModel {
         void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete);
 
         void onBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots, RunnableArgs<MtbPartitaMag> onComplete);
+
+        void onCloseOrderPrintRequest(RunnableArgs<PrintOrderCloseDTO> onComplete);
+
+        void onOrderClosed();
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogPrintOrderSSCCListComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogPrintOrderSSCCListComponent create();
+    }
+
+    void inject(DialogPrintOrderSSCCListView dialogPrintOrderSSCCListView);
+}

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListModule.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogPrintOrderSSCCListComponent.class)
+public class DialogPrintOrderSSCCListModule {
+
+
+    @Provides
+    DialogPrintOrderSSCCListViewModel providesDialogPrintOrderSSCCListViewModel() {
+        return new DialogPrintOrderSSCCListViewModel();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListView.java

@@ -0,0 +1,115 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list;
+
+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.widget.RadioGroup;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.DialogPrintOrderSsccListBinding;
+import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
+
+public class DialogPrintOrderSSCCListView extends BaseDialogFragment {
+
+
+    @Inject
+    DialogPrintOrderSSCCListViewModel mViewModel;
+
+    private Context mContext;
+    private DialogPrintOrderSsccListBinding mBindings;
+    private final PrintOrderCloseDTO printOrderCloseDTO;
+    private final RunnableArgs<PrintOrderCloseDTO> onDialogClose;
+
+
+    public static DialogPrintOrderSSCCListView newInstance(
+            PrintOrderCloseDTO printOrderCloseDTO,
+            RunnableArgs<PrintOrderCloseDTO> onDismiss
+    ) {
+        return new DialogPrintOrderSSCCListView(printOrderCloseDTO, onDismiss);
+    }
+
+    public DialogPrintOrderSSCCListView(@NotNull PrintOrderCloseDTO printOrderCloseDTO, @NotNull RunnableArgs<PrintOrderCloseDTO> onDismiss) {
+        this.printOrderCloseDTO = printOrderCloseDTO;
+        this.onDialogClose = onDismiss;
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mContext = getActivity();
+
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_print_order_sscc_list, container, false);
+
+        MainApplication.appComponent
+                .dialogPrintOrderSSCCListComponent()
+                .create()
+                .inject(this);
+        mBindings.setView(this);
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(true);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        return mBindings.getRoot();
+    }
+
+    public void onCheckChange(RadioGroup radioGroup, int id) {
+        this.printOrderCloseDTO.setFlagSkipPrintedSSCC(id == mBindings.printOnlyNew.getId());
+    }
+
+    public void onPositiveClick() {
+        this.printOrderCloseDTO.setFlagPrintSSCC(true);
+        this.dismiss();
+    }
+
+    public void onNegativeClick() {
+        this.printOrderCloseDTO.setFlagPrintSSCC(false);
+        this.dismiss();
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        this.onDialogClose.run(this.printOrderCloseDTO);
+        super.onDismiss(dialog);
+    }
+
+    @Override
+    public void onCancel(@NonNull DialogInterface dialog) {
+        this.onNegativeClick();
+        super.onCancel(dialog);
+    }
+
+    @Override
+    public void onStart() {
+        if (this.printOrderCloseDTO.isFlagSkipPrintedSSCC()) {
+            mBindings.printOnlyNew.setChecked(true);
+        } else {
+            mBindings.printAll.setChecked(true);
+        }
+        super.onStart();
+    }
+
+
+    @Override
+    public void onError(Exception ex) {
+        UtilityExceptions.defaultException(this.mContext, ex);
+        dismiss();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListViewModel.java

@@ -0,0 +1,6 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list;
+
+public class DialogPrintOrderSSCCListViewModel {
+
+   
+}

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PrintOrderCloseDTO.java

@@ -0,0 +1,48 @@
+package it.integry.integrywmsnative.gest.spedizione.model;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.DtbOrdt;
+
+public class PrintOrderCloseDTO {
+    private boolean flagPrintPackingList = false;
+    private boolean flagPrintSSCC = false;
+    private boolean flagSkipPrintedSSCC = true;
+    private List<DtbOrdt> printList;
+
+    public boolean isFlagPrintPackingList() {
+        return flagPrintPackingList;
+    }
+
+    public PrintOrderCloseDTO setFlagPrintPackingList(boolean flagPrintPackingList) {
+        this.flagPrintPackingList = flagPrintPackingList;
+        return this;
+    }
+
+    public boolean isFlagPrintSSCC() {
+        return flagPrintSSCC;
+    }
+
+    public PrintOrderCloseDTO setFlagPrintSSCC(boolean flagPrintSSCC) {
+        this.flagPrintSSCC = flagPrintSSCC;
+        return this;
+    }
+
+    public boolean isFlagSkipPrintedSSCC() {
+        return flagSkipPrintedSSCC;
+    }
+
+    public PrintOrderCloseDTO setFlagSkipPrintedSSCC(boolean flagSkipPrintedSSCC) {
+        this.flagSkipPrintedSSCC = flagSkipPrintedSSCC;
+        return this;
+    }
+
+    public List<DtbOrdt> getPrintList() {
+        return printList;
+    }
+
+    public PrintOrderCloseDTO setPrintList(List<DtbOrdt> printList) {
+        this.printList = printList;
+        return this;
+    }
+}

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

@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.text.InputType;
 import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
@@ -21,15 +22,14 @@ import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding;
 public class DialogSimpleInputHelper {
 
 
-    private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
+    private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
         Dialog dialog = new Dialog(mContext);
         DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog);
 
 
-
         DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false);
         viewModel
-                .setOnPositive(()->{
+                .setOnPositive(() -> {
 
                     onPositiveClick.run(mBinding.generalInput.getText().toString());
                 })
@@ -38,50 +38,79 @@ public class DialogSimpleInputHelper {
         mBinding.setViewmodel(viewModel);
 
         //Title VIEW
+
         mBinding.titleText.setText(titleText);
 
-        if (!UtilityString.isNullOrEmpty(hintText)){
+        if (!UtilityString.isNullOrEmpty(hintText)) {
             mBinding.generalInput.setHint(hintText);
         }
 
-        if (!UtilityString.isNullOrEmpty(defaultTextValue)){
+        if (!UtilityString.isNullOrEmpty(defaultTextValue)) {
             mBinding.generalInput.setText(defaultTextValue);
         }
-
+        if (inputType != null) {
+            mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER);
+        }
         //Content View
         dialog.setCancelable(true);
         dialog.setCanceledOnTouchOutside(false);
         dialog.setContentView(mBinding.getRoot());
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        UtilityDialog.setTo90PercentWidth(mContext,dialog);
+        UtilityDialog.setTo90PercentWidth(mContext, dialog);
 
         return dialog;
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick){
+    public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick) {
 
         return makeBase(mContext,
                 title,
                 null,
                 null,
                 onPositiveClick,
-                onNegativeClick);
+                onNegativeClick,
+                null);
 
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, 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,
                 defaultTextValue,
                 hintText,
                 onPositiveClick,
-                onNegativeClick);
+                onNegativeClick,
+                null);
+
+    }
+
+    public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+
+        return makeBase(mContext,
+                title,
+                null,
+                null,
+                onPositiveClick,
+                onNegativeClick,
+                inputType);
 
     }
 
 
+    public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+
+        return makeBase(mContext,
+                title,
+                defaultTextValue,
+                hintText,
+                onPositiveClick,
+                onNegativeClick,
+                inputType);
+
+    }
+
 
 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java

@@ -31,6 +31,7 @@ public class DialogInputQuantityV2DTO {
     private boolean isDataScadMandatory = false;
     private boolean isNotesAllowed = false;
     private boolean isNotesMandatory = false;
+    private boolean isFocusOnStart = true;
     private boolean canLUBeClosed;
     private boolean saveOnImeDone = false;
 
@@ -131,6 +132,15 @@ public class DialogInputQuantityV2DTO {
         return this;
     }
 
+    public boolean isFocusOnStart() {
+        return isFocusOnStart;
+    }
+
+    public DialogInputQuantityV2DTO setFocusOnStart(boolean focusOnStart) {
+        isFocusOnStart = focusOnStart;
+        return this;
+    }
+
     public BigDecimal getTotalQtaAvailable() {
         return UtilityBigDecimal.round(totalQtaAvailable);
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -24,6 +24,7 @@ import com.pedromassango.doubleclick.DoubleClick;
 import com.pedromassango.doubleclick.DoubleClickListener;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -57,6 +58,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     private Runnable mOnAbort;
 
     public ObservableField<Integer> currentTextNumCnfToTake = new ObservableField<>(0);
+    public ObservableField<Boolean> flagShowCnfToTakeLabel = new ObservableField<>(true);
     public ObservableField<Integer> currentTextNumPezziToTake = new ObservableField<>(0);
 
     public ObservableField<String> currentPartitaMag = new ObservableField<>();
@@ -84,9 +86,9 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
     private DialogInputQuantityV2Binding mBindings;
     private boolean mEnableDataCallback = true;
+    private boolean mObservablesInitated = false;
 
     private int mBarcodeScannerIstanceID;
-    private boolean mFirstStart = true;
     private boolean mAbort = true;
 
 
@@ -167,7 +169,9 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             });
         }
         this.onLoadingEnded();
-        mBindings.inputNumCnfText.requestFocus();
+        if (mDialogInputQuantityV2DTO.isFocusOnStart()) {
+            mBindings.inputNumCnfText.requestFocus();
+        }
         return mBindings.getRoot();
     }
 
@@ -180,9 +184,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         this.onLoadingStarted();
 
-        this.mViewModel.processBarcodeDTO(data, () -> {
-            this.onLoadingEnded();
-        });
+        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
     };
 
     public void save() {
@@ -203,7 +205,6 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
-
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
         if (mAbort) this.mOnAbort.run();
         super.onDismiss(dialog);
@@ -213,18 +214,16 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     public void onStart() {
         super.onStart();
 
-//        if(!mFirstStart) {
         this.init();
-//            mFirstStart = false;
-//        }
 
         int onNumCnfInputChanged = SettingsManager.iDB().getOnNumCnfInputChanged();
+        int onQtaTotInputChanged = SettingsManager.iDB().getOnQtaTotInputChanged();
 
         this.mViewModel.setListener(this);
-        this.mViewModel.init(onNumCnfInputChanged);
+        this.mViewModel.init(onNumCnfInputChanged, onQtaTotInputChanged);
     }
 
-    private void init() {
+    private void initViewObservables() {
 
         UtilityObservable.addPropertyChanged(this.currentPartitaMag, (value) -> {
             if (this.mEnableDataCallback) {
@@ -281,6 +280,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             }
         });
 
+
+    }
+
+
+    private void initViewModelObservables() {
+
         final ColorStateList textColorsNumCnf = this.mBindings.inputNumCnfLayout.getEditText().getTextColors();
         final ColorStateList textColorsQtaCnf = this.mBindings.inputQtaCnfLayout.getEditText().getTextColors();
         final ColorStateList textColorsQtaTot = this.mBindings.inputQtaTotLayout.getEditText().getTextColors();
@@ -346,6 +351,15 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 }
             }
         });
+    }
+
+    private void init() {
+        if (!mObservablesInitated) {
+            initViewObservables();
+            mObservablesInitated = true;
+        }
+
+        initViewModelObservables();
 
         //Init double taps
         this.mBindings.inputNumCnfText.setOnClickListener(new DoubleClick(new DoubleClickListener() {
@@ -392,9 +406,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed());
         this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg());
 
-        if (this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue() == 0)) {
-            this.currentTextNumCnfToTake.set(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue());
-            int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue();
+        if (this.mDialogInputQuantityV2DTO.getMtbAart().isFlagQtaCnfFissaBoolean() && this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue() == 0)) {
+            int numCnftoTake = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().divide(this.mDialogInputQuantityV2DTO.getQtaCnfOrd(), 0, RoundingMode.DOWN).intValue();
+            this.currentTextNumCnfToTake.set(numCnftoTake);
+            int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getQtaCnfOrd().intValue();
             this.currentTextNumPezziToTake.set(qtaText);
         } else {
             this.currentTextNumCnfToTake.set(0);
@@ -436,6 +451,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             BigDecimal taraTot = this.mViewModel.getNumCnf().multiply(articolo.getTaraKg());
             this.currentTaraTot.set(taraTot);
             this.currentPesoLordo.set(this.mViewModel.getQtaTot().add(taraTot));
+            this.flagShowCnfToTakeLabel.set(false);
         }
 
         this.mBindings.executePendingBindings();

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java

@@ -70,6 +70,7 @@ public class DialogInputQuantityV2ViewModel {
     private boolean canOverflowOrderQuantity;
     private boolean canPartitaMagBeChanged;
     private int onNumCnfInputChanged;
+    private int onQtaTotInputChanged;
 
     private Listener mListener;
 
@@ -80,8 +81,9 @@ public class DialogInputQuantityV2ViewModel {
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
     }
 
-    public void init(int onNumCnfInputChanged) {
+    public void init(int onNumCnfInputChanged, int onQtaTotInputChanged) {
         this.onNumCnfInputChanged = onNumCnfInputChanged;
+        this.onQtaTotInputChanged = onQtaTotInputChanged;
 
         if (this.initialNumCnf != null && this.initialQtaTot != null && this.initialQtaCnf != null) {
             this.internalNumCnf = this.initialNumCnf;
@@ -379,10 +381,22 @@ public class DialogInputQuantityV2ViewModel {
         }
 
 
-        if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalNumCnf != null)
-            this.internalQtaCnf = UtilityBigDecimal.divide(newValue, internalNumCnf);
-        else if (!this.blockedNumCnf.get() && this.internalQtaCnf != null)
-            this.internalNumCnf = UtilityBigDecimal.divide(newValue, internalQtaCnf);
+        switch (onNumCnfInputChanged) {
+            case UPDATE_QTA_CNF:
+                if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalNumCnf != null)
+                    this.internalQtaCnf = UtilityBigDecimal.divide(newValue, internalNumCnf);
+                else if (!this.blockedNumCnf.get() && this.internalQtaCnf != null)
+                    this.internalNumCnf = UtilityBigDecimal.divide(newValue, internalQtaCnf);
+                break;
+
+            case UPDATE_QTA_TOT:
+                if (!this.blockedNumCnf.get() && this.internalQtaCnf != null)
+                    this.internalNumCnf = UtilityBigDecimal.divide(newValue, internalQtaCnf);
+                else if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalNumCnf != null)
+                    this.internalQtaCnf = UtilityBigDecimal.divide(newValue, internalNumCnf);
+                break;
+
+        }
 
         this.mListener.onDataChanged();
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java

@@ -98,7 +98,7 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
-
+        BarcodeManager.enable();
         setBarcodeListener(true);
     }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java

@@ -115,7 +115,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
         BarcodeManager.enable();
-        if(openedMtbColt == null) {
+        if (openedMtbColt == null) {
             mOnComplete.run(null, false);
         }
         super.onDismiss(dialog);
@@ -126,7 +126,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
-
+        BarcodeManager.enable();
         setBarcodeListener(true);
     }
 
@@ -150,11 +150,11 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     @Override
     public void onLUVenditaConfirmRequired(RunnableArgs<Boolean> onConfirm) {
         DialogSimpleMessageView.makeWarningDialog(new SpannableString(getString(R.string.lu_gest_v_loading_alert)),
-                null, () -> {
-                    onConfirm.run(true);
-                }, () -> {
-                    onConfirm.run(false);
-                })
+                        null, () -> {
+                            onConfirm.run(true);
+                        }, () -> {
+                            onConfirm.run(false);
+                        })
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 

app/src/main/res/drawable/ic_baseline_pause_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_person_add_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_play_arrow_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_stop_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,6h12v12H6z"/>
+</vector>

app/src/main/res/drawable/ic_stop_circle_24.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white"
+        android:fillType="evenOdd" android:pathData="M8,16h8V8H8V16zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2L12,2z"/>
+</vector>

app/src/main/res/drawable/ripple_effect.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorRipple">     <!-- ripple color -->
-
-    <!-- for Button -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/full_white"/>
-        </shape>
-    </item>
-
-</ripple>

app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml

@@ -193,7 +193,7 @@
                         android:layout_gravity="center"
                         android:layout_marginTop="2dp"
                         android:gravity="center"
-                        android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
+                        android:visibility="@{view.flagShowCnfToTakeLabel && (view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 )? View.VISIBLE : View.GONE}">
 
 
                         <androidx.appcompat.widget.LinearLayoutCompat

app/src/main/res/layout-large/activity_login.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.login.LoginActivity" />
+    </data>
+
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorPrimarySurface"
+        android:gravity="center">
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            app:cardCornerRadius="16dp">
+
+            <ScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fitsSystemWindows="true">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="24dp"
+                    android:paddingTop="56dp"
+                    android:paddingRight="24dp"
+                    android:gravity="center_horizontal">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="72dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginBottom="24dp"
+                        android:adjustViewBounds="true"
+                        android:src="@drawable/logo_integry_testo" />
+
+                    <!-- Username Label -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        app:errorText="@{view.usernameError}"
+                        app:hintTextAppearance="@style/hint_text">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_username"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minWidth="300dp"
+                            android:hint="Username"
+                            android:inputType="textEmailAddress"
+                            app:binding="@{view.username}" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <!-- Password Label -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        app:errorText="@{view.passwordError}"
+                        app:hintTextAppearance="@style/hint_text"
+                        app:passwordToggleEnabled="true">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_password"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minWidth="300dp"
+                            android:hint="Password"
+                            android:inputType="textPassword"
+                            app:binding="@{view.password}" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <androidx.appcompat.widget.AppCompatCheckBox
+                        android:id="@+id/login_checkbox_custom_server"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:enabled="@{view.customSettingsCheckboxEnabled}"
+                        android:text="@string/action_customize_server_settings"
+                        app:checked="@{view.customSettingsCheckboxChecked}" />
+
+                    <net.cachapa.expandablelayout.ExpandableLayout
+                        android:id="@+id/login_layout_server_details"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="6dp"
+                        android:paddingBottom="12dp"
+                        app:el_duration="400"
+                        app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <!--Host Label-->
+                            <com.google.android.material.textfield.TextInputLayout
+                                style="@style/TextInputLayout.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                app:errorText="@{view.codAziendaError}"
+                                app:hintTextAppearance="@style/hint_text">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    android:id="@+id/input_cod_azienda"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:hint="Codice azienda"
+                                    android:inputType="text"
+                                    app:binding="@{view.codAzienda}" />
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                        </LinearLayout>
+
+                    </net.cachapa.expandablelayout.ExpandableLayout>
+
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_login"
+                        style="@style/Button.PrimaryFull"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:layout_marginBottom="24dp"
+                        android:minWidth="170dp"
+                        android:enabled="@{view.loginButtonEnabled}"
+                        android:text="@string/login"
+                        app:onClick="@{() -> view.login()}" />
+
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </ScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</layout>

app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml

@@ -0,0 +1,712 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
+        <import type="androidx.core.content.ContextCompat" />
+
+        <import type="it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneStatoEnum" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment" />
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_200"
+        android:padding="8dp"
+        tools:context=".gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment">
+
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <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="@{view.currentOrder != null ? View.GONE : View.VISIBLE}">
+
+                    <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.4" />
+
+                    <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" />
+
+                    <LinearLayout
+                        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_info_78dp"
+                            android:tint="@android:color/black" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:text="@string/no_one_order_selected"
+                            android:textColor="@android:color/black"
+                            android:textSize="18sp" />
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:visibility="@{view.currentOrder == null ? View.GONE : View.VISIBLE}"
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="4dp">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingTop="24dp"
+                        android:paddingEnd="16dp"
+                        android:paddingBottom="16dp">
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingBottom="8dp">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="8dp"
+                                android:layout_toStartOf="@id/ordine_state_icon"
+                                android:gravity="center_vertical"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    style="@style/AppTheme.NewMaterial.Text"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrdD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                    tools:text="28 maggio 2021" />
+
+                                <TextView
+                                    style="@style/TextViewMaterial.Dialog.HeadlineText"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{`Ordine #`+ view.currentOrder.numOrd.toString()}"
+                                    android:textStyle="bold"
+                                    tools:text="Ordine #218" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/ordine_state_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:gravity="center_horizontal"
+                                android:orientation="vertical">
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="48dp"
+                                    android:layout_height="48dp"
+                                    android:background="@android:color/transparent"
+                                    android:src="@{view.orderStatusIcon}"
+                                    android:tint="@{view.orderStatusIconTintColor}"
+                                    tools:src="@drawable/ic_info_78dp"
+                                    tools:tint="@color/blue_700" />
+
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="4dp"
+                                    android:background="@{view.orderStatusLabelBackgroud}"
+                                    android:paddingStart="6dp"
+                                    android:paddingTop="2dp"
+                                    android:paddingEnd="6dp"
+                                    android:paddingBottom="2dp"
+                                    android:text="@{view.currentOrder.stato}"
+                                    android:textAllCaps="true"
+                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                    android:textColor="@{view.orderStatusLabelTextColor}"
+                                    android:textStyle="bold"
+                                    tools:background="@drawable/label_primary_text"
+                                    tools:text="PROGRAMMATO"
+                                    tools:textColor="@color/blue_800" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        </RelativeLayout>
+
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/provenienza_layout"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal"
+                                android:layout_alignParentStart="true"
+                                android:layout_toStartOf="@id/totale_bancali_layout"
+                                android:visibility="@{view.currentOrder.codAnag != null ? View.VISIBLE : View.GONE}">
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_person_filled_24dp"
+                                    android:tint="@color/gray_500" />
+
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Provenienza"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}"
+                                            android:ellipsize="end"
+                                            android:maxLines="1"
+                                            tools:text="FRUDIS S.R.L. (F0312)" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/totale_bancali_layout"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:gravity="end"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:gravity="end"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Totale bancali"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            tools:text="0" />
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" UL"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" ("
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityNumber.decimalToString(view.sumColliNumber, 0)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            tools:text="0" />
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" COL)"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_pallet_96px"
+                                    android:tint="@color/gray_500" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </RelativeLayout>
+
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/cliente_layout"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_person_filled_24dp"
+                                    android:tint="@color/gray_500" />
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Cliente"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@{view.currentOrder.descCommessa != null ? view.currentOrder.descCommessa : `-`}"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:textColor="@android:color/black"
+                                        tools:text="GRUNDHOFER GBMH" />
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_toEndOf="@id/cliente_layout"
+                                android:gravity="end"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:gravity="end"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Totale netto"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            tools:text="0" />
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" KG"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:tint="@color/gray_500" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/orari_produzione_layout"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_workers_96px"
+                                    android:tint="@color/gray_500" />
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Orari produzione"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal"
+                                        android:visibility="@{view.currentOrder.dataInizD != null ? View.VISIBLE : View.GONE}">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityDate.formatDate(view.currentOrder.dataInizD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            tools:text="11:00:00" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" - "
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityDate.formatDate(view.currentOrder.dataFineD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            android:visibility="@{view.currentOrder.dataFineD != null ? View.VISIBLE : View.GONE}"
+                                            tools:text="18:00:00" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="IN CORSO"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            android:visibility="@{view.currentOrder.dataFineD == null ? View.VISIBLE : View.GONE}"
+                                            tools:text="IN CORSO"
+                                            tools:visibility="gone" />
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Non avviato"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:textColor="@android:color/black"
+                                        android:visibility="@{view.currentOrder.dataInizD == null ? View.VISIBLE : View.GONE}"
+                                        tools:visibility="gone" />
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_toEndOf="@id/orari_produzione_layout"
+                                android:gravity="end"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:gravity="end"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Totale lordo"
+                                        android:textAllCaps="true"
+                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                                        android:textStyle="bold" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{UtilityNumber.decimalToString(view.sumGrossKG, 0)}"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black"
+                                            tools:text="0" />
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" KG"
+                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textColor="@android:color/black" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="8dp"
+                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:tint="@color/gray_500" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </RelativeLayout>
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal"
+                            android:padding="8dp">
+
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_confirm"
+                                style="@style/Button.PrimaryOutline"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/add_lu"
+                                app:icon="@drawable/ic_add_24dp"
+                                app:singleClick="@{() -> view.addULButtonClick()}" />
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:orientation="vertical">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Lista bancali"
+                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/main_list"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp" />
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/mtb_colt_empty_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:alpha="0.3"
+                                tools:context=".gest.lista_bancali.ListaBancaliActivity">
+
+                                <androidx.constraintlayout.widget.Guideline
+                                    android:id="@+id/mtb_colt_guideline_empty_top"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal"
+                                    app:layout_constraintGuide_percent="0.15" />
+
+                                <androidx.constraintlayout.widget.Guideline
+                                    android:id="@+id/mtb_colt_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/mtb_colt_guideline_empty_right"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical"
+                                    app:layout_constraintGuide_percent="0.85" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical"
+                                    android:padding="32dp"
+                                    app:layout_constraintEnd_toStartOf="@id/mtb_colt_guideline_empty_right"
+                                    app:layout_constraintStart_toEndOf="@id/mtb_colt_guideline_empty_left"
+                                    app:layout_constraintTop_toTopOf="@id/mtb_colt_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_lu_found_message"
+                                        android:textColor="@android:color/black" />
+                                </LinearLayout>
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                </androidx.cardview.widget.CardView>
+
+            </RelativeLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </FrameLayout>
+</layout>

app/src/main/res/layout/activity_contab_doc_interni_edit.xml

@@ -60,7 +60,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="50dp"
                             android:layout_gravity="end"
-                            android:background="@drawable/ripple_effect"
+                            android:background="?attr/selectableItemBackground"
                             android:adjustViewBounds="true"
                             android:src="@drawable/ic_search_black_24dp"
                             android:onClick="@{()->view.manualSearch()}"

app/src/main/res/layout/activity_login.xml

@@ -10,122 +10,124 @@
     </data>
 
 
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fitsSystemWindows="true">
+            <ScrollView
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:fitsSystemWindows="true">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="24dp"
-            android:paddingTop="56dp"
-            android:paddingRight="24dp">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="72dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="24dp"
-                android:src="@drawable/logo_integry_testo" />
-
-            <!-- Username Label -->
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                app:errorText="@{view.usernameError}"
-                app:hintTextAppearance="@style/hint_text"
-                style="@style/TextInputLayout.OutlinePrimary">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/input_username"
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Username"
-                    android:inputType="textEmailAddress"
-                    app:binding="@{view.username}" />
-            </com.google.android.material.textfield.TextInputLayout>
+                    android:orientation="vertical"
+                    android:paddingLeft="24dp"
+                    android:paddingTop="56dp"
+                    android:paddingRight="24dp">
 
-            <!-- Password Label -->
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                app:errorText="@{view.passwordError}"
-                app:hintTextAppearance="@style/hint_text"
-                app:passwordToggleEnabled="true"
-                style="@style/TextInputLayout.OutlinePrimary">
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="72dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginBottom="24dp"
+                        android:src="@drawable/logo_integry_testo" />
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/input_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="Password"
-                    android:inputType="textPassword"
-                    app:binding="@{view.password}" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <androidx.appcompat.widget.AppCompatCheckBox
-                android:id="@+id/login_checkbox_custom_server"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="@{view.customSettingsCheckboxEnabled}"
-                android:text="@string/action_customize_server_settings"
-                app:checked="@{view.customSettingsCheckboxChecked}" />
-
-            <net.cachapa.expandablelayout.ExpandableLayout
-                android:id="@+id/login_layout_server_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dp"
-                android:paddingBottom="12dp"
-                app:el_duration="400"
-                app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <!--Host Label-->
+                    <!-- Username Label -->
                     <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
-                        app:errorText="@{view.codAziendaError}"
-                        app:hintTextAppearance="@style/hint_text"
-                        style="@style/TextInputLayout.OutlinePrimary">
+                        android:layout_marginBottom="8dp"
+                        app:errorText="@{view.usernameError}"
+                        app:hintTextAppearance="@style/hint_text">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_cod_azienda"
+                            android:id="@+id/input_username"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="Codice azienda"
-                            android:inputType="text"
-                            app:binding="@{view.codAzienda}" />
+                            android:hint="Username"
+                            android:inputType="textEmailAddress"
+                            app:binding="@{view.username}" />
                     </com.google.android.material.textfield.TextInputLayout>
 
-                </LinearLayout>
+                    <!-- Password Label -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        app:errorText="@{view.passwordError}"
+                        app:hintTextAppearance="@style/hint_text"
+                        app:passwordToggleEnabled="true">
 
-            </net.cachapa.expandablelayout.ExpandableLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="Password"
+                            android:inputType="textPassword"
+                            app:binding="@{view.password}" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <androidx.appcompat.widget.AppCompatCheckBox
+                        android:id="@+id/login_checkbox_custom_server"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:enabled="@{view.customSettingsCheckboxEnabled}"
+                        android:text="@string/action_customize_server_settings"
+                        app:checked="@{view.customSettingsCheckboxChecked}" />
+
+                    <net.cachapa.expandablelayout.ExpandableLayout
+                        android:id="@+id/login_layout_server_details"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="6dp"
+                        android:paddingBottom="12dp"
+                        app:el_duration="400"
+                        app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <!--Host Label-->
+                            <com.google.android.material.textfield.TextInputLayout
+                                style="@style/TextInputLayout.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                app:errorText="@{view.codAziendaError}"
+                                app:hintTextAppearance="@style/hint_text">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    android:id="@+id/input_cod_azienda"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:hint="Codice azienda"
+                                    android:inputType="text"
+                                    app:binding="@{view.codAzienda}" />
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                        </LinearLayout>
+
+                    </net.cachapa.expandablelayout.ExpandableLayout>
 
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_login"
-                style="@style/Button.PrimaryFull"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="24dp"
-                android:enabled="@{view.loginButtonEnabled}"
-                android:text="@string/login"
-                app:onClick="@{() -> view.login()}" />
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_login"
+                        style="@style/Button.PrimaryFull"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:layout_marginBottom="24dp"
+                        android:enabled="@{view.loginButtonEnabled}"
+                        android:text="@string/login"
+                        app:onClick="@{() -> view.login()}" />
+
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </ScrollView>
 
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
-    </ScrollView>
 </layout>

app/src/main/res/layout/activity_prod_dettaglio_linea.xml

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="it.integry.integrywmsnative.R" />
+
+        <import type="androidx.core.content.ContextCompat" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaViewModel" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaActivity" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/gray_detail_background_round8">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/header_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <it.integry.integrywmsnative.ui.ElevatedToolbar
+                android:id="@+id/elevated_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?actionBarSize">
+
+
+                </androidx.appcompat.widget.Toolbar>
+
+            </it.integry.integrywmsnative.ui.ElevatedToolbar>
+
+            <FrameLayout
+                android:id="@+id/frame_layout_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@color/white"
+                android:padding="16dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                        android:text="@{view.lineaLabel}"
+                        tools:text="L2 - Linea 2"
+
+                        />
+
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/add_extra_items_toolbar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="5dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:adjustViewBounds="true"
+                        android:background="?attr/selectableItemBackground"
+                        android:onClick="@{()->viewModel.settings()}"
+                        android:src="@drawable/ic_settings_24dp"
+                        android:tint="@color/colorPrimaryGray" />
+
+
+                </RelativeLayout>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/image"
+                        android:layout_width="18dp"
+                        android:layout_height="18dp"
+                        android:layout_gravity="center_horizontal"
+                        android:src="@{ContextCompat.getDrawable(context, view.isStarted.get() ? R.drawable.ic_baseline_play_arrow_24 : view.isPaused.get() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
+                        app:tint="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
+                        tools:tint="@color/green_600"
+                        tools:src="@drawable/ic_baseline_play_arrow_24" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/peso_lordo_collo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:text="@{view.isStarted.get() ? R.string.in_progress : view.isPaused.get() ? R.string.stand_by : R.string.stopped}"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                        app:textColor="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
+                        tools:textColor="@color/green_600"
+                        android:textStyle="bold"
+                        tools:text="In lavorazione" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:visibility="@{view.isStarted}"
+                    android:layout_marginTop="16dp">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/risorse_impostate"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        tools:text="Risorse assegnate" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        app:text="@{view.hrNum}"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textStyle="bold"
+                        tools:text="25" />
+
+
+                </RelativeLayout>
+
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                app:visibility="@{view.flagShowProdInfo}"
+                android:layout_marginTop="16dp"
+                android:padding="16dp">
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/production_in_progress"
+                    tools:text="Lavorazione in corso"
+                    android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
+
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/article"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        tools:text="Articolo" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        app:text="@{view.codMart}"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textStyle="bold"
+                        tools:text="150150-09" />
+
+
+                </RelativeLayout>
+
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/batch_lot"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        tools:text="Lotto" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        app:text="@{view.partitaMag}"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textStyle="bold"
+                        tools:text="20220530" />
+
+
+                </RelativeLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    >
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/label_descrizione"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/description"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="Descrizione" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textStyle="bold"
+                        android:layout_marginStart="8dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/label_descrizione"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:text="@{view.productDescription}"
+                        tools:text="UVA VITTORIA IN CASSE " />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/orders_in_progress"
+                    tools:text="Ordini in lavorazione"
+                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium" />
+
+                <HorizontalScrollView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/orders_list"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+
+                    </com.google.android.material.chip.ChipGroup>
+                </HorizontalScrollView>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:padding="16dp"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/versamento_merce_fragment_title"
+                    android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/scan_art_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="24dp"
+                    android:orientation="horizontal"
+                    android:visibility="visible"
+                    app:layout_constraintTop_toBottomOf="@id/header_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent">
+
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        style="?android:attr/progressBarStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="12dp"
+                        android:gravity="center_horizontal"
+                        android:text="@string/scan_lu_to_deposit"
+                        android:textSize="16sp" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</layout>

app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml

@@ -53,7 +53,7 @@
                         android:layout_height="50dp"
                         android:layout_gravity="end"
                         android:adjustViewBounds="true"
-                        android:background="@drawable/ripple_effect"
+                        android:background="?attr/selectableItemBackground"
                         android:onClick="@{()->viewModel.manualSearch()}"
                         android:src="@drawable/ic_search_black_24dp"
                         android:tint="@color/colorPrimaryGray" />

app/src/main/res/layout/activity_spedizione.xml

@@ -61,7 +61,7 @@
                                 android:layout_height="50dp"
                                 android:layout_gravity="end"
                                 android:adjustViewBounds="true"
-                                android:background="@drawable/ripple_effect"
+                                android:background="?attr/selectableItemBackground"
                                 android:src="@drawable/ic_add_24dp"
                                 android:tint="@color/colorPrimaryGray"
                                 app:visibility="@{spedizioneView.addExtraItemsEnabled}"
@@ -73,7 +73,7 @@
                                 android:layout_height="50dp"
                                 android:layout_gravity="end"
                                 android:adjustViewBounds="true"
-                                android:background="@drawable/ripple_effect"
+                                android:background="?attr/selectableItemBackground"
                                 app:singleClick="@{() -> spedizioneView.startManualSearch()}"
                                 android:src="@drawable/ic_black_barcode"
                                 android:tint="@color/colorPrimaryGray"

app/src/main/res/layout/bottom_sheet_line_actions.xml

@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.R" />
+
+        <import type="androidx.core.content.ContextCompat" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
+        <import type="android.view.View" />
+
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
+        <variable
+            type="it.integry.integrywmsnative.gest.prod_dettaglio_linea.dialogs.BottomSheetLineAction"
+            name="view" />
+
+        <variable
+            type="it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO"
+            name="listModel" />
+
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/descriptionLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/mtb_grp_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:orientation="horizontal">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Large"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{listModel.getLabel()}"
+                        android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        tools:text="L2 - Linea 2"
+                        tools:textColor="@color/green_600" />
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                        android:orientation="horizontal"
+                        android:weightSum="2"
+                        tools:backgroundTint="@color/green_600">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/image"
+                            android:layout_width="18dp"
+                            android:layout_height="19dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
+                            app:tint="@color/white"
+                            tools:src="@drawable/ic_baseline_play_arrow_24" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/peso_lordo_collo"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
+                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:textColor="@android:color/white"
+                            android:textStyle="bold"
+                            tools:text="In lavorazione" />
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </RelativeLayout>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/lista_ords_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:orientation="horizontal"
+                android:visibility="@{listModel.isStarted() &amp;&amp; !UtilityString.isNullOrEmpty(listModel.listaOrd) ? View.VISIBLE : View.GONE}">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:text="@string/orders_in_progress"
+                    android:textColor="@android:color/black"
+                    android:textSize="14sp" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/lista_ords"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{listModel.listaOrd}"
+                    android:textColor="@android:color/black"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    tools:text="125|255" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:onClick="@{()->view.onResourcesClicked()}"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_baseline_person_add_24" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextAppearance.Material3.BodyLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:text="@string/ridistribuisci_risorse" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:onClick="@{()->view.onPlayClicked()}"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_baseline_play_arrow_24" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextAppearance.Material3.BodyLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:text="@string/avvia_nuova_produzione" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:onClick="@{()->view.onStopClicked()}"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_baseline_stop_24" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextAppearance.Material3.BodyLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:text="@string/arresta_produzione" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:onClick="@{()->view.onRecoverClicked()}"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_black_download" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextAppearance.Material3.BodyLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:text="@string/prod_recupero_materiale_title_fragment" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml

@@ -21,7 +21,7 @@
         android:paddingEnd="12dp"
         android:paddingBottom="12dp"
         android:clickable="true"
-        android:background="@drawable/ripple_effect">
+        android:background="?attr/selectableItemBackground">
 
         <LinearLayout
             android:layout_width="match_parent"

app/src/main/res/layout/dialog_input_quantity_v2.xml

@@ -203,7 +203,7 @@
                         android:layout_gravity="center"
                         android:layout_marginTop="2dp"
                         android:gravity="center"
-                        android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
+                        android:visibility="@{view.flagShowCnfToTakeLabel && (view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0) ? View.VISIBLE : View.GONE}">
 
 
                         <androidx.appcompat.widget.LinearLayoutCompat
@@ -624,7 +624,6 @@
                             android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
                             android:enabled="@{view.enabledQtaTot}"
                             android:focusableInTouchMode="false"
-                            android:imeOptions="actionDone"
                             tools:layout_weight="1">
 
                             <com.google.android.material.textfield.TextInputEditText
@@ -636,6 +635,7 @@
                                 android:hint="@string/tot_qty"
                                 android:inputType="number"
                                 android:selectAllOnFocus="true"
+                                android:imeOptions="actionDone"
                                 app:binding="@{view.currentQtaTot}" />
 
                         </com.google.android.material.textfield.TextInputLayout>

app/src/main/res/layout/dialog_print_order_sscc_list.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListView" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        app:cardBackgroundColor="@android:color/transparent"
+        app:cardCornerRadius="24dp"
+        app:cardElevation="0dp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/base"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="vertical"
+            app:cardBackgroundColor="@color/light_blue_300"
+            app:cardCornerRadius="24dp"
+            app:cardElevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:background="@drawable/dialog_card_child_bg"
+                android:padding="24dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title_text"
+                    style="@style/TextViewMaterial.Dialog.HeadlineText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:text="@string/action_close_order" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/description_text"
+                    style="@style/TextViewMaterial"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:gravity="left"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/title_text"
+                    android:text="@string/message_print_SSCC_list_on_close_order" />
+
+                <RadioGroup
+                    android:id="@+id/radioGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:onCheckedChanged="@{view::onCheckChange}"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/description_text">
+
+                    <RadioButton
+                        android:id="@+id/print_only_new"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/action_print_SSCC_only_remaining" />
+
+                    <RadioButton
+                        android:id="@+id/print_all"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/action_print_SSCC_all" />
+                </RadioGroup>
+
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonPositive"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> view.onPositiveClick()}"
+                    android:text="@string/confirm"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/radioGroup" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonNegative"
+                    style="@style/Button.DangerOutline"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> view.onNegativeClick()}"
+                    android:text="@string/abort"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="12dp"
+                    app:layout_constraintTop_toBottomOf="@id/radioGroup"
+                    app:layout_constraintEnd_toStartOf="@id/buttonPositive"
+
+                    />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.cardview.widget.CardView>
+    </androidx.cardview.widget.CardView>
+
+</layout>

app/src/main/res/layout/dialog_start_production.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        app:cardBackgroundColor="@android:color/transparent"
+        app:cardCornerRadius="24dp"
+        app:cardElevation="0dp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/base"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="vertical"
+            app:cardBackgroundColor="@color/light_blue_300"
+            app:cardCornerRadius="24dp"
+            app:cardElevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:background="@drawable/dialog_card_child_bg"
+                android:padding="24dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title_text"
+                    style="@style/TextViewMaterial.Dialog.HeadlineText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:text="@string/avvia_nuova_produzione" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/title_text"
+                    android:orientation="horizontal">
+
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        style="?android:attr/progressBarStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/scan_label"
+                        style="@style/AppTheme.NewMaterial.Text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="12dp"
+                        android:gravity="center_horizontal"
+                        android:text="@string/scan_item"
+                        android:textSize="16sp" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.cardview.widget.CardView>
+    </androidx.cardview.widget.CardView>
+
+
+</layout>

app/src/main/res/layout/doc_interni_list_model.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout>
 
     <data>
+
         <import type="it.integry.integrywmsnative.R" />
     </data>
 
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout 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"
@@ -46,7 +46,7 @@
                 android:textColor="@color/colorPrimaryGray"
                 android:layout_alignParentEnd="true"
                 android:textSize="14sp"
-                tools:text="13 Apr"/>
+                tools:text="13 Apr" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/num_rows"
@@ -58,7 +58,7 @@
                 android:layout_below="@id/doc_description"
                 android:singleLine="true"
                 android:ellipsize="end"
-                tools:text="0 Articoli"/>
+                tools:text="0 Articoli" />
         </RelativeLayout>
     </LinearLayout>
 

app/src/main/res/layout/fragment_linee_prod.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/full_white">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/lines_main_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/lines_list_empty_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:alpha="0.3">
+
+                <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.1" />
+
+                <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" />
+
+                <LinearLayout
+                    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
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:text="@string/nessuna_linea_disponibile"
+                        android:textColor="@android:color/black"
+                        android:textSize="18sp" />
+                </LinearLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/fragment_linee_prod_main_list_model.xml

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.R" />
+
+        <import type="android.view.View" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
+        <import type="android.text.Html" />
+
+        <import type="androidx.core.content.ContextCompat" />
+
+        <variable
+            name="listModel"
+            type="it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="?attr/selectableItemBackground"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="0dp">
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="10dp"
+                    android:weightSum="2">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/mtb_grp_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Large"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{listModel.getLabel()}"
+                                android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                                android:textSize="16sp"
+                                android:textStyle="bold"
+                                tools:text="L2 - Linea 2"
+                                tools:textColor="@color/green_600" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+                                android:background="@drawable/badge_round_corner"
+                                android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                                android:orientation="horizontal"
+                                android:weightSum="2"
+                                tools:backgroundTint="@color/green_600">
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:id="@+id/image"
+                                    android:layout_width="18dp"
+                                    android:layout_height="19dp"
+                                    android:layout_gravity="center_horizontal"
+                                    android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
+                                    app:tint="@color/white"
+                                    tools:src="@drawable/ic_baseline_play_arrow_24" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/peso_lordo_collo"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
+                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold"
+                                    tools:text="In lavorazione" />
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </RelativeLayout>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/resources_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="8dp"
+                            android:text="@string/risorse_impostate"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/resources"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{listModel.getRisorseLabel()}"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            tools:text="5/25" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/lista_ords_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:visibility="@{listModel.isStarted() &amp;&amp; !UtilityString.isNullOrEmpty(listModel.listaOrd) ? View.VISIBLE : View.GONE}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="8dp"
+                            android:text="@string/orders_in_progress"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/lista_ords"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{listModel.listaOrd}"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            tools:text="125|255" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/production_start_cotnainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="8dp"
+                            android:text="@string/inizio_produzione"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/production_start"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{UtilityDate.formatDate(listModel.datetimeStart, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            tools:text="05/07/2022 14:00:00" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/production_stop_cotnainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:visibility="@{listModel.isStarted() ? View.GONE : View.VISIBLE}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="8dp"
+                            android:text="@string/ultima_produzione"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/production_stop"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{UtilityDate.formatDate(listModel.datetimeEnd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
+                            android:textColor="@android:color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            tools:text="05/07/2022 23:59:59" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/fragment_prod_rientro_merce.xml

@@ -22,10 +22,11 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:visibility="@{view.isLargeLayout}">
 
             <FrameLayout
-                android:id="@+id/order_list_fragment"
+                android:id="@+id/left_side_fragment_container"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -36,7 +37,7 @@
                 android:layout_height="match_parent" />
 
             <FrameLayout
-                android:id="@+id/order_detail_fragment"
+                android:id="@+id/right_side_fragment_container"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -44,6 +45,15 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
+        <FrameLayout
+            android:id="@+id/full_width_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:reverse_visibility="@{view.isLargeLayout}"
+            tools:layout="@layout/fragment_prod_rientro_merce_order_list" />
+
+
+
 
 
 

app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml

@@ -23,8 +23,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_200"
-        android:padding="8dp"
+        android:background="?attr/colorSurface"
         tools:context=".gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment">
 
 
@@ -93,22 +92,12 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.cardview.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:visibility="@{view.currentOrder == null ? View.GONE : View.VISIBLE}"
-                    app:cardCornerRadius="8dp"
-                    app:cardElevation="4dp">
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:paddingStart="16dp"
-                        android:paddingTop="24dp"
-                        android:paddingEnd="16dp"
-                        android:paddingBottom="16dp">
+                        android:padding="16dp">
 
                         <RelativeLayout
                             android:layout_width="match_parent"
@@ -674,6 +663,7 @@
                                     android:layout_height="wrap_content"
                                     android:gravity="center_horizontal"
                                     android:orientation="vertical"
+                                    android:padding="32dp"
                                     app:layout_constraintEnd_toStartOf="@id/mtb_colt_guideline_empty_right"
                                     app:layout_constraintStart_toEndOf="@id/mtb_colt_guideline_empty_left"
                                     app:layout_constraintTop_toTopOf="@id/mtb_colt_guideline_empty_top">
@@ -701,7 +691,6 @@
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                </androidx.cardview.widget.CardView>
 
             </RelativeLayout>
 

app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml

@@ -23,7 +23,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ripple_effect"
+        android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:paddingTop="12dp"
         android:paddingEnd="12dp"

app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml

@@ -1,74 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout
-    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">
 
-<FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListFragment">
-
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/main_list"
-        android:scrollbars="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/empty_view"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:alpha="0.3">
+        tools:context=".gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListFragment">
 
-        <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.4" />
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swiperefresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/filter_chips">
 
-        <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.recyclerview.widget.RecyclerView
+                android:id="@+id/main_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                tools:listitem="@layout/fragment_prod_rientro_merce_order_list__list_group_model" />
 
-        <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.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center_horizontal"
-            app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
-            app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
-            app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.3">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="72dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_playlist_add_check_24dp"
-                android:adjustViewBounds="true"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
+            <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.4" />
+
+            <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" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:textColor="@android:color/black"
-                android:textSize="18sp"
-                android:text="@string/no_orders_found_message"/>
-        </LinearLayout>
+                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.constraintlayout.widget.ConstraintLayout>
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="72dp"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_playlist_add_check_24dp" />
 
-</FrameLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/no_orders_found_message"
+                    android:textColor="@android:color/black"
+                    android:textSize="18sp" />
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </FrameLayout>
 </layout>

app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml

@@ -16,110 +16,100 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ripple_effect"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
         android:orientation="horizontal"
-        android:paddingStart="2dp"
-        android:paddingEnd="4dp">
+        android:paddingVertical="8dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="12dp">
 
-        <RelativeLayout
-            android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/ordine_state_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_margin="8dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_play_circle_filled_24dp"
+            android:tint="@color/blue_700" />
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="@color/full_white"
-            android:gravity="center_vertical"
-            android:paddingStart="2dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="8dp">
+            android:layout_toEndOf="@id/ordine_state_icon"
+            android:orientation="vertical">
 
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/ordine_state_icon"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_margin="8dp"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_play_circle_filled_24dp"
-                android:tint="@color/blue_700" />
-
-
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toEndOf="@id/ordine_state_icon"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/pre_first_row"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        tools:text="Cons 07 nov 2018" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/pre_first_row"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical">
+                    android:layout_alignParentEnd="true"
+                    tools:text="Cons 07 nov 2018" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/right_descrizione"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:ellipsize="end"
-                        android:gravity="center_vertical"
-                        android:maxLines="1"
-                        android:textColor="#000"
-                        tools:text="EUROGROUP ITALIA SRL" />
+            </RelativeLayout>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/descrizione"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_toStartOf="@id/descrizione"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:textColor="#000"
-                        tools:text="N° 39" />
-                </RelativeLayout>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/right_descrizione"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:textColor="#000"
+                    tools:text="EUROGROUP ITALIA SRL" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@id/descrizione"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="#000"
+                    tools:text="N° 39" />
+            </RelativeLayout>
 
 
-                <RelativeLayout
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/right_sub_descrizione"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    tools:text="Cod Jcom" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/sub_descrizione"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_toStartOf="@id/right_sub_descrizione"
+                    android:paddingEnd="6dp"
+                    tools:text="TextView" />
+            </RelativeLayout>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/right_sub_descrizione"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        tools:text="Cod Jcom" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/sub_descrizione"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_toStartOf="@id/right_sub_descrizione"
-                        android:paddingEnd="6dp"
-                        tools:text="TextView" />
-                </RelativeLayout>
-
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-        </RelativeLayout>
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 

app/src/main/res/layout/layout_filter_agente.xml

@@ -79,8 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title_layout">
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <androidx.recyclerview.widget.RecyclerView
@@ -89,6 +88,7 @@
                 android:layout_height="0dp"
                 android:focusableInTouchMode="true"
                 android:orientation="vertical"
+                tools:listitem="@layout/layout_filter_agente__list_item"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHeight_max="270dp"

app/src/main/res/layout/lista_bancali_list_model.xml

@@ -26,7 +26,7 @@
     android:paddingEnd="12dp"
     android:paddingBottom="12dp"
     android:clickable="true"
-    android:background="@drawable/ripple_effect">
+    android:background="?attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/picking_resi_main_list__item.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/ripple_effect"
+    android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true">
 

app/src/main/res/values-it/strings.xml

@@ -8,6 +8,7 @@
     <string name="waiting">Attendere</string>
     <string name="loading">Caricamento</string>
     <string name="completed">Completato</string>
+    <string name="success">Successo</string>
     <string name="ord_acq_testata"><![CDATA[N° <b>%s</b> del <b>%s</b>]]></string>
     <string name="ord_ven_testata"><![CDATA[N° <b>%s</b> del <b>%s</b>]]></string>
     <string name="ord_testata"><![CDATA[N° <b>%s</b> del <b>%s</b>]]></string>
@@ -38,6 +39,7 @@
     <string name="picking_not_available">Picking non disponibile</string>
     <string name="scan_item">Scansiona il codice a barre di un <b>articolo</b></string>
     <string name="please_open_lu">Prima di procedere apri una <b>nuova UL</b></string>
+    <string name="scan_lu_to_deposit">Scansiona il codice a barre di una <b>UL</b> per versarla</string>
     <string name="extra_item">Articolo extra</string>
     <string name="info">Info</string>
     <string name="lu_info">Info UL</string>
@@ -267,6 +269,9 @@
 
     <string name="recovering_data">Recupero dati</string>
     <string name="wait_a_moment">Attendi qualche istante</string>
+    <string name="title_dynamic_vgalimenti">VGAlimenti personalizzazione</string>
+    <string name="title_dynamic__base">Base personalizzazione</string>
+    <string name="title_dynamic_ime">IME personalizzazione</string>
 
 
     <string name="check_in_printer">Stampante Accettazione</string>
@@ -277,6 +282,10 @@
 
     <string name="placement">Posizionamento</string>
     <string name="message_print_packing_list">Vuoi procedere con la stampa di una %s</string>
+    <string name="message_print_packing_list_on_close_order">Vuoi stampare le packing list degli ordini chiusi?</string>
+    <string name="message_print_SSCC_list_on_close_order">Vuoi stampare le etichette SSCC degli ordini chiusi?</string>
+    <string name="action_print_SSCC_only_remaining">Stampa solo le nuove etichette</string>
+    <string name="action_print_SSCC_all">Stampa tutte le etichette</string>
     <string name="button_create_new_ul">Crea nuova UL</string>
     <string name="button_view_basket_ul">Visualizza basket</string>
     <string name="title_open_lu">Apri UL</string>
@@ -383,4 +392,21 @@
     <string name="newly_inserted_prod">Nuovo articolo in griglia</string>
     <string name="doc_interni_select_row_to_edit">Seleziona la riga da modificare</string>
     <string name="incoming_cnf">Colli in arrivo</string>
+    <string name="nav_prod_linee_title">Linee di produzione</string>
+    <string name="no_line_available">Nessuna linea disponibile</string>
+    <string name="in_progress">In lavorazione</string>
+    <string name="stand_by">In pausa</string>
+    <string name="stopped">Ferma</string>
+    <string name="risorse_impostate">Risorse assegnate</string>
+    <string name="orders_in_progress">Ordini in lavorazione</string>
+    <string name="production_in_progress">Lavorazione in corso</string>
+    <string name="ridistribuisci_risorse">Assegna risorse</string>
+    <string name="avvia_nuova_produzione">Avvia nuova produzione</string>
+    <string name="arresta_produzione">Arresta produzione</string>
+    <string name="inizio_produzione">Inizio produzione</string>
+    <string name="ultima_produzione">Ultima produzione</string>
+    <string name="nessuna_linea_disponibile">Nessuna linea disponibile</string>
+    <string name="line_details">Dettaglio linea</string>
+    <string name="materiali_versati">Materiali versati</string>
+    <string name="scan_lu_to_recover">Scansiona il codice a barre della <b>UL</b> da recuperare</string>
 </resources>

app/src/main/res/values-large/values.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <item name="large_layout" type="bool">true</item>
+
+</resources>

app/src/main/res/values/buttons_style.xml

@@ -3,46 +3,53 @@
 
 
     <style name="Button.PrimaryOutline" parent="Widget.MaterialComponents.Button.OutlinedButton">
-<!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-<!--        <item name="android:textStyle">bold</item>-->
-<!--        <item name="android:textAllCaps">false</item>-->
-<!--        <item name="android:paddingTop">8dp</item>-->
-<!--        <item name="android:paddingBottom">8dp</item>-->
+        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
+        <!--        <item name="android:textStyle">bold</item>-->
+        <!--        <item name="android:textAllCaps">false</item>-->
+        <!--        <item name="android:paddingTop">8dp</item>-->
+        <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="iconTint">@color/colorPrimary</item>
     </style>
 
     <style name="Button.PrimaryFull" parent="Widget.MaterialComponents.Button">
-<!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-<!--        <item name="android:textStyle">bold</item>-->
-<!--        <item name="android:textAllCaps">false</item>-->
-<!--        <item name="android:paddingTop">8dp</item>-->
-<!--        <item name="android:paddingBottom">8dp</item>-->
+        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
+        <!--        <item name="android:textStyle">bold</item>-->
+        <!--        <item name="android:textAllCaps">false</item>-->
+        <!--        <item name="android:paddingTop">8dp</item>-->
+        <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="backgroundTint">@color/colorPrimary</item>
         <item name="iconTint">@android:color/white</item>
     </style>
 
 
-
-
-
     <style name="Button.DangerOutline" parent="Widget.MaterialComponents.Button.OutlinedButton">
-<!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-<!--        <item name="android:textStyle">bold</item>-->
-<!--        <item name="android:textAllCaps">false</item>-->
+        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
+        <!--        <item name="android:textStyle">bold</item>-->
+        <!--        <item name="android:textAllCaps">false</item>-->
         <item name="android:textColor">@color/red_400</item>
-<!--        <item name="android:paddingTop">8dp</item>-->
-<!--        <item name="android:paddingBottom">8dp</item>-->
+        <!--        <item name="android:paddingTop">8dp</item>-->
+        <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="backgroundTint">@android:color/white</item>
         <item name="iconTint">@color/red_400</item>
     </style>
 
     <style name="Button.DangerFull" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-<!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-<!--        <item name="android:textStyle">bold</item>-->
-<!--        <item name="android:textAllCaps">false</item>-->
-<!--        <item name="android:paddingTop">8dp</item>-->
-<!--        <item name="android:paddingBottom">8dp</item>-->
+        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
+        <!--        <item name="android:textStyle">bold</item>-->
+        <!--        <item name="android:textAllCaps">false</item>-->
+        <!--        <item name="android:paddingTop">8dp</item>-->
+        <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="backgroundTint">@color/red_400</item>
         <item name="iconTint">@android:color/white</item>
     </style>
+
+    <style name="Button.DangerText" parent="Widget.MaterialComponents.Button.TextButton">
+        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
+        <!--        <item name="android:textStyle">bold</item>-->
+        <!--        <item name="android:textAllCaps">false</item>-->
+        <!--        <item name="android:paddingTop">8dp</item>-->
+        <!--        <item name="android:paddingBottom">8dp</item>-->
+        <item name="android:textColor">@color/red_400</item>
+        <item name="iconTint">@color/red_400</item>
+    </style>
 </resources>

app/src/main/res/values/config.xml

@@ -26,8 +26,9 @@
     <item name="nav_prod_ordine_lavorazione" type="id" />
     <item name="nav_prod_recupero_materiale" type="id" />
     <item name="nav_pv_ordini_acquisto" type="id" />
-    <item name="nav_pv_ordini_acquisto_trasmessi" type="id"/>
-    <item name="nav_prod_rientro_merce" type="id"/>
+    <item name="nav_pv_ordini_acquisto_trasmessi" type="id" />
+    <item name="nav_prod_rientro_merce" type="id" />
+    <item name="nav_prod_linee" type="id" />
     <item name="nav_settings" type="id" />
     <item name="nav_logout" type="id" />
     <item name="nav_pv_doc_interni" type="id" />

app/src/main/res/values/strings.xml

@@ -45,6 +45,7 @@
     <string name="waiting">Waiting</string>
     <string name="loading">Loading</string>
     <string name="completed">Completed</string>
+    <string name="success">Success</string>
     <string name="search">Search&#8230;</string>
     <string name="login">Login</string>
     <string name="permission_request_message">Permissions are required for app to work properly</string>
@@ -117,6 +118,7 @@
     <string name="scan_item">Please scan an <b>item</b> barcode</string>
     <string name="extra_item">Extra item</string>
     <string name="piece">Piece</string>
+    <string name="scan_lu_to_deposit">Please scan a <b>LU barcode</b> to deposit</string>
 
     <string name="password_error_length">between 3 and 30 alphanumeric characters</string>
     <string name="username_error_not_valid">enter a valid username</string>
@@ -283,6 +285,10 @@
 
     <string name="placement">Placement</string>
     <string name="message_print_packing_list">Do you want print a %s?</string>
+    <string name="message_print_packing_list_on_close_order">Do you want print the packing lists of the closed orders?</string>
+    <string name="message_print_SSCC_list_on_close_order">Do you want print the SSCC labels for the closed orders?</string>
+    <string name="action_print_SSCC_only_remaining">Print only new labels</string>
+    <string name="action_print_SSCC_all">Print all labels</string>
     <string name="button_create_new_ul">Create new LU</string>
     <string name="button_view_basket_ul">View basket</string>
     <string name="title_open_lu">Open LU</string>
@@ -392,4 +398,21 @@
     <string name="newly_inserted_prod">Newly added product</string>
     <string name="doc_interni_select_row_to_edit">Select document row to edit</string>
     <string name="incoming_cnf">Incoming packages</string>
+    <string name="nav_prod_linee_title">Production lines</string>
+    <string name="no_line_available">No line available</string>
+    <string name="in_progress">in progress</string>
+    <string name="stand_by">Stand by</string>
+    <string name="stopped">Stopped</string>
+    <string name="risorse_impostate">Resources set</string>
+    <string name="orders_in_progress">Orders in progress</string>
+    <string name="production_in_progress">Production in progress</string>
+    <string name="ridistribuisci_risorse">Set resources</string>
+    <string name="avvia_nuova_produzione">Start production</string>
+    <string name="arresta_produzione">Stop production</string>
+    <string name="inizio_produzione">Production start</string>
+    <string name="ultima_produzione">Last production</string>
+    <string name="nessuna_linea_disponibile">No production line available</string>
+    <string name="line_details">Line details</string>
+    <string name="materiali_versati">Deposited products</string>
+    <string name="scan_lu_to_recover">Please scan the <b>LU barcode</b> to recover</string>
 </resources>

app/src/main/res/values/values.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <item name="large_layout" type="bool">false</item>
+
+</resources>