Modificati in POST i servizi di ricerca in Rettifica Giacenze.

Implementato nuovo servizio di retrieve articolo by codMart.

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
@@ -19,6 +18,7 @@ import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -59,14 +59,16 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     public static void getByCodMartsStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
 
-        String joinedCods = Stream.of(codMartToFind)
+        var codMarts = Stream.of(codMartToFind)
                 .withoutNulls()
-                .distinct()
+                .distinct().toList();
-                .collect(Collectors.joining(","));
 
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(joinedCods).enqueue(new Callback<>() {
+        articoloRESTConsumer
+                .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
+                        .setCodMarts(codMarts))
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                         analyzeAnswer(response, "getByCodMart", (m) -> {
@@ -103,7 +105,10 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     public void getByCodMart(String codMartToFind, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed) {
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(codMartToFind).enqueue(new Callback<>() {
+        articoloRESTConsumer.getByCodMart(
+                        new RetrieveArticoloByCodMartRequestDTO()
+                                .setCodMarts(Collections.singletonList(codMartToFind)))
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                         analyzeAnswer(response, "getByCodMart", (m) -> {

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

@@ -5,7 +5,9 @@ import java.util.List;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
@@ -16,8 +18,8 @@ public interface ArticoloRESTConsumerService {
     @POST("SM2getArticoloByBarcode")
     Call<ServiceRESTResponse<MtbAart>> getByBarcodeProd(@Query("barcode") String barcodeProd);
 
-    @GET("SM2getArticoloByCodMart")
+    @POST("wms/articolo/retrieveByCodMart")
-    Call<ServiceRESTResponse<MtbAart>> getByCodMart(@Query("codMart") String barcodeProd);
+    Call<ServiceRESTResponse<MtbAart>> getByCodMart(@Body RetrieveArticoloByCodMartRequestDTO retrieveArticoloByCodMartRequest);
 
     @GET("getProductLotStatus")
     Call<ServiceRESTResponse<List<StatoArticoloDTO>>> getStatoPartita(@Query("codMart") String codMart, @Query("partitaMag") String partitaMag);

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

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+import java.util.List;
+
+public class RetrieveArticoloByCodMartRequestDTO {
+
+    private List<String> codMarts;
+
+    public List<String> getCodMarts() {
+        return codMarts;
+    }
+
+    public RetrieveArticoloByCodMartRequestDTO setCodMarts(List<String> codMarts) {
+        this.codMarts = codMarts;
+        return this;
+    }
+}

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

@@ -178,7 +178,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     v -> initBottomSheetDialogFilter(filterChipDTO));
 
             switch (filterChipDTO.getID()) {
-                case AccettazionePickingBindings.COD_ART_FILTER_ID:
+                case AccettazionePickingBindings.COD_ART_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentCodArtPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -199,8 +199,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                         }
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentCodArtPredicate().set(null));
-                    break;
+                }
-                case AccettazionePickingBindings.DESCR_FILTER_ID:
+                case AccettazionePickingBindings.DESCR_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -221,8 +221,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                         }
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDescrPredicate().set(null));
-                    break;
+                }
-                case AccettazionePickingBindings.POS_FILTER_ID:
+                case AccettazionePickingBindings.POS_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentPosPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -243,7 +243,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                         }
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentPosPredicate().set(null));
-                    break;
+                }
             }
 
             this.mBindings.filterChipsGroup.addView(filterChipView);
@@ -262,7 +262,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .getFilterLayoutView();
 
         switch (filterChipDTO.getID()) {
-            case AccettazionePickingBindings.COD_ART_FILTER_ID:
+            case AccettazionePickingBindings.COD_ART_FILTER_ID ->
                     ((FilterCodArtLayoutView) filterLayoutView)
                             .setAll(mAppliedFilterViewModel.getAllCodArts())
                             .setAvailable(mAppliedFilterViewModel.getAvailableCodArts())
@@ -273,8 +273,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                             mAppliedFilterViewModel.getCurrentCodArtPredicate().get())
                                     .map(x -> x.getSitArtOrdDTO().getCodMart())
                                     .toList());
-                break;
+            case AccettazionePickingBindings.DESCR_FILTER_ID ->
-            case AccettazionePickingBindings.DESCR_FILTER_ID:
                     ((FilterDescrLayoutView) filterLayoutView)
                             .setAll(mAppliedFilterViewModel.getAllDescrs())
                             .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
@@ -285,8 +284,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                             mAppliedFilterViewModel.getCurrentDescrPredicate().get())
                                     .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
                                     .toList());
-                break;
+            case AccettazionePickingBindings.POS_FILTER_ID ->
-            case AccettazionePickingBindings.POS_FILTER_ID:
                     ((FilterPosizioneLayoutView) filterLayoutView)
                             .setAll(mAppliedFilterViewModel.getAllPos())
                             .setAvailable(mAppliedFilterViewModel.getAvailablePos())
@@ -297,8 +295,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                                             mAppliedFilterViewModel.getCurrentPosPredicate().get())
                                     .map(x -> x.getMtbAart().getPosizione())
                                     .toList());
-                break;
-
         }
 
         if (!filterLayoutView.isAdded())
@@ -373,9 +369,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     private void refreshList() {
-        //this.onLoadingStarted();
-
-        //new Thread(() -> {
 
         runOnUiThread(() -> {
             List<PickingObjectDTO> tmpList;
@@ -393,7 +386,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
             this.mAccettazioneMutableData.addAll(list);
             this.noItemsToPick.set(!isThereAnyItemToPick(tmpList));
 
-            //this.onLoadingEnded();
         });
     }
 
