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-11-06 10:54:16 +01:00
parent 2e9e120cdb be688efd2c
commit b127ca2222
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java
View File

@@ -12,6 +12,7 @@ import it.integry.ems.user.service.UserService;
import it.integry.ems.utility.UtilityDebug; import it.integry.ems.utility.UtilityDebug;
import it.integry.ems.utility.UtilityEntity; import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase; 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.JtbGiustifica;
import it.integry.ems_model.entity.JtbRLavt; import it.integry.ems_model.entity.JtbRLavt;
import it.integry.ems_model.entity.StbActivity; import it.integry.ems_model.entity.StbActivity;
@@ -205,8 +206,8 @@ public class UserAbsenceService {
String giustificativo = WordUtils.capitalize(assenza.getGiustificativo().toLowerCase()); String giustificativo = WordUtils.capitalize(assenza.getGiustificativo().toLowerCase());
String note = assenza.getNote(); String note = assenza.getNote();
assenza.setGiustificativo(EmsRestConstants.NULL);
processAbsence(assenza, OperationType.DELETE); processAbsence(assenza, OperationType.UPDATE);
if (sendEmail) { if (sendEmail) {
String subject = String.format("Eliminazione %s di %s", giustificativo, assenza.getFullname()); String subject = String.format("Eliminazione %s di %s", giustificativo, assenza.getFullname());

4
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDaApprov.java
View File

@@ -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 "; 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 gestisciQtaMinOrd = "N"; // NON SI PUO' AVERE LA GESTIONE DELLA QUANTITA' MINIMA ORDINABILE NELL'ORDINE
} else { } 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 = query =
"select atb_fabr.tipo_azione, " + "select atb_fabr.tipo_azione, " +
@@ -129,7 +129,7 @@ public class OrdiniDaApprov {
" atb_fabr.cod_mart = mtb_aart.cod_mart and " + " atb_fabr.cod_mart = mtb_aart.cod_mart and " +
" (atb_fabr.tipo_azione = 'A' OR atb_fabr.tipo_azione = 'O') AND " + " (atb_fabr.tipo_azione = 'A' OR atb_fabr.tipo_azione = 'O') AND " +
" (atb_fabr.flag_row_lock = 'N') " + " (atb_fabr.flag_row_lock = 'N') " +
"ORDER BY " + orderBy; "ORDER BY " + orderBy + ", 27";
query = UtilityDB.addwhereCond(query, whereCond, true); query = UtilityDB.addwhereCond(query, whereCond, true);
PreparedStatement ps = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);