From 94b1318a567c0f4db9354006cfc19e795a4e251d Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 6 Nov 2025 10:54:09 +0100 Subject: [PATCH] sistemta modifca assenza e corretto errore di smetar --- .../it/integry/ems/activity/service/UserAbsenceService.java | 5 +++-- .../it/integry/ems/order/Import/service/OrdiniDaApprov.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java index 354df4ff76..599344262d 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java @@ -12,6 +12,7 @@ import it.integry.ems.user.service.UserService; import it.integry.ems.utility.UtilityDebug; import it.integry.ems.utility.UtilityEntity; import it.integry.ems_model.base.EntityBase; +import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.entity.JtbGiustifica; import it.integry.ems_model.entity.JtbRLavt; import it.integry.ems_model.entity.StbActivity; @@ -205,8 +206,8 @@ public class UserAbsenceService { String giustificativo = WordUtils.capitalize(assenza.getGiustificativo().toLowerCase()); String note = assenza.getNote(); - - processAbsence(assenza, OperationType.DELETE); + assenza.setGiustificativo(EmsRestConstants.NULL); + processAbsence(assenza, OperationType.UPDATE); if (sendEmail) { String subject = String.format("Eliminazione %s di %s", giustificativo, assenza.getFullname()); diff --git a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDaApprov.java b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDaApprov.java index 7fbd3e163f..36ede48649 100644 --- a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDaApprov.java +++ b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDaApprov.java @@ -69,7 +69,7 @@ public class OrdiniDaApprov { orderBy = "atb_fabr.data_fab, atb_fabr.num_fab, atb_fabr.tipo_azione , atb_fabr.cod_forn , atb_fabr.cod_mdep , atb_fabr.id_riga "; gestisciQtaMinOrd = "N"; // NON SI PUO' AVERE LA GESTIONE DELLA QUANTITA' MINIMA ORDINABILE NELL'ORDINE } else { - orderBy = "atb_fabr.data_fab, atb_fabr.num_fab, atb_fabr.tipo_azione , atb_fabr.cod_forn , atb_fabr.cod_mdep , atb_fabr.cod_mart , atb_fabr.data_cons, atb_fabr.cod_jcom "; + orderBy = "atb_fabr.data_fab, atb_fabr.num_fab, atb_fabr.tipo_azione , atb_fabr.cod_forn , atb_fabr.cod_mdep , atb_fabr.cod_mart, atb_fabr.data_cons, atb_fabr.cod_jcom "; } query = "select atb_fabr.tipo_azione, " + @@ -129,7 +129,7 @@ public class OrdiniDaApprov { " atb_fabr.cod_mart = mtb_aart.cod_mart and " + " (atb_fabr.tipo_azione = 'A' OR atb_fabr.tipo_azione = 'O') AND " + " (atb_fabr.flag_row_lock = 'N') " + - "ORDER BY " + orderBy; + "ORDER BY " + orderBy + ", 27"; query = UtilityDB.addwhereCond(query, whereCond, true); PreparedStatement ps = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);