@@ -402,21 +394,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
                 .toList();
 
-        List<AccettazioneListModel> sortedList = null;
+        return switch (mCurrentOrderBy) {
-
+            case COD_ART_FOR -> convertDataModelToListModel__CodArtForn(tmpList);
-        switch (mCurrentOrderBy) {
+            case DESCR_ART -> convertDataModelToListModel__DescrArt(tmpList);
-            case COD_ART_FOR:
+            case RAG_SOC_COM -> convertDataModelToListModel__RagSocCom(tmpList);
-                sortedList = convertDataModelToListModel__CodArtForn(tmpList);
+        };
-                break;
-            case DESCR_ART:
-                sortedList = convertDataModelToListModel__DescrArt(tmpList);
-                break;
-            case RAG_SOC_COM:
-                sortedList = convertDataModelToListModel__RagSocCom(tmpList);
-                break;
-        }
-
-        return sortedList;
     }
 
     private List<AccettazioneListModel> convertDataModelToListModel__CodArtForn(List<PickingObjectDTO> dataList) {

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

@@ -183,7 +183,13 @@ public class RettificaGiacenzeViewModel {
         mRettificaGiacenzeRESTConsumer.searchArtForn(codAlis, queryText, listaArts -> {
             this.sendOnLoadingEnded();
 
-            List<MtbAart> mtbAarts = Stream.of(listaArts).map(x -> (MtbAart) x.getMtbAart()).toList();
+            List<MtbAart> mtbAarts = null;
+
+            if (listaArts != null)
+                mtbAarts = Stream.of(listaArts)
+                        .map(x -> (MtbAart) x.getMtbAart())
+                        .toList();
+
             dispatchArts(mtbAarts);
         }, this::sendError);
     }

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByBarcodeOrCodMartRequestDTO.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
+
+public class SearchArticoloByBarcodeOrCodMartRequestDTO {
+
+    private String codMartOrBarcode;
+
+    public String getCodMartOrBarcode() {
+        return codMartOrBarcode;
+    }
+
+    public SearchArticoloByBarcodeOrCodMartRequestDTO setCodMartOrBarcode(String codMartOrBarcode) {
+        this.codMartOrBarcode = codMartOrBarcode;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByCodArtFornOrDescrizioneRequestDTO.java

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
+
+public class SearchArticoloByCodArtFornOrDescrizioneRequestDTO {
+
+    private String codAlis;
+
+    private String codArtFornOrDescrizione;
+
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public SearchArticoloByCodArtFornOrDescrizioneRequestDTO setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+        return this;
+    }
+
+    public String getCodArtFornOrDescrizione() {
+        return codArtFornOrDescrizione;
+    }
+
+    public SearchArticoloByCodArtFornOrDescrizioneRequestDTO setCodArtFornOrDescrizione(String codArtFornOrDescrizione) {
+        this.codArtFornOrDescrizione = codArtFornOrDescrizione;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java

@@ -19,7 +19,9 @@ import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.SaveDocFromPickingRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByBarcodeOrCodMartRequestDTO;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByBarcodeOrCodMartResponseDTO;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneRequestDTO;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneResponseDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -48,7 +50,9 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
     public void searchArtForn(String codAlis, String codArtForOrDescr, RunnableArgs<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>> onComplete, RunnableArgs<Exception> onError) {
         final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
-        service.searchByCodArtFornOrDescrizione(codAlis, codArtForOrDescr)
+        service.searchByCodArtFornOrDescrizione(new SearchArticoloByCodArtFornOrDescrizioneRequestDTO()
+                        .setCodAlis(codAlis)
+                        .setCodArtFornOrDescrizione(codArtForOrDescr))
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> call,
@@ -69,7 +73,8 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
     public void searchArtInt(String codMartOrBarcodeOrDescr, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onError) {
         final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
-        service.searchByCodMartOrBarcode(codMartOrBarcodeOrDescr)
+        service.searchByCodMartOrBarcode(new SearchArticoloByBarcodeOrCodMartRequestDTO()
+                        .setCodMartOrBarcode(codMartOrBarcodeOrDescr))
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> call,

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java

@@ -4,24 +4,24 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.SaveDocFromPickingRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByBarcodeOrCodMartRequestDTO;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByBarcodeOrCodMartResponseDTO;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneRequestDTO;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneResponseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
-import retrofit2.http.GET;
 import retrofit2.http.POST;
-import retrofit2.http.Query;
 
 public interface RettificaGiacenzeRESTConsumerService {
 
 
-    @GET("wms/articolo/searchByCodArtFornOrDescrizione")
+    @POST("wms/articolo/searchByCodArtFornOrDescrizione")
     Call<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> searchByCodArtFornOrDescrizione(
-            @Query("codAlis") String codAlis,
+            @Body SearchArticoloByCodArtFornOrDescrizioneRequestDTO searchArticoloByCodArtFornOrDescrizioneRequest);
-            @Query("codArtFornOrDescrizione") String codMartOrBarcode);
 
-    @GET("wms/articolo/searchByCodMartOrBarcode")
+    @POST("wms/articolo/searchByCodMartOrBarcode")
-    Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> searchByCodMartOrBarcode(@Query("codMartOrBarcode") String codMartOrBarcode);
+    Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> searchByCodMartOrBarcode(
+            @Body SearchArticoloByBarcodeOrCodMartRequestDTO searchArticoloByBarcodeOrCodMartRequest);
 
     @POST("saveDocFromPickingPvm")
     Call<ServiceRESTResponse<Void>> saveDocFromPickingPvm(@Body SaveDocFromPickingRequestDTO saveDocFromPickingRequestDTO);