diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java index 7716fe3e..caf55a66 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java @@ -2,12 +2,15 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.rest; import androidx.annotation.NonNull; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import javax.inject.Inject; import javax.inject.Singleton; import it.integry.integrywmsnative.core.model.MtbAart; @@ -51,6 +54,7 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer { keyMap.put("ser_collo", x.getSerCollo()); keyMap.put("num_collo", x.getNumCollo()); keyMap.put("cod_mart", x.getCodMart()); + keyMap.put("partita_mag", x.getPartitaMag()); keyMap.put("barcode_ul_out", x.getBarcodeUlOut()); return keyMap; }, Collectors.toList())); @@ -63,10 +67,7 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer { Objects.equals(x.getNumCollo(), ulKey.get("num_collo")) && Objects.equals(x.getCodMart(), ulKey.get("cod_mart")) && Objects.equals(x.getPartitaMag(), ulKey.get("partita_mag")) && - Objects.equals(x.getGestioneRif(), ulKey.get("gestione_rif")) && - Objects.equals(x.getDataColloRif(), ulKey.get("data_collo_rif")) && - Objects.equals(x.getSerColloRif(), ulKey.get("ser_collo_rif")) && - Objects.equals(x.getNumColloRif(), ulKey.get("num_collo_rif")) + Objects.equals(x.getBarcodeUlOut(), ulKey.get("barcode_ul_out")) ).collect(Collectors.toUnmodifiableList()); ulKey.put("qta_col", matchingUls.stream().map(HistoryVersamentoProdULRestDTO::getQtaCol) @@ -97,32 +98,34 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer { var qtaCol = (BigDecimal) key.get("qta_col"); var numCnf = (BigDecimal) key.get("num_cnf"); - newUlList.add(new HistoryVersamentoProdULDTO() - .setGestione(restDTO.getGestione()) - .setDataCollo(restDTO.getDataCollo()) - .setSerCollo(restDTO.getSerCollo()) - .setNumCollo(restDTO.getNumCollo()) - .setSegno(restDTO.getSegno()) - .setCodMart(restDTO.getCodMart()) - .setCodCol(restDTO.getCodCol()) - .setCodTagl(restDTO.getCodTagl()) - .setCodJfas(restDTO.getCodJfas()) - .setDescrizioneArt(restDTO.getDescrizioneArt()) - .setDescrizioneFase(restDTO.getDescrizioneFase()) - .setQtaCol(qtaCol) - .setQtaCnf(restDTO.getQtaCnf()) - .setNumCnf(numCnf) - .setPartitaMag(restDTO.getPartitaMag()) - .setCodJcom(restDTO.getCodJcom()) - .setDatetimeRow(restDTO.getDatetimeRow()) - .setUntMis(restDTO.getUntMis()) - .setGestioneRif(restDTO.getGestioneRif()) - .setDataColloRif(restDTO.getDataColloRif()) - .setSerColloRif(restDTO.getSerColloRif()) - .setNumColloRif(restDTO.getNumColloRif()) - .setOrdini(ordineList)); + newUlList.add(new HistoryVersamentoProdULDTO() + .setGestione(restData.getGestione()) + .setDataCollo(restData.getDataCollo()) + .setSerCollo(restData.getSerCollo()) + .setNumCollo(restData.getNumCollo()) + .setSegno(restData.getSegno()) + .setCodMart(restData.getCodMart()) + .setCodCol(restData.getCodCol()) + .setCodTagl(restData.getCodTagl()) + .setCodJfas(restData.getCodJfas()) + .setDescrizioneArt(restData.getDescrizioneArt()) + .setDescrizioneFase(restData.getDescrizioneFase()) + .setQtaCol(qtaCol) + .setQtaCnf(restData.getQtaCnf()) + .setNumCnf(numCnf) + .setPartitaMag(restData.getPartitaMag()) + .setCodJcom(restData.getCodJcom()) + .setDatetimeRow(restData.getDatetimeRow()) + .setUntMis(restData.getUntMis()) + .setBarcodeUlOut(restData.getBarcodeUlOut()) + .setCodMdepOut(restData.getCodMdepOut()) + .setPosizioneOut(restData.getPosizioneOut()) + .setBarcodeUlIn(restData.getBarcodeUlIn()) + .setCodMdepIn(restData.getCodMdepIn()) + .setPosizioneIn(restData.getPosizioneIn()) + .setOrdini(listaOrdini)); - }); + }); if (!newUlList.isEmpty()) {