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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2025-05-15 17:27:51 +02:00
parent 13698c9664 9e4a1a1749
commit 01688728be
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java
View File

@@ -408,58 +408,58 @@ public class PvmAccettazioneService {
righeDoc.add(riga); righeDoc.add(riga);
} }
List<MtbColr> righeCollo = // List<MtbColr> righeCollo =
Stream.of(mtbColr) // Stream.of(mtbColr)
.filter(x -> // .filter(x ->
UtilityString.equalsIgnoreCase(x.getCodMart(), articolo.getCodMart()) && // UtilityString.equalsIgnoreCase(x.getCodMart(), articolo.getCodMart()) &&
x.getPartitaMag() != null).toList(); // x.getPartitaMag() != null).toList();
if (!UtilityString.isNullOrEmpty(articolo.getLotti())) { // if (!UtilityString.isNullOrEmpty(articolo.getLotti())) {
List<String> lottiCollo = Arrays.asList(articolo.getLotti().split("|")); // List<String> lottiCollo = Arrays.asList(articolo.getLotti().split("|"));
righeCollo = // righeCollo =
Stream.of(mtbColr) // Stream.of(mtbColr)
.filter(x -> lottiCollo.contains(x.getPartitaMag())).toList(); // .filter(x -> lottiCollo.contains(x.getPartitaMag())).toList();
} // }
List<WdtbDocr> righeNew = new ArrayList<>(); List<WdtbDocr> righeNew = new ArrayList<>();
// righeDoc = Stream.of(righeDoc).filter(x->x.getPartitaMag() == null).toList(); // righeDoc = Stream.of(righeDoc).filter(x->x.getPartitaMag() == null).toList();
for (AccettazioneRigaDocDTO riga : righeDoc) { for (AccettazioneRigaDocDTO riga : righeDoc) {
do { do {
if (righeCollo != null && !righeCollo.isEmpty()) { // if (righeCollo != null && !righeCollo.isEmpty()) {
righeCollo = Stream.of(righeCollo) // righeCollo = Stream.of(righeCollo)
.filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO)).toList(); // .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO)).toList();
for (MtbColr rigaCollo : righeCollo) { // for (MtbColr rigaCollo : righeCollo) {
BigDecimal qtaDoc; // BigDecimal qtaDoc;
String partitaMag; // String partitaMag;
Integer idRiga = null; // Integer idRiga = null;
//
if (UtilityBigDecimal.greaterThan(riga.getQtaDoc(), rigaCollo.getQtaCol())) { // if (UtilityBigDecimal.greaterThan(riga.getQtaDoc(), rigaCollo.getQtaCol())) {
qtaDoc = rigaCollo.getQtaCol(); // qtaDoc = rigaCollo.getQtaCol();
partitaMag = rigaCollo.getPartitaMag(); // partitaMag = rigaCollo.getPartitaMag();
idRiga = riga.getIdRiga(); // idRiga = riga.getIdRiga();
riga.setQtaDoc(riga.getQtaDoc().subtract(rigaCollo.getQtaCol())); // riga.setQtaDoc(riga.getQtaDoc().subtract(rigaCollo.getQtaCol()));
rigaCollo.setQtaCol(BigDecimal.ZERO); // rigaCollo.setQtaCol(BigDecimal.ZERO);
} else { // } else {
qtaDoc = riga.getQtaDoc(); // qtaDoc = riga.getQtaDoc();
partitaMag = rigaCollo.getPartitaMag(); // partitaMag = rigaCollo.getPartitaMag();
rigaCollo.setQtaCol(rigaCollo.getQtaCol().subtract(riga.getQtaDoc())); // rigaCollo.setQtaCol(rigaCollo.getQtaCol().subtract(riga.getQtaDoc()));
riga.setQtaDoc(BigDecimal.ZERO); // riga.setQtaDoc(BigDecimal.ZERO);
} // }
righeNew.add(insertRowBolla(articolo, idRiga, partitaMag, qtaDoc, riga.getValUnt())); // righeNew.add(insertRowBolla(articolo, idRiga, partitaMag, qtaDoc, riga.getValUnt()));
riga.setIdRiga(null); // Dopo la prima lettura id riga viene annullato perchè tutte le righe devono essere nuove // riga.setIdRiga(null); // Dopo la prima lettura id riga viene annullato perchè tutte le righe devono essere nuove
if (UtilityBigDecimal.isNullOrZero(riga.getQtaDoc())) { // if (UtilityBigDecimal.isNullOrZero(riga.getQtaDoc())) {
break; // break;
} // }
} // }
//
if (UtilityBigDecimal.greaterThan(riga.getQtaDoc(), BigDecimal.ZERO)) { // if (UtilityBigDecimal.greaterThan(riga.getQtaDoc(), BigDecimal.ZERO)) {
// righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt()));
// riga.setQtaDoc(BigDecimal.ZERO);
// }
//
// } else {
righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt())); righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt()));
riga.setQtaDoc(BigDecimal.ZERO); riga.setQtaDoc(BigDecimal.ZERO);
} // }
} else {
righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt()));
riga.setQtaDoc(BigDecimal.ZERO);
}
} while (riga.getQtaDoc().doubleValue() > 0); } while (riga.getQtaDoc().doubleValue() > 0);
} }