From 069d4975666a72780f535dc36a72da26edfc5cbc Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 25 Jun 2024 10:55:21 +0200 Subject: [PATCH] =?UTF-8?q?Rimosso=20parametro=20override=20in=20createSet?= =?UTF-8?q?upQuery=20(non=20pi=C3=B9=20utilizzato)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/migration/_base/BaseMigration.java | 3 +- .../model/Migration_20240314133221.java | 2 +- .../model/Migration_20240408145448.java | 92 +++++++++---------- .../model/Migration_20240411114929.java | 3 +- .../model/Migration_20240418161210.java | 2 +- .../model/Migration_20240419120149.java | 4 +- .../model/Migration_20240423131617.java | 2 +- .../model/Migration_20240423162612.java | 6 +- .../model/Migration_20240503132223.java | 2 +- .../model/Migration_20240506175151.java | 2 +- .../model/Migration_20240522173844.java | 2 +- .../model/Migration_20240528131622.java | 2 +- .../model/Migration_20240528151650.java | 2 +- .../model/Migration_20240528163559.java | 2 +- .../model/Migration_20240529103245.java | 3 +- .../model/Migration_20240603124310.java | 2 +- .../model/Migration_20240611102244.java | 2 +- .../model/Migration_20240621174401.java | 2 +- 18 files changed, 64 insertions(+), 71 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java index 4dc4422cba..a64bb04ded 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java +++ b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java @@ -20,7 +20,6 @@ import it.integry.ems_model.utility.UtilityDB; import it.integry.ems_model.utility.UtilityString; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bouncycastle.its.operator.ITSContentSigner; import org.springframework.web.context.ContextLoader; import java.io.IOException; @@ -188,7 +187,7 @@ public abstract class BaseMigration implements MigrationModelInterface { executeStatement(dropSql); } - protected void createSetupQuery(String codQuery, String name, String query, boolean override) throws SQLException, IOException { + protected void createSetupQuery(String codQuery, String name, String query) throws SQLException, IOException { if (UtilityString.isNullOrEmpty(codQuery)) { executeStatement(Query.format("EXEC sp_insertQuerySetup %s", query)); return; diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java index 1f24fc76eb..1840397752 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java @@ -10,7 +10,7 @@ public class Migration_20240314133221 extends BaseMigration implements Migration if (isHistoryDB()) return; - createSetupQuery("TIPI_DEPO", "Tipi deposito", "SELECT cod_tipo_depo FROM mtb_depo_tipi", true); + createSetupQuery("TIPI_DEPO", "Tipi deposito", "SELECT cod_tipo_depo FROM mtb_depo_tipi"); createSetup("PVM", "PIAN_ACC_ROSSG", "TIPI_DEPO_LAV", null, "Identifica i tipi di deposito dove è possibile far arrivare la materia prima per la produzione.", diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240408145448.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240408145448.java index 90be0e8b3a..7500622d32 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240408145448.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240408145448.java @@ -10,52 +10,52 @@ public class Migration_20240408145448 extends BaseMigration implements Migration if (isHistoryDB()) return; - createSetupQuery("A_C",null,"SELECT 'A|Anagrafica' UNION ALL SELECT 'C|Consumi'", true); - createSetupQuery("ACTIVITY_TYPE","Tipo attività","select activity_type_id from stb_activity_type where flag_tipologia = 'A' and flag_attiva = 'S'", true); - createSetupQuery("ATTACH_LIBERI","Allegati liberi","SELECT stb_files_attached.id_attach, stb_files_attached.file_name, stb_files_attached.user_name, stb_files_attached.description, stb_files_attached.datetime_attach, stb_files_attached.file_size FROM stb_files_attached LEFT OUTER JOIN mrl_partita_mag_attached ON stb_files_attached.id_attach = mrl_partita_mag_attached.id_attach LEFT OUTER JOIN drl_ord_attached ON stb_files_attached.id_attach = drl_ord_attached.id_attach LEFT OUTER JOIN drl_doc_attached ON stb_files_attached.id_attach = drl_doc_attached.id_attach WHERE stb_files_attached.data_doc IS NULL AND stb_files_attached.num_doc IS NULL AND parent_id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND flag_lock = 'N' AND file_size > 0 ORDER BY stb_files_attached.file_name", true); - createSetupQuery("COD_ALIQ","Aliquota","SELECT cod_aliq FROM gtb_aliq ORDER BY 1", true); - createSetupQuery("COD_ANAG_CLIE","Cod. cliente","SELECT gtb_anag.cod_anag FROM gtb_anag INNER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag AND vtb_clie.flag_stato = 'A' ORDER BY 1", true); - createSetupQuery("COD_ANAG_FORN","Cod. fornitore","SELECT gtb_anag.cod_anag FROM gtb_anag INNER JOIN atb_forn ON gtb_anag.cod_anag = atb_forn.cod_anag AND atb_forn.flag_stato = 'A' ORDER BY 1", true); - createSetupQuery("COD_ATIP","Tipo fornitore","SELECT cod_atip FROM atb_tipi ORDER BY 1", true); - createSetupQuery("COD_CCAU","Causale contabile","SELECT cod_ccau FROM ctb_caus ORDER BY 1", true); - createSetupQuery("COD_DTIP","Tipo Doc.","SELECT cod_dtip FROM dtb_tipi order by 1", true); - createSetupQuery("COD_DTIP_A","Tipo Doc. Acq.","select cod_dtip from dtb_tipi where gestione = 'A' order by 1", true); - createSetupQuery("COD_DTIP_L","Tipo Doc. Lav.","select cod_dtip from dtb_tipi where gestione = 'L' order by 1", true); - createSetupQuery("COD_DTIP_L_CAR",null,"SELECT cod_dtip FROM dtb_tipi WHERE gestione = 'L' AND ( segno_qta_car > 0 OR segno_qta_scar < 0 )", true); - createSetupQuery("COD_DTIP_L_SCAR",null,"SELECT cod_dtip FROM dtb_tipi WHERE gestione = 'L' AND ( segno_qta_car < 0 or segno_qta_scar > 0 )", true); - createSetupQuery("COD_DTIP_V","Selezione tipo documento di vendita","select cod_dtip from dtb_tipi where gestione = 'V' and tipo_emissione = 'DIRETTA' order by 1", true); - createSetupQuery("COD_JCOM","Commessa","SELECT cod_jcom FROM jtb_comt ORDER BY 1", true); - createSetupQuery("COD_JFAS","Cod. fase","SELECT cod_jfas FROM jtb_fasi WHERE flag_attivo = 'S' ORDER BY 1", true); - createSetupQuery("COD_JFLAV",null,"select cod_jflav from jtb_flav", true); - createSetupQuery("COD_MDEP","Tutti i depositi","SELECT cod_mdep FROM mtb_depo ORDER BY 1", true); - createSetupQuery("COD_MGRP","Gruppi merceologici","select cod_mgrp from mtb_grup", true); - createSetupQuery("COD_PAGA","Tipo pagamento","SELECT cod_paga FROM gtb_paga WHERE flag_attivo = 'S' ORDER BY 1", true); - createSetupQuery("COD_SPES","Cod. spesa","SELECT cod_spes FROM gtb_spes ORDER BY 1", true); - createSetupQuery("COD_VAGE",null,"select cod_vage + '|'+ cod_vage + ' - ' + rag_soc from vtb_agen where data_fine_rap is null order by rag_soc", true); - createSetupQuery("COD_VLIS",null,"SELECT cod_vlis FROM vtb_list WHERE flag_attivo = 'S'", true); - createSetupQuery("COD_VVET",null,"select cod_vvet + '|'+rag_soc from vtb_vett", true); - createSetupQuery("EQUI_PREZZO_VEN",null,"SELECT 'N|NON EQUIVALENTE NEL PREZZO' UNION ALL SELECT 'B|EQUIVALENTE NEL PREZZO BASE' UNION ALL SELECT 'V|EQUIVALENTE NEL PREZZO DI VENDITA' UNION ALL SELECT 'R|EQUIVALENTE NEL RICARICO' UNION ALL SELECT 'P|EQUIVALENTE NEL RICARICO E PREZZO DI VENDITA' UNION ALL SELECT 'T|EQUIVALENTE NEL PREZZO BASE, RICARICO E PREZZO DI VENDITA'", true); - createSetupQuery("FLAG_3_STATI","flag con tre stati","SELECT 0 UNION ALL SELECT 1 UNION ALL SELECT 2", true); - createSetupQuery("GRIGLIA_AGENTI",null,"SELECT DISTINCT cod_vage FROM vtb_agen_group", true); - createSetupQuery("GRUPPI_UTENTI_W",null,"SELECT key_group, UPPER(user_group) FROM wtb_user_groups ORDER BY key_group", true); - createSetupQuery("I_P",null,"SELECT 'I|INSERISCI' UNION ALL SELECT 'P|STAMPA'", true); - createSetupQuery("LOAD_BOLLE_DESC",null,"select 'D|DATI DESTINATARIO' UNION ALL select 'O|ORDINE INTERNO + ORDINE CLIENTE'", true); - createSetupQuery("MEZZO",null,"select mezzo from gtb_mezzo", true); - createSetupQuery("PORTO",null,"select porto from gtb_porto", true); - createSetupQuery("PRINTER_NAME","Nome stampante","SELECT name FROM stb_printers order by 1", true); - createSetupQuery("PROCESSO",null,"select activity_type_id FROM stb_activity_type WHERE flag_attiva = 'S' AND flag_tipologia = 'P'", true); - createSetupQuery("REPORT_NAME","Nome report","SELECT report_name FROM wtb_jrept ORDER BY 1", true); - createSetupQuery("SI_NO","Flag S/N","SELECT 'S' UNION ALL SELECT 'N'", true); - createSetupQuery("SIGNUP_MODE",null,"select 'MAILONLY', 'MAILONLY' UNION ALL SELECT 'CODANAG_PARTIVA', 'CODANAG_PARTIVA' UNION ALL SELECT 'REGISTRAZIONE_CLIENTI', 'REGISTRAZIONE_CLIENTI'", true); - createSetupQuery("STATO_COMMESSA","Stato commessa","SELECT stato_commessa FROM jtb_com_stato WHERE flag_attivo = 'S' ORDER BY 1", true); - createSetupQuery("STORED_PROCEDUR",null,"SELECT name FROM SYSOBJECTS WHERE XTYPE = 'p' AND category = 0 order BY name", true); - createSetupQuery("TIPI_DEPO","Tipi deposito","SELECT cod_tipo_depo FROM mtb_depo_tipi", true); - createSetupQuery("TIPO_CALC_TRASP",null,"SELECT 'PESO' UNION ALL SELECT 'COLLI'", true); - createSetupQuery("TRUE_FALSE",null,"SELECT 'true' union all select 'false'", true); - createSetupQuery("UNITA_MISURA",null,"select unt_mis from mtb_unt_mis where flag_attivo = 'S'", true); - createSetupQuery("VAL_SCARICHI",null,"SELECT 'C|Costo ultimo' UNION ALL SELECT 'V|Valore vendita'", true); - createSetupQuery("VAR_CAMPI_LIBER",null,"SELECT 'P|POSIZIONE ARTICOLO' UNION ALL SELECT 'M|MEDIA SETTIMANALE VENDITE'", true); - createSetupQuery("YES_NO","","SELECT 'Yes' UNION SELECT 'No'", true); + createSetupQuery("A_C",null,"SELECT 'A|Anagrafica' UNION ALL SELECT 'C|Consumi'"); + createSetupQuery("ACTIVITY_TYPE","Tipo attività","select activity_type_id from stb_activity_type where flag_tipologia = 'A' and flag_attiva = 'S'"); + createSetupQuery("ATTACH_LIBERI","Allegati liberi","SELECT stb_files_attached.id_attach, stb_files_attached.file_name, stb_files_attached.user_name, stb_files_attached.description, stb_files_attached.datetime_attach, stb_files_attached.file_size FROM stb_files_attached LEFT OUTER JOIN mrl_partita_mag_attached ON stb_files_attached.id_attach = mrl_partita_mag_attached.id_attach LEFT OUTER JOIN drl_ord_attached ON stb_files_attached.id_attach = drl_ord_attached.id_attach LEFT OUTER JOIN drl_doc_attached ON stb_files_attached.id_attach = drl_doc_attached.id_attach WHERE stb_files_attached.data_doc IS NULL AND stb_files_attached.num_doc IS NULL AND parent_id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND mrl_partita_mag_attached.id_attach IS NULL AND flag_lock = 'N' AND file_size > 0 ORDER BY stb_files_attached.file_name"); + createSetupQuery("COD_ALIQ","Aliquota","SELECT cod_aliq FROM gtb_aliq ORDER BY 1"); + createSetupQuery("COD_ANAG_CLIE","Cod. cliente","SELECT gtb_anag.cod_anag FROM gtb_anag INNER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag AND vtb_clie.flag_stato = 'A' ORDER BY 1"); + createSetupQuery("COD_ANAG_FORN","Cod. fornitore","SELECT gtb_anag.cod_anag FROM gtb_anag INNER JOIN atb_forn ON gtb_anag.cod_anag = atb_forn.cod_anag AND atb_forn.flag_stato = 'A' ORDER BY 1"); + createSetupQuery("COD_ATIP","Tipo fornitore","SELECT cod_atip FROM atb_tipi ORDER BY 1"); + createSetupQuery("COD_CCAU","Causale contabile","SELECT cod_ccau FROM ctb_caus ORDER BY 1"); + createSetupQuery("COD_DTIP","Tipo Doc.","SELECT cod_dtip FROM dtb_tipi order by 1"); + createSetupQuery("COD_DTIP_A","Tipo Doc. Acq.","select cod_dtip from dtb_tipi where gestione = 'A' order by 1"); + createSetupQuery("COD_DTIP_L","Tipo Doc. Lav.","select cod_dtip from dtb_tipi where gestione = 'L' order by 1"); + createSetupQuery("COD_DTIP_L_CAR",null,"SELECT cod_dtip FROM dtb_tipi WHERE gestione = 'L' AND ( segno_qta_car > 0 OR segno_qta_scar < 0 )"); + createSetupQuery("COD_DTIP_L_SCAR",null,"SELECT cod_dtip FROM dtb_tipi WHERE gestione = 'L' AND ( segno_qta_car < 0 or segno_qta_scar > 0 )"); + createSetupQuery("COD_DTIP_V","Selezione tipo documento di vendita","select cod_dtip from dtb_tipi where gestione = 'V' and tipo_emissione = 'DIRETTA' order by 1"); + createSetupQuery("COD_JCOM","Commessa","SELECT cod_jcom FROM jtb_comt ORDER BY 1"); + createSetupQuery("COD_JFAS","Cod. fase","SELECT cod_jfas FROM jtb_fasi WHERE flag_attivo = 'S' ORDER BY 1"); + createSetupQuery("COD_JFLAV",null,"select cod_jflav from jtb_flav"); + createSetupQuery("COD_MDEP","Tutti i depositi","SELECT cod_mdep FROM mtb_depo ORDER BY 1"); + createSetupQuery("COD_MGRP","Gruppi merceologici","select cod_mgrp from mtb_grup"); + createSetupQuery("COD_PAGA","Tipo pagamento","SELECT cod_paga FROM gtb_paga WHERE flag_attivo = 'S' ORDER BY 1"); + createSetupQuery("COD_SPES","Cod. spesa","SELECT cod_spes FROM gtb_spes ORDER BY 1"); + createSetupQuery("COD_VAGE",null,"select cod_vage + '|'+ cod_vage + ' - ' + rag_soc from vtb_agen where data_fine_rap is null order by rag_soc"); + createSetupQuery("COD_VLIS",null,"SELECT cod_vlis FROM vtb_list WHERE flag_attivo = 'S'"); + createSetupQuery("COD_VVET",null,"select cod_vvet + '|'+rag_soc from vtb_vett"); + createSetupQuery("EQUI_PREZZO_VEN",null,"SELECT 'N|NON EQUIVALENTE NEL PREZZO' UNION ALL SELECT 'B|EQUIVALENTE NEL PREZZO BASE' UNION ALL SELECT 'V|EQUIVALENTE NEL PREZZO DI VENDITA' UNION ALL SELECT 'R|EQUIVALENTE NEL RICARICO' UNION ALL SELECT 'P|EQUIVALENTE NEL RICARICO E PREZZO DI VENDITA' UNION ALL SELECT 'T|EQUIVALENTE NEL PREZZO BASE, RICARICO E PREZZO DI VENDITA'"); + createSetupQuery("FLAG_3_STATI","flag con tre stati","SELECT 0 UNION ALL SELECT 1 UNION ALL SELECT 2"); + createSetupQuery("GRIGLIA_AGENTI",null,"SELECT DISTINCT cod_vage FROM vtb_agen_group"); + createSetupQuery("GRUPPI_UTENTI_W",null,"SELECT key_group, UPPER(user_group) FROM wtb_user_groups ORDER BY key_group"); + createSetupQuery("I_P",null,"SELECT 'I|INSERISCI' UNION ALL SELECT 'P|STAMPA'"); + createSetupQuery("LOAD_BOLLE_DESC",null,"select 'D|DATI DESTINATARIO' UNION ALL select 'O|ORDINE INTERNO + ORDINE CLIENTE'"); + createSetupQuery("MEZZO",null,"select mezzo from gtb_mezzo"); + createSetupQuery("PORTO",null,"select porto from gtb_porto"); + createSetupQuery("PRINTER_NAME","Nome stampante","SELECT name FROM stb_printers order by 1"); + createSetupQuery("PROCESSO",null,"select activity_type_id FROM stb_activity_type WHERE flag_attiva = 'S' AND flag_tipologia = 'P'"); + createSetupQuery("REPORT_NAME","Nome report","SELECT report_name FROM wtb_jrept ORDER BY 1"); + createSetupQuery("SI_NO","Flag S/N","SELECT 'S' UNION ALL SELECT 'N'"); + createSetupQuery("SIGNUP_MODE",null,"select 'MAILONLY', 'MAILONLY' UNION ALL SELECT 'CODANAG_PARTIVA', 'CODANAG_PARTIVA' UNION ALL SELECT 'REGISTRAZIONE_CLIENTI', 'REGISTRAZIONE_CLIENTI'"); + createSetupQuery("STATO_COMMESSA","Stato commessa","SELECT stato_commessa FROM jtb_com_stato WHERE flag_attivo = 'S' ORDER BY 1"); + createSetupQuery("STORED_PROCEDUR",null,"SELECT name FROM SYSOBJECTS WHERE XTYPE = 'p' AND category = 0 order BY name"); + createSetupQuery("TIPI_DEPO","Tipi deposito","SELECT cod_tipo_depo FROM mtb_depo_tipi"); + createSetupQuery("TIPO_CALC_TRASP",null,"SELECT 'PESO' UNION ALL SELECT 'COLLI'"); + createSetupQuery("TRUE_FALSE",null,"SELECT 'true' union all select 'false'"); + createSetupQuery("UNITA_MISURA",null,"select unt_mis from mtb_unt_mis where flag_attivo = 'S'"); + createSetupQuery("VAL_SCARICHI",null,"SELECT 'C|Costo ultimo' UNION ALL SELECT 'V|Valore vendita'"); + createSetupQuery("VAR_CAMPI_LIBER",null,"SELECT 'P|POSIZIONE ARTICOLO' UNION ALL SELECT 'M|MEDIA SETTIMANALE VENDITE'"); + createSetupQuery("YES_NO","","SELECT 'Yes' UNION SELECT 'No'"); } @Override diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240411114929.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240411114929.java index 07b8e359f2..adebd69188 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240411114929.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240411114929.java @@ -1,7 +1,6 @@ package it.integry.ems.migration.model; import it.integry.ems.migration._base.BaseMigration; -import it.integry.ems.migration._base.IntegryCustomerDB; import it.integry.ems.migration._base.MigrationModelInterface; public class Migration_20240411114929 extends BaseMigration implements MigrationModelInterface { @@ -12,7 +11,7 @@ public class Migration_20240411114929 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("W_VDOCU_RC", "STAMPA", "STAMPA_EAN", null, "Permette di visualizzare l'ean del prodotto sulla stampa in base al codice cliente, configurabile solo da PVM", false, "SI_NO", false, false, false, false, false, "gtb_anag", false, "SELECT 'S' UNION ALL SELECT 'N'"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240418161210.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240418161210.java index 7c41ec16e8..a4f96882a4 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240418161210.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240418161210.java @@ -12,7 +12,7 @@ public class Migration_20240418161210 extends BaseMigration implements Migration createSetup("w_aordi_rc", "SETUP", "MODIFICA_PRZ_NETTO", "N", null, false, "SI_NO", false, false, true, false, false, null, false, null); - createSetupQuery(null, null, "SELECT 'PREZZO-SCONTI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI-PREMI'UNION ALL SELECT 'PREZZO-SCONTI-PREMI'", false); + createSetupQuery(null, null, "SELECT 'PREZZO-SCONTI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI-PREMI'UNION ALL SELECT 'PREZZO-SCONTI-PREMI'"); createSetup("w_aordi_rc", "SETUP", "FORMULA_PREZZO_NETTO", "PREZZO-SCONTI", null, false, null, false, false, false, false, false, null, false, "SELECT 'PREZZO-SCONTI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI' UNION ALL SELECT 'PREZZO-SCONTI+ONERI-PREMI'UNION ALL SELECT 'PREZZO-SCONTI-PREMI'"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240419120149.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240419120149.java index 5e1fc00751..f1e3814166 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240419120149.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240419120149.java @@ -11,9 +11,9 @@ public class Migration_20240419120149 extends BaseMigration implements Migration return; - createSetupQuery("COD_DTIP", "COD_DTIP", "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1", false); + createSetupQuery("COD_DTIP", "COD_DTIP", "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1"); createSetup("PICKING", "IMBALLI", "COD_DTIP_CARICO", null, "Codice documento che identifica il carico degli imballi", false, "COD_DTIP", false, false, false, false, false, null, false, "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1"); - createSetupQuery("COD_DTIP", "COD_DTIP", "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1", false); + createSetupQuery("COD_DTIP", "COD_DTIP", "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1"); createSetup("PICKING", "IMBALLI", "COD_DTIP_SCARICO", null, "Codice documento che identifica lo scarico degli imballi", false, "COD_DTIP", false, false, false, false, false, null, false, "SELECT COD_DTIP FROM DTB_TIPI ORDER BY 1"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423131617.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423131617.java index a8c4beea7f..f4680bdb8f 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423131617.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423131617.java @@ -12,7 +12,7 @@ public class Migration_20240423131617 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("W_GANAG_RC", "SETUP", "RETRIEVE_STATUS_CLIENTE", "S", "nella loadrec fa retrive dei dello status cliente altrimenti lo fa solo quando ci si sposta sulla linguetta status", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); if (!isCustomerDb( IntegryCustomerDB.Carelli_Carelli, diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423162612.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423162612.java index 21a8239cab..4c6984651c 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423162612.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240423162612.java @@ -4,10 +4,6 @@ import it.integry.ems.migration._base.BaseMigration; import it.integry.ems.migration._base.IntegryCustomer; import it.integry.ems.migration._base.MigrationModelInterface; import it.integry.ems_model.entity.MtbSgrp; -import it.integry.ems_model.entity.StbGestSetupDet; -import it.integry.ems_model.types.OperationType; - -import javax.validation.constraints.Null; public class Migration_20240423162612 extends BaseMigration implements MigrationModelInterface { @@ -18,7 +14,7 @@ public class Migration_20240423162612 extends BaseMigration implements Migration if (!existsSetup("PVM", "PIAN_ACC_ROSSG", "TIPO_POSIZIONAMENTO_ACCETTAZIONE")) { if (!existsSetupQuery("POS_VERS")) - createSetupQuery("POS_VERS", "Posizionamento o Versamento", "SELECT 'VERSAMENTO' UNION ALL SELECT 'POSIZIONAMENTO'", false); + createSetupQuery("POS_VERS", "Posizionamento o Versamento", "SELECT 'VERSAMENTO' UNION ALL SELECT 'POSIZIONAMENTO'"); createSetup("PVM", "PIAN_ACC_ROSSG", "TIPO_POSIZIONAMENTO_ACCETTAZIONE", "VERSAMENTO", "Impostazione per indicare se il posizionamento della merce su linea di produzione post accettazione deve avvenire tramite posizionamento o versamento", false, "POS_VERS", false, false, false, false, false, MtbSgrp.ENTITY, false); if (isCustomer(IntegryCustomer.RossoGargano)){ diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240503132223.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240503132223.java index 07013a6d95..8ba19a4ac4 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240503132223.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240503132223.java @@ -18,7 +18,7 @@ public class Migration_20240503132223 extends BaseMigration implements Migration "FROM mtb_depo_posizioni\n" + " INNER JOIN mtb_depo ON mtb_depo.cod_mdep = mtb_depo_posizioni.cod_mdep\n" + "inner join gtb_anag on mtb_depo.cod_anag = gtb_anag.cod_anag\n" + - "inner join azienda on azienda.part_iva = gtb_anag.part_iva", false); + "inner join azienda on azienda.part_iva = gtb_anag.part_iva"); createSetup("PVM", "PIAN_ACC_ROSSG", "POSIZIONE_DEFAULT_ARTICOLO", null, "Impostazione per indicare la posizione di default in cui piazzare la merce post accettazione", false, "POS_AZIENDA", false, false, false, false, false, MtbSgrp.ENTITY, false); diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506175151.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506175151.java index d0181ab097..e6db96e358 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506175151.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506175151.java @@ -12,7 +12,7 @@ public class Migration_20240506175151 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("PVM", "MRP", "CONSIDERA_COLLI_GIACENZA", "S", "Considera i colli non agganciati ai documenti nella giacenza", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); if (!isCustomerDb( diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240522173844.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240522173844.java index 76500e827a..461467cede 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240522173844.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240522173844.java @@ -11,7 +11,7 @@ public class Migration_20240522173844 extends BaseMigration implements Migration if (isHistoryDB()) return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("ORDIKIDS", "SETUP", "NOME_NEGOZIO_REQUIRED", null, null, false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528131622.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528131622.java index 7a44378740..205c6acff1 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528131622.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528131622.java @@ -11,7 +11,7 @@ public class Migration_20240528131622 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("EXPORT_ORDINI VENDITA", "SLIM2K", "RAGGRUPPA_ARTICOLI", "S", "permette di ragguppare gli articoli uguali presenti su più ordini escludendo le suddivisioni", false, "SI_NO", true, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528151650.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528151650.java index 311daa3088..7349ecb47e 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528151650.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528151650.java @@ -11,7 +11,7 @@ public class Migration_20240528151650 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("PICKING", "PICKING_LIBERO", "ENABLE_SCAN_ART", null, "Permette di abilitare la scansione dei barcode inerenti all'articolo o alla confezione senza dover usare il barcode UL.", false, "SI_NO", false, true, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528163559.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528163559.java index 6441a06b95..2b84967ae1 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528163559.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240528163559.java @@ -10,7 +10,7 @@ public class Migration_20240528163559 extends BaseMigration implements Migration if (isHistoryDB()) return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("ORDIFY", "SETUP", "ABILITA_RIF_ORD", "S", "Abilita l'inserimento del codice hash dispositivo nel campo rif_ord in fase di esportazione dell'ordine.", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240529103245.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240529103245.java index a64b3714eb..c977336d87 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240529103245.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240529103245.java @@ -1,7 +1,6 @@ package it.integry.ems.migration.model; import it.integry.ems.migration._base.BaseMigration; -import it.integry.ems.migration._base.IntegryCustomer; import it.integry.ems.migration._base.IntegryCustomerDB; import it.integry.ems.migration._base.MigrationModelInterface; @@ -21,7 +20,7 @@ public class Migration_20240529103245 extends BaseMigration implements Migration createSetup("FARMMES", "SETUP", "CIFRE_DEC_PESO_MEDIO", "5", "Indica il numero di cifre di arrotondamento del calcolo del peso medio passato ai filtri dei WS", false, null, false, false, false, false, false, null, false, null); createSetup("FARMMES", "SETUP", "COD_PROD_VEN_INGRASSO_03", "0704010", "DESCRIZIONE PRODOTTO PER VENDITA DA INGRASSO", false, null, false, false, false, false, false, null, false, null); createSetup("FARMMES", "SETUP", "COD_PROD_VEN_INGRASSO_04", "0704011", "DESCRIZIONE PRODOTTO PER VENDITA DA INGRASSO", false, null, false, false, false, false, false, null, false, null); - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("FARMMES", "SETUP", "SCAR_MANGIMI_NEW", "S", "Se impostato a S viene gestito lo scarico dei mangimi con la nuova logica che permette lo scarico di tutti i mangimi e non per fase del ciclo produttivo", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("FARMMES", "SETUP", "SUISAN_COD_DTIP_TRASF", "DDTLX", null, false, null, false, false, false, false, false, null, false, null); createSetup("FARMMES", "SETUP", "SUISAN_COD_MDEP_TRASF", "SUISA", null, false, null, false, false, false, false, false, null, false, null); diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240603124310.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240603124310.java index aba0637aab..86fc7e8470 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240603124310.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240603124310.java @@ -12,7 +12,7 @@ public class Migration_20240603124310 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("DATI_AZIENDA", "SETUP", "VIEW_REPORT_ONLY_ADMIN", "N", "Visualizza il report del riepilogo attività solo agli utenti amministratore.", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); if (isCustomer(IntegryCustomer.Carelli)) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240611102244.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240611102244.java index 9c61fee30f..4c5f5f4551 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240611102244.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240611102244.java @@ -12,7 +12,7 @@ public class Migration_20240611102244 extends BaseMigration implements Migration return; - createSetupQuery(null, null, "SELECT '0|Data Ordine' UNION ALL SELECT '1|Data Consegna'", false); + createSetupQuery(null, null, "SELECT '0|Data Ordine' UNION ALL SELECT '1|Data Consegna'"); createSetup("W_VSITUAZ_CONS_DISP", "SETUP", "PERIODO_RIF", "0", "Indica se il sottotitolo ha come periodo di riferimento la data ordine o la data consegna", false, null, false, false, false, false, false, null, false, "SELECT '0|Data Ordine' UNION ALL SELECT '1|Data Consegna'"); if (isCustomer(IntegryCustomer.Salpar)) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240621174401.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240621174401.java index 3ab1de63eb..6c39f19fbe 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240621174401.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240621174401.java @@ -12,7 +12,7 @@ public class Migration_20240621174401 extends BaseMigration implements Migration return; - createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'", false); + createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'"); createSetup("NTB_DOCT", "PROMOZIONI", "ESCLUDI_PROMO_INFORMATIVE", null, "esclude le promozioni informative dall'importazione del codice promo negli scontrini", false, "SI_NO", false, false, false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); if (isCustomer(IntegryCustomer.Carelli)){