From 86c7be4e7da5f59842c4f72d8c687cfda584ca38 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 22 Feb 2022 09:30:09 +0100 Subject: [PATCH] Implementato flag per abilitare la scansione tramite barcode articoli --- .../core/rest/consumers/OrdiniRESTConsumer.java | 6 +++--- .../core/rest/consumers/OrdiniRESTConsumerService.java | 2 +- .../integrywmsnative/core/rest/model/SitArtOrdDTO.java | 9 +++++++++ .../OrdiniUscitaElencoViewModel.java | 2 +- .../gest/spedizione/SpedizioneViewModel.java | 5 +++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 94ed5c74..90a58958 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -125,7 +125,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class); service.getOrdiniInevasi(codMdep, gestione.getText()) - .enqueue(new Callback>>() { + .enqueue(new Callback<>() { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> { @@ -145,7 +145,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { }); } - public void retrieveListaArticoliFromOrdiniUscita(List orders, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List orders, RunnableArgs> onComplete, RunnableArgs onFailed) { List getPickingListDTOs = Stream.of(orders) .map(x -> new GetPickingListDTO() .setData(x.getDataOrdS()) @@ -157,7 +157,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90); - service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback>>() { + service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java index c373f20f..3dfeebca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java @@ -16,7 +16,7 @@ import retrofit2.http.Query; public interface OrdiniRESTConsumerService { @POST("wms/getArticoliFromOrdini") - Call>> getArticoliFromOrdini(@Body List pickingListDTO); + Call>> getArticoliFromOrdini(@Query("codMdep") String codMdep, @Body List pickingListDTO); @POST("wms/getSuggestedPickingList") Call>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List sitArtOrdDTOList); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java index 5a172f92..baff542f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java @@ -19,6 +19,7 @@ public class SitArtOrdDTO { private String idViaggio; private String codMdep; private boolean flagEnablePickManuale; + private boolean flagEnableScanArt; private String codMgrp; private String descrizioneMgrp; private String codMsgr; @@ -145,6 +146,14 @@ public class SitArtOrdDTO { return this; } + public boolean isFlagEnableScanArt() { + return flagEnableScanArt; + } + + public SitArtOrdDTO setFlagEnableScanArt(boolean flagEnableScanArt) { + this.flagEnableScanArt = flagEnableScanArt; + return this; + } public String getCodMgrp() { return codMgrp; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java index 2a990e53..6e1de52a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java @@ -128,7 +128,7 @@ public class OrdiniUscitaElencoViewModel { .map(x -> (OrdineUscitaInevasoDTO) x) .toList(); - this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrdersBase, sitArts -> { + this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(mCurrentCodMdep, selectedOrdersBase, sitArts -> { if(mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) { sitArts = Stream.of(sitArts) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 806a757d..99bcd674 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -708,6 +708,7 @@ public class SpedizioneViewModel { List matchPickingObject = Stream.of(pickingList) .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart())) + .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt()) .filter(x -> { MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null; return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag())); @@ -742,8 +743,8 @@ public class SpedizioneViewModel { this.getPickingList().postValue(pickingList); } else { MtbColt refMtbColt = matchedItem.getRefMtbColt(); - MtbColr refMtbColr = refMtbColt != null ? matchedItem.getRefMtbColt().getMtbColr().get(0) : null; - this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, false); + MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null; + this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null); } } else {