Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2025-11-14 13:34:07 +01:00

View File

@@ -421,41 +421,46 @@ public class Slim2kLogisticService {
);
List<MtbPartitaMag> listaPartita = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), q, MtbPartitaMag.class);
if (listaPartita == null || listaPartita.isEmpty()) {
return null;
}
Optional<MtbPartitaMag> first = listaPartita.stream().filter(x -> x.getDataScad() == null || x.getDataScad().equals(dataScad)).findFirst();
MtbPartitaMag mtbPartitaMag;
if (first.isPresent()) {
mtbPartitaMag = first.get();
if ( mtbPartitaMag.getDataScad() == null ) {
mtbPartitaMag.setDataScad(dataScad);
mtbPartitaMag.setOperation(OperationType.UPDATE);
}
if (listaPartita == null || listaPartita.isEmpty()) {
mtbPartitaMag = new MtbPartitaMag()
.setCodMart(codMart)
.setPartitaMag(partitaMag)
.setDataScad(dataScad)
.setPartitaMagProd(partitaMag);
mtbPartitaMag.setOperation(OperationType.INSERT);
} else {
String lastPartitaMag = listaPartita.stream()
.max(Comparator.comparing(MtbPartitaMag::getPartitaMag))
.map(x -> x.getPartitaMag())
.orElse(null);
Optional<MtbPartitaMag> first = listaPartita.stream().filter(x -> x.getDataScad() == null || x.getDataScad().equals(dataScad)).findFirst();
String id = lastPartitaMag.substring(partitaMag.length());
if (UtilityString.isNullOrEmpty(id)) {
id = "1";
if (first.isPresent()) {
mtbPartitaMag = first.get();
if (mtbPartitaMag.getDataScad() == null) {
mtbPartitaMag.setDataScad(dataScad);
mtbPartitaMag.setOperation(OperationType.UPDATE);
}
} else {
id = Integer.toString(Integer.parseInt(id) + 1);
String lastPartitaMag = listaPartita.stream()
.max(Comparator.comparing(MtbPartitaMag::getPartitaMag))
.map(x -> x.getPartitaMag())
.orElse(null);
String id = lastPartitaMag.substring(partitaMag.length());
if (UtilityString.isNullOrEmpty(id)) {
id = "1";
} else {
id = Integer.toString(Integer.parseInt(id) + 1);
}
String partitaMagNew = partitaMag + "_" + id;
mtbPartitaMag = new MtbPartitaMag()
.setCodMart(codMart)
.setPartitaMag(partitaMagNew)
.setDataScad(dataScad)
.setPartitaMagProd(partitaMag);
mtbPartitaMag.setOperation(OperationType.INSERT);
}
String partitaMagNew = partitaMag + "_" + id;
mtbPartitaMag = new MtbPartitaMag()
.setCodMart(codMart)
.setPartitaMag(partitaMagNew)
.setDataScad(dataScad)
.setPartitaMagProd(partitaMag);
mtbPartitaMag.setOperation(OperationType.INSERT);
}
return mtbPartitaMag;
}