Rinominato DialogChooseArtsFromListaArts in DialogChooseArtsFromMtbColrList

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

@@ -92,8 +92,8 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetM
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListComponent;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
@@ -148,7 +148,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         ProdOrdineProduzioneElencoModule.class,
         ProdRecuperoMaterialeModule.class,
         ProdVersamentoMaterialeModule.class,
-        DialogChooseArtsFromListaArtsModule.class,
+        DialogChooseArtsFromMtbColrListModule.class,
         DocInterniModule.class,
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
@@ -243,7 +243,7 @@ public interface MainApplicationComponent {
 
     ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
 
-    DialogChooseArtsFromListaArtsComponent.Factory dialogChooseArtsFromListaArtsComponent();
+    DialogChooseArtsFromMtbColrListComponent.Factory dialogChooseArtsFromListaArtsComponent();
 
     DocInterniComponent.Factory docInterniComponent();
 

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

@@ -31,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
@@ -268,4 +269,10 @@ public class MainApplicationModule {
         return new ColliLavorazioneRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer() {
+        return new MagazzinoAutomaticoRESTConsumer();
+    }
+
 }

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

@@ -2,16 +2,16 @@ package it.integry.integrywmsnative.core.model;
 
 import androidx.databinding.Observable;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsItemModel;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListItemModel;
 
 public class CheckableMtbColr {
 
 
-    private DialogChooseArtsFromListaArtsItemModel item;
+    private DialogChooseArtsFromMtbColrListItemModel item;
     private BindableBoolean checked = new BindableBoolean(false);
     private BindableBoolean hidden = new BindableBoolean(false);
 
-    public CheckableMtbColr(DialogChooseArtsFromListaArtsItemModel item) {
+    public CheckableMtbColr(DialogChooseArtsFromMtbColrListItemModel item) {
         this.item = item;
 
         this.item.getHidden().addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
@@ -22,11 +22,11 @@ public class CheckableMtbColr {
         });
     }
 
-    public DialogChooseArtsFromListaArtsItemModel getItem() {
+    public DialogChooseArtsFromMtbColrListItemModel getItem() {
         return item;
     }
 
-    public CheckableMtbColr setItem(DialogChooseArtsFromListaArtsItemModel item) {
+    public CheckableMtbColr setItem(DialogChooseArtsFromMtbColrListItemModel item) {
         this.item = item;
 
         this.item.getHidden().addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {

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

@@ -0,0 +1,35 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+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.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
+
+
+    public void pickItems(MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = RESTBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
+
+        magazzinoAutomaticoRESTConsumerService.pickItems(magazzinoAutomaticoPickItemsRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "magazzino-automatico/pickItems", data -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
+}

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

@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface MagazzinoAutomaticoRESTConsumerService {
+
+    @POST("wms/magazzino-automatico/pickItems")
+    Call<ServiceRESTResponse<Void>> pickItems(@Body MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO);
+}

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

@@ -0,0 +1,67 @@
+package it.integry.integrywmsnative.core.rest.model.magazzino_automatico;
+
+import java.math.BigDecimal;
+
+public class MagazzinoAutomaticoPickItemRequestDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private String untMis;
+    private BigDecimal qtaTot;
+    private BigDecimal qtaCnf;
+    private BigDecimal numCnf;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public BigDecimal getQtaTot() {
+        return qtaTot;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setQtaTot(BigDecimal qtaTot) {
+        this.qtaTot = qtaTot;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public MagazzinoAutomaticoPickItemRequestDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+}

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

@@ -0,0 +1,59 @@
+package it.integry.integrywmsnative.core.rest.model.magazzino_automatico;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class MagazzinoAutomaticoPickItemsRequestDTO {
+
+    private boolean shouldCreateUDS;
+    private String defaultGestioneOfNewUDS;
+    private List<MagazzinoAutomaticoPickOrderRequestDTO> ordersOfNewUDS;
+    private MtbColt inputMtbColt;
+    private List<MagazzinoAutomaticoPickItemRequestDTO> itemsToPick;
+
+    public boolean isShouldCreateUDS() {
+        return shouldCreateUDS;
+    }
+
+    public MagazzinoAutomaticoPickItemsRequestDTO setShouldCreateUDS(boolean shouldCreateUDS) {
+        this.shouldCreateUDS = shouldCreateUDS;
+        return this;
+    }
+
+    public String getDefaultGestioneOfNewUDS() {
+        return defaultGestioneOfNewUDS;
+    }
+
+    public MagazzinoAutomaticoPickItemsRequestDTO setDefaultGestioneOfNewUDS(String defaultGestioneOfNewUDS) {
+        this.defaultGestioneOfNewUDS = defaultGestioneOfNewUDS;
+        return this;
+    }
+
+    public List<MagazzinoAutomaticoPickOrderRequestDTO> getOrdersOfNewUDS() {
+        return ordersOfNewUDS;
+    }
+
+    public MagazzinoAutomaticoPickItemsRequestDTO setOrdersOfNewUDS(List<MagazzinoAutomaticoPickOrderRequestDTO> ordersOfNewUDS) {
+        this.ordersOfNewUDS = ordersOfNewUDS;
+        return this;
+    }
+
+    public MtbColt getInputMtbColt() {
+        return inputMtbColt;
+    }
+
+    public MagazzinoAutomaticoPickItemsRequestDTO setInputMtbColt(MtbColt inputMtbColt) {
+        this.inputMtbColt = inputMtbColt;
+        return this;
+    }
+
+    public List<MagazzinoAutomaticoPickItemRequestDTO> getItemsToPick() {
+        return itemsToPick;
+    }
+
+    public MagazzinoAutomaticoPickItemsRequestDTO setItemsToPick(List<MagazzinoAutomaticoPickItemRequestDTO> itemsToPick) {
+        this.itemsToPick = itemsToPick;
+        return this;
+    }
+}

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

@@ -0,0 +1,38 @@
+package it.integry.integrywmsnative.core.rest.model.magazzino_automatico;
+
+import java.time.LocalDate;
+
+public class MagazzinoAutomaticoPickOrderRequestDTO {
+
+    private LocalDate dataCons;
+    private LocalDate dataOrd;
+    private String gestione;
+    private int numOrd;
+
+    public MagazzinoAutomaticoPickOrderRequestDTO(LocalDate dataOrd, String gestione, int numOrd) {
+        this.dataOrd = dataOrd;
+        this.gestione = gestione;
+        this.numOrd = numOrd;
+    }
+
+    public LocalDate getDataOrd() {
+        return dataOrd;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public int getNumOrd() {
+        return numOrd;
+    }
+
+    public LocalDate getDataCons() {
+        return dataCons;
+    }
+
+    public MagazzinoAutomaticoPickOrderRequestDTO setDataCons(LocalDate dataCons) {
+        this.dataCons = dataCons;
+        return this;
+    }
+}

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

@@ -55,7 +55,7 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
@@ -288,7 +288,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     @Override
     public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
-        DialogChooseArtsFromListaArts
+        DialogChooseArtsFromMtbColrList
                 .newInstance(mtbColrsToPick, mtbAart, onComplete, () -> {
                     onAbort.run();
                     BarcodeManager.enable();

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

@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsu
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -32,7 +33,8 @@ public class SpedizioneModule {
                                                     PosizioniRESTConsumer posizioniRESTConsumer,
                                                     DocumentiRESTConsumer documentiRESTConsumer,
                                                     ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
-                                                    ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
+                                                    ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
+                                                    MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer) {
         return new SpedizioneViewModel(articoloRESTConsumer,
                 barcodeRESTConsumer,
                 colliDataRecoverService,
@@ -42,7 +44,8 @@ public class SpedizioneModule {
                 posizioniRESTConsumer,
                 documentiRESTConsumer,
                 colliSpedizioneRESTConsumer,
-                colliLavorazioneRESTConsumer);
+                colliLavorazioneRESTConsumer,
+                magazzinoAutomaticoRESTConsumer);
     }
 
 }

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

@@ -57,6 +57,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsu
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -66,6 +67,8 @@ import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickOrderRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanUDSBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
@@ -127,10 +130,12 @@ public class SpedizioneViewModel {
     private final ColliSpedizioneRESTConsumer mColliSpedizioneRESTConsumer;
     private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
 
+    private final MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer;
+
     private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
 
     @Inject
-    public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, DocumentiRESTConsumer documentiRESTConsumer, ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer, ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
+    public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, DocumentiRESTConsumer documentiRESTConsumer, ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer, ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer, MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliDataRecoverService = colliDataRecoverService;
@@ -141,6 +146,7 @@ public class SpedizioneViewModel {
         this.mDocumentiRESTConsumer = documentiRESTConsumer;
         this.mColliSpedizioneRESTConsumer = colliSpedizioneRESTConsumer;
         this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
+        this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
     }
 
 
@@ -481,8 +487,23 @@ public class SpedizioneViewModel {
             return;
         }
 
-        if(foundPosizione.isMagazzinoAutomatico()) {
+        if (foundPosizione.isMagazzinoAutomatico()) {
             //Eseguo picking da magazzino automatico
+
+
+            final List<MagazzinoAutomaticoPickOrderRequestDTO> orders = this.mTestateOrdini.stream()
+                    .map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(UtilityDate.toLocalDate(x.getDataOrdD()), x.getGestione(), x.getNumOrd())
+                            .setDataCons(UtilityDate.toLocalDate(x.getDataConsD())))
+                    .collect(Collectors.toList());
+
+            var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPickItemsRequestDTO()
+                    .setShouldCreateUDS(true)
+                    .setDefaultGestioneOfNewUDS(mDefaultGestioneOfUL.getText())
+                    .setOrdersOfNewUDS(orders);
+
+            mMagazzinoAutomaticoRESTConsumer.pickItems(magazzinoAutomaticoPickRequest, () -> {
+
+            }, this::sendError);
             return;
         }
 
@@ -497,7 +518,7 @@ public class SpedizioneViewModel {
 
             mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
                 if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
-                    searchArtFromUL(mtbColt, onComplete);
+                    this.searchArtFromUL(mtbColt, onComplete);
                 } else {
                     this.sendError(new EmptyLUException());
                 }

app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java

@@ -44,7 +44,7 @@ import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.ui.UltimiArriviFornitoreListAdapter;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.dialog.DialogUltimiArriviFornitoreFiltroAvanzato;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
 
 /**
  * A simple {@link BaseFragment} subclass.
@@ -255,7 +255,7 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl
     @Override
     public void onMtbColtScanned(MtbColt scannedMtbColt) {
 
-        DialogChooseArtsFromListaArts
+        DialogChooseArtsFromMtbColrList
                 .newInstance(scannedMtbColt.getMtbColr(), items -> {
 
                     List<MtbAart> mtbAarts = Stream.of(items)

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java

@@ -37,7 +37,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
@@ -170,7 +170,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     @Override
     public void onArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         this.requireActivity().runOnUiThread(() -> {
-            DialogChooseArtsFromListaArts
+            DialogChooseArtsFromMtbColrList
                     .newInstance(mtbColrList, onComplete, onAbort)
                     .show(requireActivity().getSupportFragmentManager(), "tag");
         });

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

@@ -1,15 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;
-
-import dagger.Subcomponent;
-
-@Subcomponent
-public interface DialogChooseArtsFromListaArtsComponent {
-
-    @Subcomponent.Factory
-    interface Factory {
-        DialogChooseArtsFromListaArtsComponent create();
-    }
-
-    void inject(DialogChooseArtsFromListaArts dialogChooseArtsFromListaArts);
-
-}

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

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;
-
-import dagger.Module;
-
-@Module(subcomponents = DialogChooseArtsFromListaArtsComponent.class)
-public class DialogChooseArtsFromListaArtsModule {
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;
+package it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -41,7 +41,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsLayoutBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 
-public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
+public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment {
 
     @Inject
     BarcodeRESTConsumer barcodeRESTConsumer;
@@ -52,22 +52,23 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     private Context context;
 
     private DialogChooseArtsFromListaArtsLayoutBinding mBindings;
-    private DialogChooseArtsFromListaArtsAdapter currentAdapter;
+
+    private DialogChooseArtsFromMtbColrListAdapter currentAdapter;
 
     private final RunnableArgs<List<MtbColr>> mOnItemsChoosed;
     private final Runnable mOnAbort;
 
-    private final List<DialogChooseArtsFromListaArtsItemModel> mDataset;
+    private final List<DialogChooseArtsFromMtbColrListItemModel> mDataset;
 
     private int mBarcodeScannerIstanceID;
     private MtbAart selectedArt;
 
-    public static DialogChooseArtsFromListaArts newInstance(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
+    public static DialogChooseArtsFromMtbColrList newInstance(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
-        return new DialogChooseArtsFromListaArts(listaMtbColr, onItemsChoosed, onAbort);
+        return new DialogChooseArtsFromMtbColrList(listaMtbColr, onItemsChoosed, onAbort);
     }
 
-    public static DialogChooseArtsFromListaArts newInstance(List<MtbColr> listaMtbColr, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
+    public static DialogChooseArtsFromMtbColrList newInstance(List<MtbColr> listaMtbColr, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
-        DialogChooseArtsFromListaArts dialog = newInstance(listaMtbColr, onItemsChoosed, onAbort);
+        DialogChooseArtsFromMtbColrList dialog = newInstance(listaMtbColr, onItemsChoosed, onAbort);
         dialog.setSelectedArt(mtbAart);
         return dialog;
     }
@@ -76,7 +77,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
         this.selectedArt = mtbAart;
     }
 
-    private DialogChooseArtsFromListaArts(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
+    private DialogChooseArtsFromMtbColrList(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
         super();
 
         mOnItemsChoosed = onItemsChoosed;
@@ -90,7 +91,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                     mtbColr.setUntMis(mtbColr.getMtbAart().getUntMis());
                 }
 
-                mDataset.add(new DialogChooseArtsFromListaArtsItemModel().setMtbColr(mtbColr));
+                mDataset.add(new DialogChooseArtsFromMtbColrListItemModel().setMtbColr(mtbColr));
             }
         }
     }
@@ -148,7 +149,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
         mBindings.listaArts.setHasFixedSize(true);
         mBindings.listaArts.setLayoutManager(new LinearLayoutManager(context));
 
-        currentAdapter = new DialogChooseArtsFromListaArtsAdapter(context, mDataset);
+        currentAdapter = new DialogChooseArtsFromMtbColrListAdapter(context, mDataset);
         mBindings.listaArts.setAdapter(currentAdapter);
     }
 
@@ -203,7 +204,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
 
                 if (!UtilityString.isNullOrEmpty(newText) && newText.trim().length() > 2) {
                     String finalNewText = newText;
-                    List<DialogChooseArtsFromListaArtsItemModel> foundRowsList = Stream.of(mDataset)
+                    List<DialogChooseArtsFromMtbColrListItemModel> foundRowsList = Stream.of(mDataset)
                             .filter(x -> {
                                 String codMart = x.getMtbColr().getMtbAart().getCodMart().toLowerCase();
                                 String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa().toLowerCase();
@@ -331,7 +332,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     private void searchArtInList(MtbAart mtbAart, Ean128Model ean128Model) {
         removeListFilter();
 
-        List<DialogChooseArtsFromListaArtsItemModel> foundRowsList = Stream.of(mDataset)
+        List<DialogChooseArtsFromMtbColrListItemModel> foundRowsList = Stream.of(mDataset)
                 .filter(x -> x.getMtbColr().getMtbAart().getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
                         !x.isHidden())
                 .toList();
@@ -348,7 +349,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
 
 
     private void removeListFilter() {
-        for (DialogChooseArtsFromListaArtsItemModel itemModel : mDataset) {
+        for (DialogChooseArtsFromMtbColrListItemModel itemModel : mDataset) {
             itemModel.setHidden(false);
         }
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListAdapter.java

@@ -1,11 +1,12 @@
-package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;
+package it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list;
 
 import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.Observable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
 
 import com.annimon.stream.Stream;
 
@@ -21,7 +22,7 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsItemModelBinding;
 
-public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<DialogChooseArtsFromListaArtsAdapter.ViewHolder> {
+public class DialogChooseArtsFromMtbColrListAdapter extends RecyclerView.Adapter<DialogChooseArtsFromMtbColrListAdapter.ViewHolder> {
 
     protected Context mContext;
 
@@ -29,7 +30,7 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
     private HashMap<CheckableMtbColr, Integer> mDatasetPositions = new HashMap<>();
 
 
-    public DialogChooseArtsFromListaArtsAdapter(Context context, List<DialogChooseArtsFromListaArtsItemModel> myDataset) {
+    public DialogChooseArtsFromMtbColrListAdapter(Context context, List<DialogChooseArtsFromMtbColrListItemModel> myDataset) {
         mContext = context;
 
         if(myDataset != null) {
@@ -97,7 +98,7 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
     }
 
     @Override
-    public DialogChooseArtsFromListaArtsAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public DialogChooseArtsFromMtbColrListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         // create a new view
         DialogChooseArtsFromListaArtsItemModelBinding viewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.dialog_choose_arts_from_lista_arts__item_model, parent, false);
 
@@ -105,14 +106,14 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
     }
 
     @Override
-    public void onBindViewHolder(DialogChooseArtsFromListaArtsAdapter.ViewHolder holder, int position) {
+    public void onBindViewHolder(DialogChooseArtsFromMtbColrListAdapter.ViewHolder holder, int position) {
         CheckableMtbColr item = mDataset.get(position);
         holder.bind(item);
 
     }
 
     @Override
-    public void onViewRecycled(DialogChooseArtsFromListaArtsAdapter.ViewHolder holder) {
+    public void onViewRecycled(DialogChooseArtsFromMtbColrListAdapter.ViewHolder holder) {
         super.onViewRecycled(holder);
     }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListComponent.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogChooseArtsFromMtbColrListComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogChooseArtsFromMtbColrListComponent create();
+    }
+
+    void inject(DialogChooseArtsFromMtbColrList dialogChooseArtsFromMtbColrList);
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListItemModel.java

@@ -1,9 +1,9 @@
-package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;
+package it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list;
 
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.model.MtbColr;
 
-public class DialogChooseArtsFromListaArtsItemModel {
+public class DialogChooseArtsFromMtbColrListItemModel {
 
     private MtbColr mtbColr;
     private BindableBoolean hidden = new BindableBoolean(false);
@@ -12,7 +12,7 @@ public class DialogChooseArtsFromListaArtsItemModel {
         return mtbColr;
     }
 
-    public DialogChooseArtsFromListaArtsItemModel setMtbColr(MtbColr mtbColr) {
+    public DialogChooseArtsFromMtbColrListItemModel setMtbColr(MtbColr mtbColr) {
         this.mtbColr = mtbColr;
         return this;
     }
@@ -21,7 +21,7 @@ public class DialogChooseArtsFromListaArtsItemModel {
         return hidden.get();
     }
 
-    public DialogChooseArtsFromListaArtsItemModel setHidden(boolean hidden) {
+    public DialogChooseArtsFromMtbColrListItemModel setHidden(boolean hidden) {
         this.hidden.set(hidden);
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListModule.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list;
+
+import dagger.Module;
+
+@Module(subcomponents = DialogChooseArtsFromMtbColrListComponent.class)
+public class DialogChooseArtsFromMtbColrListModule {
+}