Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/logistic/service/Slim2kLogisticService.java

@@ -416,7 +416,7 @@ public class Slim2kLogisticService {
     @NotNull
     private MtbPartitaMag getMtbPartitaMag(String codMart, String partitaMag, LocalDate dataScad) throws SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException, PrimaryDatabaseNotPresentException {
         String q = Query.format(
-                "SELECT partita_mag, data_scad FROM mtb_partita_mag WHERE cod_mart = %s AND IsNull(partita_mag, partita_mag_prod) = %s ",
+                "SELECT cod_mart, partita_mag, data_scad FROM mtb_partita_mag WHERE cod_mart = %s AND IsNull(partita_mag, partita_mag_prod) = %s ",
                 codMart, partitaMag, dataScad
         );
 
@@ -436,7 +436,9 @@ public class Slim2kLogisticService {
             if (first.isPresent()) {
                 mtbPartitaMag = first.get();
                 if (mtbPartitaMag.getDataScad() == null) {
-                    mtbPartitaMag.setDataScad(dataScad);
+                    mtbPartitaMag
+                            .setCodMart(codMart)
+                            .setDataScad(dataScad);
                     mtbPartitaMag.setOperation(OperationType.UPDATE);
                 }
             } else {