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

Merge branch 'feature/RefactoringGestioneColli' into master-beta
All checks were successful
WMS - Android (New)/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-03 11:48:15 +02:00
parent d5a86327d8 417172b31c
commit 0a55c644d7
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java
View File

@@ -16,6 +16,6 @@ public class JwtUtils {
.build() .build()
.parseSignedClaims(token); .parseSignedClaims(token);
return jws.getBody(); return jws.getPayload();
} }
} }

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

@@ -44,14 +44,16 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer {
List<HistoryVersamentoProdULDTO> newUlList = new ArrayList<>(); List<HistoryVersamentoProdULDTO> newUlList = new ArrayList<>();
Map<HashMap<String, Object>, List<HistoryVersamentoProdULRestDTO>> ulListGrouped = ulList.stream() Map<HashMap<String, Object>, List<HistoryVersamentoProdULRestDTO>> ulListGrouped = ulList.stream()
.collect(Collectors.groupingBy(x -> new HashMap<>() {{ .collect(Collectors.groupingBy(x -> {
put("gestione", x.getGestione()); var keyMap = new HashMap<String, Object>();
put("data_collo", x.getDataCollo()); keyMap.put("gestione", x.getGestione());
put("ser_collo", x.getSerCollo()); keyMap.put("data_collo", x.getDataCollo());
put("num_collo", x.getNumCollo()); keyMap.put("ser_collo", x.getSerCollo());
put("cod_mart", x.getCodMart()); keyMap.put("num_collo", x.getNumCollo());
put("barcode_ul_out", x.getBarcodeUlOut()); keyMap.put("cod_mart", x.getCodMart());
}}, Collectors.toList())); keyMap.put("barcode_ul_out", x.getBarcodeUlOut());
return keyMap;
}, Collectors.toList()));
ulListGrouped.forEach((key, value) -> { ulListGrouped.forEach((key, value) -> {