Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
jenkins
2025-07-01 15:19:29 +02:00
parent e470099721 a1c4ca30ff
commit beb873b2e3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
View File

@@ -438,7 +438,9 @@ public class DocumentiDirettiService {
}
if ((fatturaPedaneCliente || fatturaVettore) &&
dtbDoct.getDtbDocImb().stream().anyMatch(x -> x.getTipoReso() != 2 && !x.getNumImbCons().equals(x.getNumImbResi()))
dtbDoct.getDtbDocImb().stream().
filter(x -> x.getOperation() != OperationType.DELETE )
.anyMatch(x -> x.getTipoReso() != 2 && !x.getNumImbCons().equals(x.getNumImbResi()))
) {
final String gestName = "DTB_DOCT";
final String section = "FATTURA_PEDANE";
@@ -471,6 +473,7 @@ public class DocumentiDirettiService {
}
String codAnagPed, listino = null;
if (fatturaVettore) {
if (UtilityString.isNullOrEmpty(dtbDoct.getCodFornTrasp()))
throw new Exception("Codice fornitore del trasporto non presente sul documento");
@@ -520,7 +523,7 @@ public class DocumentiDirettiService {
listino = dtbDoct.getListino();
}
List<DtbDocImb> imballi = dtbDoct.getDtbDocImb().stream().filter(x -> x.getTipoReso() != 2).collect(Collectors.toList());
List<DtbDocImb> imballi = dtbDoct.getDtbDocImb().stream().filter(x -> x.getOperation() != OperationType.DELETE && x.getTipoReso() != 2).collect(Collectors.toList());
Map<Boolean, List<DtbDocImb>> gruppoImballi = imballi.stream().collect(groupingBy(x -> x.getNumImbCons() > x.getNumImbResi()));
for (Map.Entry<Boolean, List<DtbDocImb>> item : gruppoImballi.entrySet()) {
String codDtipPed;