Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix after merge

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-09-17 15:21:47 +02:00
parent 5dc94cbd8f
commit 40e46e6aac
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
View File

@@ -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)
@@ -98,29 +99,31 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer {
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())
.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(restDTO.getQtaCnf())
.setQtaCnf(restData.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));
.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));
});