Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source 
# Conflicts:
#	ems-core/src/main/resources/menus/menu_config.json
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
This commit is contained in:
Giuseppe Scorrano
2025-06-30 09:09:26 +02:00
parent 78137519ec ad691925ed
commit 219fd1989a
93 changed files with 4664 additions and 2802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/runConfigurations/Tomcat__1__Smetar___VPN_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (Smetar) [VPN]" type="Remote" folderName="Smetar">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="10.0.0.2" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

27
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250605131423.java Normal file
View File

@@ -0,0 +1,27 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250605131423 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("CRM", "COD_CCON", "PREFISSO_I", null,
null, false, null, false, false,
false, false, false, null, false, null);
createSetup("CRM", "COD_CCON", "DEFAULT", null,
null, false, null, false, false,
false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

27
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250623113345.java Normal file
View File

@@ -0,0 +1,27 @@
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_20250623113345 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomerDb(IntegryCustomerDB.Fiume_Licor))
return;
createSetup("STAMPA_DOCUMENTI", "STAMPA_LOGO", "LOGO_LISTINO_T2025", "marchio_tamai.png",
"Path logo da visualizzare nei moduli 8 e 9 per il listino specifciato", false, null, false, false,
false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

25
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250623123008.java Normal file
View File

@@ -0,0 +1,25 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250623123008 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (existsTable("apuliac_agg_prz_csv")){
executeStatement("alter table apuliac_agg_prz_csv add famiglia_2 varchar(max)");
executeStatement("alter table apuliac_agg_prz_csv add altro_2 varchar(max)");
executeStatement("alter table apuliac_agg_prz_csv add altro_3 varchar(max)");
executeStatement("alter table apuliac_agg_prz_csv add altro_4 varchar(max)");
}
}
@Override
public void down() throws Exception {
}
}

34
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250623123347.java Normal file
View File

@@ -0,0 +1,34 @@
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;
public class Migration_20250623123347 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement("ALTER TABLE mtb_lisa ADD part_iva_prod VARCHAR(20)",
"ALTER TABLE mtb_lisa ADD rag_soc_prod VARCHAR(255)");
if (isCustomerDb(IntegryCustomerDB.Carelli_Format)) {
executeStatement(
"update mtb_lisa\n" +
"set mtb_lisa.part_iva_prod = mtb_lisa_apulia_succ.partita_iva_forn,\n" +
"mtb_lisa.rag_soc_prod = mtb_lisa_apulia_succ.rag_soc_forn \n" +
"from mtb_lisa_apulia_succ \n" +
"inner join mtb_lisa on mtb_lisa_apulia_succ.cod_alis = mtb_lisa.cod_alis and\n" +
"mtb_lisa_apulia_succ.cod_art_for = mtb_lisa.cod_art_for\n" +
"where mtb_lisa_apulia_succ.cod_alis like 'AP%'\n" +
"and TRY_CAST(right(mtb_lisa_apulia_succ.cod_alis,2) as int) is null");
}
}
@Override
public void down() throws Exception {
}
}

363
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250623124120.java Normal file
View File

@@ -0,0 +1,363 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250623124120 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (isDMS()) return;
createOrUpdateFunction("getListinoAcquisto", "CREATE FUNCTION [dbo].[getListinoAcquisto] (@datavalidita DATETIME, @codalis VARCHAR(5), @codartfor VARCHAR(25), @codmart VARCHAR(15), @viewpromo VARCHAR(1), @codmdep VARCHAR(5))\n" +
" RETURNS TABLE AS\n" +
" RETURN\n" +
" SELECT listino_base.cod_alis,\n" +
" listino_base.descrizione,\n" +
" ISNULL(promozioni.versione, listino_base.versione) AS versione,\n" +
" ISNULL(promozioni.data_iniz, listino_base.data_iniz) AS data_iniz,\n" +
" ISNULL(promozioni.data_fine, listino_base.data_fine) AS data_fine,\n" +
" ISNULL(promozioni.cod_promo, listino_base.cod_promo) AS cod_promo,\n" +
" ISNULL(promozioni.note_listino, listino_base.note_listino) AS note_listino,\n" +
" promozioni.flag_tipo_promo,\n" +
" listino_base.cod_divi_acq,\n" +
" listino_base.expression_costo,\n" +
" listino_base.cod_mart,\n" +
" listino_base.cod_art_for,\n" +
" listino_base.unt_mis_acq,\n" +
" listino_base.rap_conv,\n" +
" ISNULL(promozioni.prz_acq, listino_base.prz_acq) AS prz_acq,\n" +
" ISNULL(promozioni.perc_1, listino_base.perc_1) AS perc_1,\n" +
" ISNULL(promozioni.perc_2, listino_base.perc_2) AS perc_2,\n" +
" ISNULL(promozioni.perc_3, listino_base.perc_3) AS perc_3,\n" +
" ISNULL(promozioni.perc_4, listino_base.perc_4) AS perc_4,\n" +
" ISNULL(promozioni.perc_promo_1, 0) AS perc_promo_1,\n" +
" ISNULL(promozioni.perc_promo_2, 0) AS perc_promo_2,\n" +
" ISNULL(promozioni.perc_promo_3, 0) AS perc_promo_3,\n" +
" ISNULL(promozioni.perc_promo_4, 0) AS perc_promo_4,\n" +
" listino_base.data_agg_prz,\n" +
" listino_base.perc_oneri,\n" +
" listino_base.val_oneri,\n" +
" listino_base.perc_promo,\n" +
" listino_base.val_promo,\n" +
" listino_base.qta_min_ord,\n" +
" listino_base.data_ult_prezzo,\n" +
" listino_base.gg_approvig,\n" +
" listino_base.flag_forn_pref,\n" +
" listino_base.flag_qta_multipla,\n" +
" listino_base.tipo_azione,\n" +
" listino_base.descr_art_forn,\n" +
" listino_base.cod_barre,\n" +
" listino_base.cod_barre_imb,\n" +
" listino_base.qta_cnf,\n" +
" listino_base.colli_strato,\n" +
" listino_base.colli_pedana,\n" +
" listino_base.cod_aliq,\n" +
" listino_base.note,\n" +
" listino_base.prz_ven_sug,\n" +
" listino_base.famiglia,\n" +
" listino_base.flag_attivo,\n" +
" listino_base.tipo_variazione,\n" +
" listino_base.prz_acq_um,\n" +
" listino_base.data_ins,\n" +
" listino_base.inserito_da,\n" +
" listino_base.modificato_da,\n" +
" listino_base.sconto_cartoni,\n" +
" listino_base.sconto_pedane,\n" +
" listino_base.sconto_stato,\n" +
" listino_base.partita_mag,\n" +
" listino_base.flag_prz_base_lisv,\n" +
" STUFF((SELECT ',' + atb_promo_depo.cod_mdep AS [text()]\n" +
" FROM atb_promo_depo\n" +
" WHERE atb_promo_depo.cod_alis = promozioni.cod_alis\n" +
" AND atb_promo_depo.versione = promozioni.versione\n" +
" FOR XML PATH('')), 1, 1, '') AS lista_depo,\n" +
" dbo.f_calcprznettoacq(listino_base.cod_alis,\n" +
" listino_base.expression_costo,\n" +
" ISNULL(promozioni.perc_1, listino_base.perc_1),\n" +
" ISNULL(promozioni.perc_2, listino_base.perc_2),\n" +
" ISNULL(promozioni.perc_3, listino_base.perc_3),\n" +
" ISNULL(promozioni.perc_4, listino_base.perc_4),\n" +
" ISNULL(promozioni.perc_promo_1, 0),\n" +
" ISNULL(promozioni.perc_promo_2, 0),\n" +
" ISNULL(promozioni.perc_promo_3, 0),\n" +
" ISNULL(promozioni.perc_promo_4, 0),\n" +
" listino_base.perc_promo,\n" +
" listino_base.val_promo,\n" +
" listino_base.perc_oneri,\n" +
" listino_base.val_oneri,\n" +
" ISNULL(promozioni.prz_acq, listino_base.prz_acq)) AS prz_acq_netto,\n" +
" dbo.f_calcprznettoacq(listino_base.cod_alis,\n" +
" listino_base.expression_costo,\n" +
" ISNULL(promozioni.perc_1, listino_base.perc_1),\n" +
" ISNULL(promozioni.perc_2, listino_base.perc_2),\n" +
" ISNULL(promozioni.perc_3, listino_base.perc_3),\n" +
" ISNULL(promozioni.perc_4, listino_base.perc_4),\n" +
" ISNULL(promozioni.perc_promo_1, 0),\n" +
" ISNULL(promozioni.perc_promo_2, 0),\n" +
" ISNULL(promozioni.perc_promo_3, 0),\n" +
" ISNULL(promozioni.perc_promo_4, 0),\n" +
" listino_base.perc_promo,\n" +
" listino_base.val_promo,\n" +
" listino_base.perc_oneri,\n" +
" listino_base.val_oneri,\n" +
" ISNULL(promozioni.prz_acq, listino_base.prz_acq_um)) AS prz_acq_netto_um,\n" +
" CASE\n" +
" WHEN listino_base.flag_prz_base_lisv = 'C' OR\n" +
" (listino_base.flag_prz_base_lisv = 'P' AND prz_ven_sug = 0) THEN\n" +
" IIf (promozioni.flag_riversa_promo = 1, \n" +
" dbo.f_calcprznettoacq(listino_base.cod_alis,\n" +
" listino_base.expression_costo,\n" +
" ISNULL(promozioni.perc_1, listino_base.perc_1),\n" +
" ISNULL(promozioni.perc_2, listino_base.perc_2),\n" +
" ISNULL(promozioni.perc_3, listino_base.perc_3),\n" +
" ISNULL(promozioni.perc_4, listino_base.perc_4),\n" +
" ISNULL(promozioni.perc_promo_1, 0),\n" +
" ISNULL(promozioni.perc_promo_2, 0),\n" +
" ISNULL(promozioni.perc_promo_3, 0),\n" +
" ISNULL(promozioni.perc_promo_4, 0),\n" +
" listino_base.perc_promo,\n" +
" listino_base.val_promo,\n" +
" listino_base.perc_oneri,\n" +
" listino_base.val_oneri,\n" +
" ISNULL(promozioni.prz_acq, listino_base.prz_acq)), \n" +
" dbo.f_calcprznettoacq(listino_base.cod_alis,\n" +
" listino_base.expression_costo,\n" +
" listino_base.perc_1,\n" +
" listino_base.perc_2,\n" +
" listino_base.perc_3,\n" +
" listino_base.perc_4,\n" +
" 0,\n" +
" 0,\n" +
" 0,\n" +
" 0,\n" +
" listino_base.perc_promo,\n" +
" listino_base.val_promo,\n" +
" listino_base.perc_oneri,\n" +
" listino_base.val_oneri,\n" +
" listino_base.prz_acq))\n" +
" ELSE prz_ven_sug END AS prz_base_lisv,\n" +
" listino_base.shelf_life,\n" +
" atb_list_data.cod_vage,\n" +
" atb_list_data.cod_vvet,\n" +
" ISNULL(promozioni.perc_prov, listino_base.perc_prov) AS perc_prov,\n" +
" ISNULL(promozioni.val_prov, listino_base.val_prov) AS val_prov,\n" +
" ISNULL(promozioni.qta_acq_contr, 0) AS qta_acq_contr,\n" +
" ISNULL(promozioni.costo_trasp, 0) AS costo_trasp,\n" +
" listino_base.tipo_calc_prz,\n" +
" listino_base.note_commerciali,\n" +
" listino_base.rag_soc_prod,\n" +
" listino_base.part_iva_prod\n" +
" FROM (SELECT atb_list.cod_alis,\n" +
" atb_list.descrizione,\n" +
" atb_list.tipo_calc_prz,\n" +
" mtb_lisa_data.versione AS versione,\n" +
" atb_list_data.data_iniz AS data_iniz,\n" +
" atb_list_data.data_fine AS data_fine,\n" +
" atb_list_data.cod_promo AS cod_promo,\n" +
" atb_list_data.note AS note_listino,\n" +
" atb_list.cod_divi_acq,\n" +
" atb_list.expression_costo,\n" +
" mtb_lisa.cod_mart,\n" +
" mtb_lisa.cod_art_for,\n" +
" mtb_lisa.unt_mis_acq,\n" +
" ISNULL(mtb_lisa.rap_conv, 1) AS rap_conv,\n" +
" ISNULL(mtb_lisa_data.prz_acq, mtb_lisa.prz_acq) AS 'prz_acq',\n" +
" ISNULL(mtb_lisa_data.perc_1, mtb_lisa.perc_1) AS 'perc_1',\n" +
" ISNULL(mtb_lisa_data.perc_2, mtb_lisa.perc_2) AS 'perc_2',\n" +
" ISNULL(mtb_lisa_data.perc_3, mtb_lisa.perc_3) AS 'perc_3',\n" +
" ISNULL(mtb_lisa_data.perc_4, mtb_lisa.perc_4) AS 'perc_4',\n" +
" ISNULL(mtb_lisa_data.data_agg_prz, mtb_lisa.data_agg_prz) AS 'data_agg_prz',\n" +
" ISNULL(mtb_lisa_data.perc_oneri, mtb_lisa.perc_oneri) AS 'perc_oneri',\n" +
" ISNULL(mtb_lisa_data.val_oneri, mtb_lisa.val_oneri) AS 'val_oneri',\n" +
" ISNULL(mtb_lisa_data.perc_promo, mtb_lisa.perc_promo) AS 'perc_promo',\n" +
" ISNULL(mtb_lisa_data.val_promo, mtb_lisa.val_promo) AS 'val_promo',\n" +
" mtb_lisa.qta_min_ord,\n" +
" mtb_lisa.data_ult_prezzo,\n" +
" mtb_lisa.gg_approvig,\n" +
" mtb_lisa.flag_forn_pref,\n" +
" mtb_lisa.flag_qta_multipla,\n" +
" mtb_lisa.tipo_azione,\n" +
" mtb_lisa.descr_art_forn,\n" +
" mtb_lisa.cod_barre,\n" +
" mtb_lisa.cod_barre_imb,\n" +
" CASE\n" +
" WHEN ISNULL(mtb_lisa_data.qta_cnf, mtb_lisa.qta_cnf) IS NULL\n" +
" OR (CAST(dbo.getgestsetupwithdefault('MTB_LISA', 'SETUP', 'IGNORE_QTA_CNF_UNO',\n" +
" '1') AS INT) = 1 AND\n" +
" ISNULL(mtb_lisa_data.qta_cnf, mtb_lisa.qta_cnf) = 1) OR\n" +
" ISNULL(mtb_lisa_data.qta_cnf, mtb_lisa.qta_cnf) = 0 THEN mtb_aart.qta_cnf\n" +
" ELSE ISNULL(mtb_lisa_data.qta_cnf, mtb_lisa.qta_cnf) END AS 'qta_cnf',\n" +
" mtb_lisa.colli_strato,\n" +
" mtb_lisa.colli_pedana,\n" +
" mtb_lisa.cod_aliq,\n" +
" mtb_lisa.note,\n" +
" ISNULL(mtb_lisa_data.prz_ven_sug, mtb_lisa.prz_ven_sug) AS prz_ven_sug,\n" +
" mtb_lisa.famiglia,\n" +
" CASE WHEN atb_list.flag_attivo = 'N' THEN 'N' ELSE mtb_lisa.flag_attivo END flag_attivo,\n" +
" mtb_lisa_data.tipo_variazione AS tipo_variazione,\n" +
" ROUND(ISNULL(mtb_lisa_data.prz_acq, mtb_lisa.prz_acq) / mtb_lisa.rap_conv, 5) AS prz_acq_um,\n" +
" atb_list_data.data_ins,\n" +
" atb_list_data.inserito_da,\n" +
" mtb_lisa_data.modificato_da,\n" +
" ISNULL(mtb_lisa_data.sconto_cartoni, 0) AS sconto_cartoni,\n" +
" ISNULL(mtb_lisa_data.sconto_pedane, 0) AS sconto_pedane,\n" +
" ISNULL(mtb_lisa_data.sconto_strato, 0) AS sconto_stato,\n" +
" atb_list_data.flag_tipo_promo AS flag_tipo_promo,\n" +
" mtb_lisa_data.partita_mag,\n" +
" atb_list.flag_prz_base_lisv,\n" +
" mtb_lisa.shelf_life,\n" +
" mtb_lisa_data.perc_prov,\n" +
" mtb_lisa_data.val_prov,\n" +
" mtb_lisa_data.qta_acq_contr,\n" +
" mtb_lisa_data.note_commerciali,\n" +
" mtb_lisa.part_iva_prod,\n" +
" mtb_lisa.rag_soc_prod\n" +
" FROM (SELECT atb_list.cod_alis,\n" +
" mtb_lisa.cod_art_for,\n" +
" MAX((CASE\n" +
" WHEN atb_list_data.versione IS NULL THEN NULL\n" +
" ELSE ISNULL(atb_list_data.cod_promo + '|', '') +\n" +
" CONVERT(VARCHAR(10), atb_list_data.data_iniz, 111) + ' ' +\n" +
" REPLICATE('0', 5 - LEN(atb_list_data.versione)) +\n" +
" CONVERT(VARCHAR(5), atb_list_data.versione) END)) AS max_lisa\n" +
" FROM atb_list\n" +
" INNER JOIN mtb_lisa ON atb_list.cod_alis = mtb_lisa.cod_alis\n" +
" LEFT OUTER JOIN mtb_lisa_data ON mtb_lisa.cod_alis = mtb_lisa_data.cod_alis AND\n" +
" mtb_lisa.cod_art_for = mtb_lisa_data.cod_art_for\n" +
" LEFT OUTER JOIN atb_list_data ON atb_list.cod_alis = atb_list_data.cod_alis AND\n" +
" mtb_lisa_data.versione = atb_list_data.versione AND\n" +
" atb_list_data.cod_promo IS NULL AND\n" +
" atb_list_data.data_iniz <= ISNULL(@datavalidita,\n" +
" CONVERT(DATETIME, CONVERT(VARCHAR(10), GETDATE(), 121)))\n" +
" WHERE (@codalis IS NULL OR atb_list.cod_alis = @codalis)\n" +
" AND (@codartfor IS NULL OR mtb_lisa.cod_art_for = @codartfor)\n" +
" AND (@codmart IS NULL OR mtb_lisa.cod_mart = @codmart)\n" +
" GROUP BY atb_list.cod_alis,\n" +
" mtb_lisa.cod_art_for) tmp_lisa\n" +
" INNER JOIN mtb_lisa ON tmp_lisa.cod_art_for = mtb_lisa.cod_art_for AND\n" +
" tmp_lisa.cod_alis = mtb_lisa.cod_alis\n" +
" INNER JOIN atb_list ON mtb_lisa.cod_alis = atb_list.cod_alis\n" +
" INNER JOIN gtb_divi ON atb_list.cod_divi_acq = gtb_divi.cod_divi\n" +
" LEFT OUTER JOIN mtb_lisa_data ON tmp_lisa.cod_alis = mtb_lisa_data.cod_alis AND\n" +
" tmp_lisa.cod_art_for = mtb_lisa_data.cod_art_for AND\n" +
" CONVERT(INT, RIGHT(tmp_lisa.max_lisa, 5)) =\n" +
" mtb_lisa_data.versione\n" +
" LEFT OUTER JOIN atb_list_data ON mtb_lisa_data.cod_alis = atb_list_data.cod_alis AND\n" +
" mtb_lisa_data.versione = atb_list_data.versione\n" +
" LEFT OUTER JOIN mtb_aart ON mtb_lisa.cod_mart = mtb_aart.cod_mart) listino_base\n" +
" LEFT OUTER JOIN (SELECT atb_list_data.cod_alis,\n" +
" mtb_lisa_data.cod_art_for,\n" +
" MIN(atb_list_data.data_iniz) AS data_iniz,\n" +
" MIN(atb_list_data.data_fine) AS data_fine,\n" +
" MIN(atb_list_data.versione) AS versione,\n" +
" MIN(atb_list_data.cod_promo) AS cod_promo,\n" +
" CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL THEN atb_list_data.note\n" +
" ELSE NULL END AS note_listino,\n" +
" MIN(atb_list_data.flag_tipo_promo) AS flag_tipo_promo,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'T' THEN mtb_lisa_data.prz_acq\n" +
" ELSE NULL END) AS prz_acq,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'T'\n" +
" THEN ROUND(mtb_lisa_data.prz_acq / mtb_lisa.rap_conv, 5)\n" +
" ELSE NULL END) AS prz_acq_um,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.perc_1\n" +
" ELSE NULL END) AS perc_1,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.perc_2\n" +
" ELSE NULL END) AS perc_2,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.perc_3\n" +
" ELSE NULL END) AS perc_3,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.perc_4\n" +
" ELSE NULL END) AS perc_4,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'E'\n" +
" THEN mtb_lisa_promo.perc_promo_1\n" +
" ELSE NULL END) AS perc_promo_1,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'E'\n" +
" THEN mtb_lisa_promo.perc_promo_2\n" +
" ELSE NULL END) AS perc_promo_2,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'E'\n" +
" THEN mtb_lisa_promo.perc_promo_3\n" +
" ELSE NULL END) AS perc_promo_3,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'E'\n" +
" THEN mtb_lisa_promo.perc_promo_4\n" +
" ELSE NULL END) AS perc_promo_4,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.perc_prov\n" +
" ELSE NULL END) AS perc_prov,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C' THEN mtb_lisa_data.val_prov\n" +
" ELSE NULL END) AS val_prov,\n" +
" MAX(CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL OR\n" +
" atb_list_data.flag_tipo_promo = 'C'\n" +
" THEN mtb_lisa_data.qta_acq_contr\n" +
" ELSE NULL END) AS qta_acq_contr,\n" +
" MAX(atb_list_data.costo_trasp) AS costo_trasp,\n" +
" atb_list_data.flag_riversa_promo\n" +
" FROM atb_list_data\n" +
" INNER JOIN atb_promo_depo\n" +
" ON atb_list_data.cod_alis = atb_promo_depo.cod_alis AND\n" +
" atb_list_data.versione = atb_promo_depo.versione\n" +
" INNER JOIN mtb_lisa_data\n" +
" ON atb_list_data.cod_alis = mtb_lisa_data.cod_alis AND\n" +
" atb_list_data.versione = mtb_lisa_data.versione\n" +
" INNER JOIN mtb_lisa ON mtb_lisa_data.cod_alis = mtb_lisa.cod_alis AND\n" +
" mtb_lisa_data.cod_art_for = mtb_lisa.cod_art_for\n" +
" INNER JOIN mtb_lisa_promo\n" +
" ON atb_list_data.cod_alis = mtb_lisa_promo.cod_alis AND\n" +
" atb_list_data.versione = mtb_lisa_promo.versione AND\n" +
" mtb_lisa.cod_art_for = mtb_lisa_promo.cod_art_for\n" +
" WHERE atb_list_data.cod_promo IS NOT NULL\n" +
" AND atb_list_data.data_iniz <=\n" +
" ISNULL(@datavalidita, CONVERT(DATETIME, CONVERT(VARCHAR(10), GETDATE(), 121)))\n" +
" AND atb_list_data.data_fine >=\n" +
" ISNULL(@datavalidita, CONVERT(DATETIME, CONVERT(VARCHAR(10), GETDATE(), 121)))\n" +
" AND (@codmdep IS NULL OR atb_promo_depo.cod_mdep = @codmdep)\n" +
" AND (@codalis IS NULL OR atb_list_data.cod_alis = @codalis)\n" +
" AND (@codartfor IS NULL OR mtb_lisa_data.cod_art_for = @codartfor)\n" +
" AND (@codmart IS NULL OR mtb_lisa.cod_mart = @codmart)\n" +
" AND @viewpromo = 'S'\n" +
" GROUP BY atb_list_data.cod_alis,\n" +
" mtb_lisa_data.cod_art_for,\n" +
" CASE\n" +
" WHEN atb_list_data.flag_tipo_promo IS NULL THEN atb_list_data.note\n" +
" ELSE NULL END,\n" +
" atb_list_data.flag_riversa_promo) promozioni\n" +
" ON listino_base.cod_alis = promozioni.cod_alis AND\n" +
" listino_base.cod_art_for = promozioni.cod_art_for\n" +
" LEFT OUTER JOIN atb_list_data ON atb_list_data.cod_alis = listino_base.cod_alis AND\n" +
" ISNULL(promozioni.versione, listino_base.versione) =\n" +
" atb_list_data.versione");
}
@Override
public void down() throws Exception {
}
}

20
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250623125857.java Normal file
View File

@@ -0,0 +1,20 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250623125857 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (existsTable("apuliac_agg_prz_csv")){
executeStatement("alter table apuliac_agg_prz_csv drop column altro_4");
}
}
@Override
public void down() throws Exception {
}
}

20
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250624104559.java Normal file
View File

@@ -0,0 +1,20 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250624104559 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement("update jrl_flav_users set flag_jflav_default = 'N' where flag_jflav_default is null",
"alter table jrl_flav_users alter column flag_jflav_default varchar(1) not null");
}
@Override
public void down() throws Exception {
}
}

19
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250624115342.java Normal file
View File

@@ -0,0 +1,19 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250624115342 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement("ALTER TABLE jrl_flav_users ADD CONSTRAINT DF_jrl_flav_users_flag_jflav_default default 'N' FOR flag_jflav_default ");
}
@Override
public void down() throws Exception {
}
}

314
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250625120735.java Normal file
View File

@@ -0,0 +1,314 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250625120735 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (isDMS()) return;
createOrUpdateFunction("getMaterialiDistinta", "CREATE FUNCTION [dbo].[getMaterialiDistinta](@codProd VARCHAR(15), @explodeSemilavorati bit)\n" +
" RETURNS TABLE\n" +
" AS\n" +
" RETURN\n" +
" ( \n" +
" -- Add the SELECT statement with parameter references here\n" +
" WITH distinta AS (SELECT cod_prod,\n" +
" CONVERT(VARCHAR(15), NULL) AS cod_parent,\n" +
" cod_prod AS cod_mart,\n" +
" jtb_cicl.descrizione_prod AS descrizione,\n" +
" jtb_cicl.descrizione_estesa,\n" +
" CONVERT(VARCHAR(3), unt_mis_prod) AS unt_mis_prod,\n" +
" CONVERT(NUMERIC(20, 5), rap_conv_prod) AS rap_conv_prod,\n" +
" CONVERT(NUMERIC(20, 5), jtb_cicl.qta_prod ) AS qta_prod,\n" +
" CONVERT(NUMERIC(20, 5), jtb_cicl.qta_prod ) AS qta_dist,\n" +
" 1 AS livello,\n" +
" FORMAT(ROW_NUMBER() OVER ( ORDER BY cod_prod), '00000') AS item_id,\n" +
" CONVERT(VARCHAR(15), cod_prod) AS cod_prod_pri,\n" +
" CAST(0 AS BIT) AS ricorsione,\n" +
" CONVERT(numeric(5,2), 0) as perc_sfrido,\n" +
" convert(int, null ) as num_fase,\n" +
" convert(varchar(1), null ) as flag_pri, \n" +
" convert(varchar(1024), null ) as note,\n" +
" cast(1 as bit) as is_root,\n" +
" cast(0 as bit) as is_foglia\n" +
" FROM jtb_cicl\n" +
" WHERE (@codProd IS NULL OR cod_prod = @codProd)\n" +
" UNION ALL\n" +
" SELECT distinta.cod_prod,\n" +
" CONVERT(VARCHAR(15), jtb_dist_mate.cod_prod) AS cod_parent,\n" +
" jtb_dist_mate.cod_mart,\n" +
" jtb_dist_mate.descrizione,\n" +
" jtb_dist_mate.descrizione_estesa,\n" +
" CONVERT(VARCHAR(3), jtb_dist_mate.unt_mis_dist) as unt_mis_prod,\n" +
" CONVERT(NUMERIC(20, 5), jtb_dist_mate.rap_conv_dist) as rap_conv_prod,\n" +
" CONVERT(NUMERIC(20, 5), ((jtb_dist_mate.qta_std * ( 1 + jtb_dist_mate.perc_sfrido/100)) / ( jtb_cicl.qta_prod )) * distinta.qta_prod ) as qta_prod,\n" +
" CONVERT(NUMERIC(20, 5), null),\n" +
" distinta.livello + 1,\n" +
" distinta.item_id + '_' +\n" +
" FORMAT(ROW_NUMBER() OVER ( ORDER BY jtb_dist_mate.flag_pri desc, jtb_dist_mate.num_fase, id_riga ), '00000') AS item_id,\n" +
" CONVERT(VARCHAR(15), distinta.cod_mart) AS cod_prod_pri,\n" +
" CAST(CASE\n" +
" WHEN jtb_dist_mate.cod_mart = jtb_dist_mate.cod_prod THEN 1\n" +
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +
" INNER JOIN distinta ON jtb_dist_mate.cod_prod = distinta.cod_mart\n" +
" INNER JOIN jtb_cicl ON jtb_dist_mate.cod_prod = jtb_cicl.cod_mart\n" +
" INNER JOIN mtb_aart ON mtb_aart.cod_mart = jtb_dist_mate.cod_mart\n" +
" WHERE distinta.ricorsione = 0 and (distinta.is_root = 1 or distinta.flag_pri = 'S' or @explodeSemilavorati = 1))\n" +
"\n" +
" SELECT cod_prod,\n" +
" cod_parent,\n" +
" cod_mart,\n" +
" descrizione,\n" +
" descrizione_estesa,\n" +
" unt_mis_prod,\n" +
" rap_conv_prod,\n" +
" IsNull(qta_dist,qta_prod) as qta_prod,\n" +
" livello,\n" +
" item_id,\n" +
" cod_prod_pri,\n" +
" perc_sfrido,\n" +
" num_fase, \n" +
" dense_rank() over ( partition by cod_prod order by cod_prod_pri ) - 1 + num_fase as num_fase_calc,\n" +
" flag_pri,\n" +
" note,\n" +
" is_root,\n" +
" is_foglia\n" +
" FROM distinta\n" +
" )");
createOrUpdateProcedure("MRP_UpdateQtaImpProx", "CREATE Procedure [dbo].[MRP_UpdateQtaImpProx](@elencoArticoli varchar(max) = null)\n" +
"AS \n" +
"--DECLARE @elencoarticoli VARCHAR(MAX) --= 'CEB1TREORI6|CEB1LMS5|CEBB1MRCH2|CVINACBO1LEV2'\n" +
"--DROP TABLE #tmp\n" +
"\n" +
"SET NOCOUNT ON;\n" +
"DECLARE @tableart TABLE\n" +
" (\n" +
" cod_mart VARCHAR(15)\n" +
" );\n" +
"\n" +
"IF @elencoarticoli IS NOT NULL AND @elencoarticoli <> ''\n" +
" BEGIN\n" +
" INSERT INTO @tableart\n" +
" SELECT *\n" +
" FROM dbo.parsestringintoarray(@elencoarticoli, '|')\n" +
" END\n" +
"ELSE\n" +
" BEGIN\n" +
" INSERT INTO @tableart\n" +
" SELECT mtb_aart.cod_mart\n" +
" FROM mtb_aart\n" +
" INNER JOIN jtb_cicl ON mtb_aart.cod_mart = jtb_cicl.cod_mart\n" +
" WHERE mtb_aart.flag_stato = 'A'\n" +
" END;\n" +
"\n" +
"WITH imp_ordini AS (SELECT mtb_part.cod_mart,\n" +
" mtb_aart.unt_mis,\n" +
" CASE\n" +
" WHEN SUM(mtb_part.qta_imp_cli) > SUM(mtb_part.qta_esistente + mtb_part.qta_ord_for) THEN\n" +
" SUM(mtb_part.qta_imp_cli - (mtb_part.qta_esistente + mtb_part.qta_ord_for))\n" +
" ELSE 0 END AS qtadaprodurre,\n" +
" CASE\n" +
" WHEN SUM(mtb_part.qta_imp_cli) > SUM(mtb_part.qta_esistente + mtb_part.qta_ord_for) THEN\n" +
" SUM(mtb_part.qta_imp_cli - (mtb_part.qta_esistente + mtb_part.qta_ord_for)) /\n" +
" mtb_aart.qta_cnf\n" +
" ELSE 0 END AS numdaprodurre,\n" +
" SUM((mtb_part.qta_esistente + mtb_part.qta_ord_for) - mtb_part.qta_imp_cli) AS qta_disp\n" +
" \n" +
" FROM mtb_part\n" +
" INNER JOIN jtb_cicl ON mtb_part.cod_mart = jtb_cicl.cod_prod\n" +
" INNER JOIN mtb_aart ON mtb_part.cod_mart = mtb_aart.cod_mart\n" +
" INNER JOIN @tableart a ON mtb_aart.cod_mart = a.cod_mart\n" +
" WHERE mtb_aart.flag_stato = 'A'\n" +
" GROUP BY mtb_part.cod_mart, mtb_aart.unt_mis, mtb_aart.qta_cnf\n" +
" HAVING SUM(mtb_part.qta_esistente + mtb_part.qta_ord_for) <> SUM(mtb_part.qta_imp_cli) \n" +
" \n" +
" \n" +
" )\n" +
" , imp_contratti AS ( SELECT c.cod_mart,\n" +
" ISNULL(SUM((qta_vend_contratto - qta_ord - qta_doc) /\n" +
" CASE WHEN c.rap_conv = 0 THEN 1 ELSE c.rap_conv END), 0) AS qtacontratto\n" +
" FROM vvw_contratti_vendita c\n" +
" INNER JOIN @tableart a ON c.cod_mart = a.cod_mart\n" +
" WHERE c.data_fine >= CAST(GETDATE() AS DATE)\n" +
" GROUP BY c.cod_mart\n" +
" HAVING ISNULL(SUM(qta_residua), 0) > 0)\n" +
" , imp_budget AS (SELECT b.cod_mart,\n" +
" SUM(qta_saldo) AS qta_bdg\n" +
" FROM ovw_budget_ordv b\n" +
" INNER JOIN @tableart a ON b.cod_mart = a.cod_mart\n" +
" WHERE CAST(GETDATE() AS DATE) BETWEEN b.data_iniz AND b.data_fine\n" +
" AND qta_saldo <> 0\n" +
" GROUP BY b.cod_mart)\n" +
" , tmp_impegni\n" +
" AS (SELECT ISNULL(ISNULL(imp_ordini.cod_mart, imp_contratti.cod_mart), imp_budget.cod_mart) AS cod_mart,\n" +
" SUM(ISNULL(imp_ordini.qtadaprodurre, 0)) AS qtadaprodurre,\n" +
" SUM(ISNULL(imp_ordini.numdaprodurre, 0)) AS numdaprodurre,\n" +
" SUM(ISNULL(imp_contratti.qtacontratto,0)) AS qtacontratto ,\n" +
" SUM(ISNULL(imp_budget.qta_bdg, 0)) AS qtabudget\n" +
" \n" +
" FROM imp_ordini\n" +
" FULL OUTER JOIN imp_contratti ON imp_ordini.cod_mart = imp_contratti.cod_mart\n" +
" FULL OUTER JOIN imp_budget ON imp_ordini.cod_mart = imp_budget.cod_mart\n" +
" \n" +
" GROUP BY ISNULL(ISNULL(imp_ordini.cod_mart, imp_contratti.cod_mart), imp_budget.cod_mart)\n" +
" HAVING SUM(ISNULL(imp_ordini.qtadaprodurre, 0)) <> 0\n" +
" OR SUM(ISNULL(imp_contratti.qtacontratto,0)) <> 0\n" +
" OR SUM(ISNULL(imp_budget.qta_bdg, 0)) <> 0)\n" +
"\n" +
"SELECT materiali.cod_mart,\n" +
" materiali.cod_prod,\n" +
" jtb_fasi.cod_mdep_lav AS cod_mdep,\n" +
" SUM(qtadaprodurre * (materiali.qta_prod * materiali.rap_conv) /\n" +
" (jtb_cicl.qta_prod * jtb_cicl.rap_conv_prod)) AS impegnatoprox,\n" +
" SUM(qtacontratto * (materiali.qta_prod * materiali.rap_conv) /\n" +
" (jtb_cicl.qta_prod * jtb_cicl.rap_conv_prod)) AS impproxcontratto,\n" +
" SUM(qtabudget * (materiali.qta_prod * materiali.rap_conv) /\n" +
" (jtb_cicl.qta_prod * jtb_cicl.rap_conv_prod)) AS impproxbudget,\n" +
" /*\n" +
" max(case when ord.gestione = 'L' THEN max_data_cons else null end ) as data_imp_prox,\n" +
" max(case when ord.gestione = 'A' THEN max_data_cons else null end ) as data_imp_prox_contr\n" +
" */\n" +
" IsNull(max(ORD.data_imp_prox), convert(date,GetDate())) as data_imp_prox,\n" +
" IsNull(max(ORD.data_imp_prox_contr), convert(date,GetDate())) as data_imp_prox_contr\n" +
"INTO #tmp\n" +
"FROM tmp_impegni\n" +
" INNER JOIN\n" +
" (\n" +
" SELECT cod_mart, descrizione_estesa, unt_mis_prod AS unt_doc, rap_conv_prod AS rap_conv, qta_prod, cod_prod\n" +
" FROM [dbo].getmaterialidistinta(NULL, 1)\n" +
" WHERE cod_parent IS NOT NULL) materiali ON materiali.cod_prod = tmp_impegni.cod_mart\n" +
" INNER JOIN jtb_cicl ON materiali.cod_prod = jtb_cicl.cod_prod\n" +
" INNER JOIN jtb_fasi ON jtb_cicl.cod_jfas = jtb_fasi.cod_jfas \n" +
" LEFT OUTER JOIN (\n" +
" /* Modifcata da Massimo 10/07/24 la vecchia query creva quantità doppie in presenza di ordini L e A\n" +
" select cod_mart, dtb_ordt.gestione, MAX(dtb_ordr.data_cons) as max_data_cons\n" +
" from dtb_ordt inner join dtb_ordr on dtb_ordt.gestione = dtb_ordr.gestione\n" +
" and dtb_ordt.data_ord = dtb_ordr.data_ord\n" +
" and dtb_ordt.num_ord = dtb_ordr.num_ord\n" +
" where dtb_ordt.gestione <> 'V' AND\n" +
" dtb_ordt.flag_annulla = 'N' and\n" +
" dtb_ordt.flag_budget = 0 and\n" +
" dtb_ordt.flag_sospeso = 'N' and\n" +
" dtb_ordt.flag_evaso_forzato = 'N' and \n" +
" dtb_ordr.flag_evaso = 'I' \n" +
" group by cod_mart, dtb_ordt.gestione\n" +
" */\n" +
" Select isNull(ODL.cod_mart,ODA.cod_mart) as cod_mart, ODL.data_imp_prox, ODA.data_imp_prox_contr\n" +
" from \n" +
" (select cod_mart, dtb_ordt.gestione, MAX(dtb_ordr.data_cons) as data_imp_prox\n" +
" from dtb_ordt inner join dtb_ordr on dtb_ordt.gestione = dtb_ordr.gestione\n" +
" and dtb_ordt.data_ord = dtb_ordr.data_ord\n" +
" and dtb_ordt.num_ord = dtb_ordr.num_ord\n" +
" where dtb_ordt.gestione = 'L' AND\n" +
" dtb_ordt.flag_annulla = 'N' and\n" +
" dtb_ordt.flag_budget = 0 and\n" +
" dtb_ordt.flag_sospeso = 'N' and\n" +
" dtb_ordt.flag_evaso_forzato = 'N' and \n" +
" dtb_ordt.flag_evaso_prod = 'I' and\n" +
" dtb_ordr.flag_evaso = 'I' \n" +
" group by cod_mart, dtb_ordt.gestione\n" +
" )ODL full outer join\n" +
" (\n" +
" select cod_mart, dtb_ordt.gestione, MAX(dtb_ordr.data_cons) as data_imp_prox_contr\n" +
" from dtb_ordt inner join dtb_ordr on dtb_ordt.gestione = dtb_ordr.gestione\n" +
" and dtb_ordt.data_ord = dtb_ordr.data_ord\n" +
" and dtb_ordt.num_ord = dtb_ordr.num_ord\n" +
" where dtb_ordt.gestione = 'A' AND\n" +
" dtb_ordt.flag_annulla = 'N' and\n" +
" dtb_ordt.flag_budget = 0 and\n" +
" dtb_ordt.flag_sospeso = 'N' and\n" +
" dtb_ordt.flag_evaso_forzato = 'N' and \n" +
" dtb_ordr.flag_evaso = 'I' \n" +
" \n" +
" group by cod_mart, dtb_ordt.gestione)\n" +
" ODA on ODA.cod_mart = ODL.cod_mart\n" +
" ) ORD ON materiali.cod_mart = ORD.cod_mart\n" +
"GROUP BY materiali.cod_prod,\n" +
" materiali.cod_mart,\n" +
" jtb_fasi.cod_mdep_lav\n" +
" \n" +
"SELECT cod_mart,\n" +
" cod_mdep,\n" +
" SUM(impegnatoprox) AS impegnatoprox,\n" +
" SUM(impproxcontratto) AS impproxcontratto,\n" +
" SUM(impproxbudget) AS impproxbudget,\n" +
" case when data_imp_prox < convert(date, GetDate()) then convert(date, getDate()) else data_imp_prox end data_imp_prox,\n" +
" case when data_imp_prox_contr < case when data_imp_prox < convert(date, GetDate()) then convert(date, getDate()) else data_imp_prox end \n" +
" then case when data_imp_prox < convert(date, GetDate()) then convert(date, getDate()) else data_imp_prox end \n" +
" else data_imp_prox_contr end as data_imp_prox_contr\n" +
" --case when data_imp_prox_contr is null then isNull(data_imp_prox,convert(date,GetDate())) else data_imp_prox_contr end as data_imp_prox_contr\n" +
" --IIF( data_imp_prox is null or data_imp_prox < Cast(getdate() as date), Cast(getdate() as date), data_imp_prox) as data_imp_prox,\n" +
" --IIF( data_imp_prox_contr is null or isNull(data_imp_prox_contr,data_imp_prox) < Cast(getdate() as date), Cast(getdate() as date), data_imp_prox_contr) as data_imp_prox_contr \n" +
"INTO #tmpsum\n" +
"FROM #tmp\n" +
"WHERE cod_mdep IS NOT NULL\n" +
"GROUP BY cod_mart, cod_mdep,\n" +
" data_imp_prox,\n" +
" data_imp_prox_contr\n" +
"\n" +
"INSERT INTO mtb_part (cod_mart, cod_mdep, scorta_min, qta_esistente, qta_imp_cli, qta_imp_lav, qta_ord_for)\n" +
"SELECT cod_mart, cod_mdep, 0, 0, 0, 0, 0\n" +
"FROM #tmpsum t\n" +
"WHERE NOT EXISTS(SELECT * FROM mtb_part WHERE mtb_part.cod_mart = t.cod_mart AND mtb_part.cod_mdep = t.cod_mdep)\n" +
"\n" +
"IF @elencoarticoli IS NULL OR @elencoarticoli = ''\n" +
" UPDATE mtb_part SET qta_imp_prox = 0, qta_imp_prox_contr = 0, qta_imp_prox_bdg = 0, data_imp_prox = null, data_imp_prox_contr = null\n" +
"ELSE\n" +
" UPDATE mtb_part\n" +
" SET qta_imp_prox = 0,\n" +
" qta_imp_prox_contr = 0,\n" +
" qta_imp_prox_bdg = 0,\n" +
" data_imp_prox = null, \n" +
" data_imp_prox_contr = null \n" +
" WHERE cod_mart IN (SELECT cod_mart FROM #tmpsum)\n" +
"\n" +
"UPDATE mtb_part\n" +
"SET qta_imp_prox = q.impegnatoprox,\n" +
" qta_imp_prox_contr = q.impproxcontratto,\n" +
" qta_imp_prox_bdg = q.impproxbudget,\n" +
" data_imp_prox = DateAdd(day, 1, q.data_imp_prox), \n" +
" data_imp_prox_contr = DateAdd(day, 1, q.data_imp_prox_contr )\n" +
"FROM mtb_part\n" +
" INNER JOIN #tmpsum q ON mtb_part.cod_mdep = q.cod_mdep AND mtb_part.cod_mart = q.cod_mart\n" +
"\n" +
"IF EXISTS(SELECT *\n" +
" FROM #tmp\n" +
" WHERE cod_mdep IS NULL)\n" +
" BEGIN\n" +
"\n" +
"\n" +
" DECLARE @message VARCHAR(MAX), @email VARCHAR(MAX)\n" +
"\n" +
" SELECT @email = e_mail FROM stb_email WHERE flag_default = 'S';\n" +
"\n" +
" SET @message = 'Verificare i seguenti articoli: la fase non ha il deposito agganciato.' + CHAR(10) + CHAR(13)\n" +
" SELECT @message = @message +\n" +
" STUFF((SELECT ',' + cod_prod\n" +
" FROM #tmp\n" +
" WHERE cod_mdep IS NULL\n" +
" FOR XML PATH('')), 1, 1, '')\n" +
"\n" +
" EXECUTE [dbo].[sp_sendEmail] @email, 'helpdesk@integry.it', 'Errore Impegni Prossimi', @message\n" +
"\n" +
" END");
}
@Override
public void down() throws Exception {
}
}

23
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250626104905.java Normal file
View File

@@ -0,0 +1,23 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250626104905 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (isDMS()) return;
executeStatement("UPDATE stb_menu set descrizione = 'Documenti di Acquisto' where tipo_azienda = 'PRODUZIONE ALIMENTARE' AND cod_opz = 'ag032' and pos = 392",
"UPDATE stb_menu set descrizione = 'Documenti di Lavorazione' where tipo_azienda = 'PRODUZIONE ALIMENTARE' AND cod_opz = 'lg082' and pos = 394",
"UPDATE stb_menu set descrizione = 'Documenti di Vendita' where tipo_azienda = 'PRODUZIONE ALIMENTARE' AND cod_opz = 'vg106' and pos = 396");
}
@Override
public void down() throws Exception {
}
}

27
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250626131745.java Normal file
View File

@@ -0,0 +1,27 @@
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_20250626131745 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomerDb(IntegryCustomerDB.DolceBonta_DolceBo))
return;
createSetup("FATTURA_ELETTRONICA_CUSTOM", "COD_ANAG_02059", "CAUSALE_COD_VDES_02", "P.IVA 02241550546",
null, false, null, false, false,
false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

21
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250626153418.java Normal file
View File

@@ -0,0 +1,21 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250626153418 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (isDMS()) return;
executeStatement("ALTER TABLE mtb_aart ADD flag_reso_tec BIT DEFAULT 0 NOT NULL");
}
@Override
public void down() throws Exception {
}
}

48
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250627123342.java Normal file
View File

@@ -0,0 +1,48 @@
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.MigrationModelInterface;
public class Migration_20250627123342 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomer(IntegryCustomer.Biolevante)) return;
createOrUpdateFunction("f_suggestCodeCodVvet", "CREATE FUNCTION [dbo].[f_suggestCodeCodVvet](@partialCode VARCHAR(5))\n" +
" RETURNS VARCHAR(20)\n" +
"AS\n" +
"BEGIN\n" +
" DECLARE @ls_codVvet VARCHAR(5), @codLen INT, @condPartialCode VARCHAR(10);\n" +
"\n" +
" SELECT @condPartialCode = ISNULL(@partialCode, '') + '[0-9]';\n" +
"\n" +
" SELECT @partialCode = ISNULL(@partialCode, '');\n" +
"\n" +
" SET @codLen = 4;\n" +
"\n" +
" SELECT @ls_codVvet =\n" +
" @partialCode + REPLICATE('0', @codLen - LEN(@partialCode) - LEN(max_code.partial_code)) +\n" +
" max_code.partial_code\n" +
" FROM (SELECT CAST(ISNULL(MAX(CAST(SUBSTRING(cod_vvet, LEN(@partialCode) + 1,\n" +
" LEN(cod_vvet) - LEN(@partialCode)) AS NUMERIC)), 0) +\n" +
" 1 AS VARCHAR) AS partial_code\n" +
" FROM vtb_vett\n" +
" WHERE cod_vvet LIKE @condPartialCode + '%') max_code;\n" +
"\n" +
" RETURN @ls_codVvet;\n" +
"END");
}
@Override
public void down() throws Exception {
}
}

3
ems-core/src/main/java/it/integry/ems/rules/completing/ConfigActivityRules.java
View File

@@ -80,6 +80,9 @@ public class ConfigActivityRules extends QueryRules {
String codJflav = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (UtilityString.isNullOrEmpty(codJflav))
throw new Exception(String.format("Codice lavoratore non trovato per l'utente (%s)", entity.getUserName()));
ArrayList<JtbRLavt> returnList = new ArrayList<>();
sql =

8
ems-core/src/main/java/it/integry/ems/rules/completing/PreventRules.java
View File

@@ -14,6 +14,7 @@ import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.Statement;
public class PreventRules extends QueryRules {
public static PtbPrevn setPtbPrevn(Connection connection, PtbPrevtFile ptbPrevtFile) throws Exception {
String sql = "SELECT num_file_descr FROM ptb_prevn";
Integer numFileDB = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
@@ -29,7 +30,6 @@ public class PreventRules extends QueryRules {
else
sqlUpdate = "UPDATE ptb_prevn SET num_file_descr = " + UtilityDB.valueToString(Integer.parseInt(nomeFile));
ptbPrevn.setNativeSql(sqlUpdate);
ptbPrevn.setOperation(OperationType.INSERT_OR_UPDATE);
} else {
@@ -39,6 +39,12 @@ public class PreventRules extends QueryRules {
return ptbPrevn;
}
public static String getNextNumFile(Connection conn) throws Exception {
Integer result = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, "SELECT num_file_descr FROM ptb_prevn");
return UtilityString.IntegerToString(result != null ? result + 1 : 1, "00000000");
}
public static void updateRifOrdOfferta(Connection conn, DtbOrdt entity) throws Exception {
String importFromOfferta = setupGest.getSetup(conn, "w_vordi_rc", "OFFERTE", "IMPORT_ORDINE_DA_OFFERTA");
if (UtilityString.streNull(importFromOfferta).compareTo("S") == 0) {

63
ems-core/src/main/java/it/integry/ems/rules/completing/PurchasesRules.java
View File

@@ -18,6 +18,7 @@ import java.math.BigDecimal;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.*;
import java.time.LocalDate;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;
@@ -87,7 +88,7 @@ public class PurchasesRules extends QueryRules {
public static HashMap<String, Object> completeDatiLisa(Connection connection, MtbLisaData entity) throws Exception {
String codAlis, codArtFor, sql;
Date dataIniz;
LocalDate dataIniz;
codAlis = entity.getCodAlis();
codArtFor = entity.getCodArtFor();
@@ -95,7 +96,7 @@ public class PurchasesRules extends QueryRules {
sql = "SELECT prz_acq, prz_ven_sug, perc_1, perc_2, perc_3, perc_4, perc_oneri, val_oneri, perc_promo, val_promo, tipo_variazione"
+ " FROM dbo.getListinoAcquisto("
+ UtilityDB.valueDateToString(dataIniz, CommonConstants.DATE_FORMAT_YMD) + ","
+ UtilityDB.valueToString(dataIniz) + ","
+ UtilityDB.valueToString(codAlis) + "," + UtilityDB.valueToString(codArtFor) + ", null, 'N', null)";
HashMap<String, Object> campi = (HashMap<String, Object>) returnMapData(connection, sql, entity);
@@ -116,20 +117,20 @@ public class PurchasesRules extends QueryRules {
if (OperationType.INSERT != atbListData.getOperation()) {
query = "SELECT versione FROM atb_list_data WHERE cod_alis = "
+ UtilityDB.valueToString(atbListData.getCodAlis()) + " and data_iniz = "
+ UtilityDB.valueDateToString(atbListData.getDataIniz(), CommonConstants.DATE_FORMAT_YMD)
+ UtilityDB.valueToString(atbListData.getDataIniz())
+ " and cod_promo is null";
}
} else if (!UtilityString.isNullOrEmpty(atbListData.getCodPromo())) {
query = "SELECT versione FROM atb_list_data WHERE cod_alis = "
+ UtilityDB.valueToString(atbListData.getCodAlis()) + " and data_iniz = "
+ UtilityDB.valueDateToString(atbListData.getDataIniz(), CommonConstants.DATE_FORMAT_YMD)
+ UtilityDB.valueToString(atbListData.getDataIniz())
+ " and cod_promo = " + UtilityDB.valueToString(atbListData.getCodPromo());
} else if (atbListData.getDataIniz() != null && atbListData.getDataFine() != null) {
query = "SELECT versione FROM atb_list_data WHERE cod_alis = "
+ UtilityDB.valueToString(atbListData.getCodAlis()) + " and data_iniz = "
+ UtilityDB.valueDateToString(atbListData.getDataIniz(), CommonConstants.DATE_FORMAT_YMD)
+ " and data_fine = " + UtilityDB.valueDateToString(atbListData.getDataFine(), CommonConstants.DATE_FORMAT_YMD) + " AND "
+ UtilityDB.valueToString(atbListData.getDataIniz())
+ " and data_fine = " + UtilityDB.valueToString(atbListData.getDataFine()) + " AND "
+ "(" + UtilityDB.valueToString(atbListData.getFlagTipoPromo()) + " is not null AND atb_list_data.flag_tipo_promo = " + UtilityDB.valueToString(atbListData.getFlagTipoPromo()) + ")";
}
@@ -152,42 +153,28 @@ public class PurchasesRules extends QueryRules {
}
public static String completeCodPromo(Connection conn, AtbListData entity) throws SQLException {
String codPromo = null;
String query =
"SELECT cod_promo " +
" FROM atb_list_data " +
" WHERE cod_alis = " + UtilityDB.valueToString(entity.getCodAlis()) + " AND " +
" versione = " + UtilityDB.valueToString(entity.getVersione());
PreparedStatement ps = conn.prepareStatement(query);
ResultSet rs = ps.executeQuery();
String codPromo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, query);
if (rs.next()) {
codPromo = rs.getString(1);
} else if (entity.getDataFine() != null) {
if (UtilityString.isNullOrEmpty(codPromo) && entity.getDataFine() != null) {
codPromo = entity.getCodAlis() + UtilityString.leftPad(entity.getVersione().toString(), 5, '0');
}
rs.close();
ps.close();
return codPromo;
}
public static Date completeDataFine(Connection conn, String codAlis, Integer versione) throws SQLException {
Date dataFine = null;
public static LocalDate completeDataFine(Connection conn, String codAlis, Integer versione) throws SQLException {
String query =
"SELECT data_fine " +
" FROM atb_list_data " +
" WHERE cod_alis = " + UtilityDB.valueToString(codAlis) + " AND " +
" versione = " + UtilityDB.valueToString(versione);
PreparedStatement ps = conn.prepareStatement(query);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
dataFine = rs.getDate(1);
}
rs.close();
ps.close();
LocalDate dataFine = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, query);
return dataFine;
}
@@ -211,7 +198,10 @@ public class PurchasesRules extends QueryRules {
.setRapConv(mtbLisaData.getRapConv())
.setColliStrato(mtbLisaData.getColliStrato())
.setCodAliq(mtbLisaData.getCodAliq())
.setNote(mtbLisaData.getNote());
.setNote(mtbLisaData.getNote())
.setShelfLife(mtbLisaData.getShelfLife())
.setPartIvaProd(mtbLisaData.getPartIvaProd())
.setRagSocProd(mtbLisaData.getRagSocProd());
mtbLisa.setOperation(OperationType.INSERT_OR_UPDATE);
mtbLisa.setExcludedColumns(mtbLisaData.getExcludedColumns());
@@ -241,25 +231,6 @@ public class PurchasesRules extends QueryRules {
HashMap<String, Object> campi = returnMapData(conn, query, atbListData);
return campi;
/*PreparedStatement ps = conn.prepareStatement(query);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0; i < rsmd.getColumnCount(); i++) {
String columnName = UtilityString.sqlToField(rsmd.getColumnName(i + 1));
Object columnValue = rs.getObject(i + 1);
Object valueEntity = DroolsUtil.getFieldValue(atbListData, columnName);
String[] fields = new String[] { columnName };
if (valueEntity == null){
DroolsUtil.completeEntity(atbListData, fields, columnValue);
}
}
}
rs.close();
ps.close();*/
}
@@ -538,7 +509,7 @@ public class PurchasesRules extends QueryRules {
String sql = "SELECT data_iniz FROM atb_list_data "
+ "WHERE cod_alis = " + UtilityDB.valueToString(entity.getCodAlis()) + " AND "
+ "versione = " + UtilityDB.valueToString(entity.getVersione()) + " AND "
+ "data_iniz <> " + UtilityDB.valueDateToString(entity.getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " AND "
+ "data_iniz <> " + UtilityDB.valueToString(entity.getDataIniz()) + " AND "
+ "cod_promo is null ";
PreparedStatement ps = conn.prepareStatement(sql);
ResultSet rs = ps.executeQuery();
@@ -658,7 +629,7 @@ public class PurchasesRules extends QueryRules {
"where atb_list_data.cod_alis = " + UtilityDB.valueToString(entity.getCodAlis()) + " and " +
"atb_list_data.flag_tipo_promo " +
(UtilityString.isNullOrEmpty(entity.getFlagTipoPromo()) ? " IS NULL" : " = " + UtilityDB.valueToString(entity.getFlagTipoPromo())) + " AND " +
UtilityDB.valueDateToString(entity.getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " between atb_list_data.data_iniz and atb_list_data.data_fine AND " +
UtilityDB.valueToString(entity.getDataIniz()) + " between atb_list_data.data_iniz and atb_list_data.data_fine AND " +
"NOT (atb_list_data.cod_alis = " + UtilityDB.valueToString(entity.getCodAlis()) + " AND atb_list_data.versione = " + UtilityDB.valueToString(entity.getVersione()) + " )";
sql = UtilityDB.addwhereCond(sql, whereCondArtPromo, true);

109
ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java
View File

@@ -161,14 +161,106 @@ public class ProductionOrderDataHandlerService {
throw new Exception("Errore durante l'interpretazione del campo \"flagEvaso\"");
}
String query;
if (flagEvaso.equalsIgnoreCase("E")) {
query = (
"WITH colli AS (SELECT mtb_colt.gestione,\n" +
" mtb_colt.data_ord,\n" +
" mtb_colt.num_ord,\n" +
" mtb_colr.cod_mart,\n" +
" ISNULL(mtb_partita_mag.partita_mag_prod, mtb_colr.partita_mag) AS partita_mag,\n" +
" SUM(mtb_colr.qta_col) AS qta_col,\n" +
" SUM(mtb_colr.num_cnf) AS num_cnf,\n" +
" COUNT(DISTINCT mtb_colt.num_collo) AS udc,\n" +
" mtb_partita_mag.data_scad \n" +
" FROM mtb_colt\n" +
" INNER JOIN mtb_colr ON mtb_colt.gestione = mtb_colr.gestione AND\n" +
" mtb_colt.data_collo = mtb_colr.data_collo AND\n" +
" mtb_colt.ser_collo = mtb_colr.ser_collo AND\n" +
" mtb_colt.num_collo = mtb_colr.num_collo\n" +
" INNER JOIN mtb_partita_mag ON mtb_colr.cod_mart = mtb_partita_mag.cod_mart\n" +
" AND mtb_colr.partita_mag = mtb_partita_mag.partita_mag\n" +
" WHERE mtb_colt.segno = 1\n" +
" AND mtb_colt.gestione = 'L'\n" +
" AND mtb_colr.data_ord BETWEEN [START_DATE] AND [END_DATE]\n" +
" GROUP BY mtb_colt.gestione,\n" +
" mtb_colt.data_ord,\n" +
" mtb_colt.num_ord,\n" +
" mtb_colr.cod_mart,\n" +
" ISNULL(mtb_partita_mag.partita_mag_prod, mtb_colr.partita_mag), \n" +
" mtb_partita_mag.data_scad),\n" +
" steps AS (SELECT dtb_ord_steps.gestione,\n" +
" dtb_ord_steps.data_ord,\n" +
" dtb_ord_steps.num_ord,\n" +
" dtb_ord_steps.cod_jfas,\n" +
" MAX(dtb_ord_steps.data_fine) AS data_fine\n" +
" FROM dtb_ord_steps\n" +
" GROUP BY dtb_ord_steps.gestione,\n" +
" dtb_ord_steps.data_ord,\n" +
" dtb_ord_steps.num_ord,\n" +
" dtb_ord_steps.cod_jfas)\n" +
"SELECT dtb_ordt.data_ord data_ord_prod,\n" +
" dtb_ordt.num_ord num_ord_prod,\n" +
" ordl.gestione,\n" +
" ordl.data_ord,\n" +
" ordl.num_ord,\n" +
" ordl.cod_prod,\n" +
" IsNull(colli.partita_mag, ordl.partita_mag) AS partita_mag,\n" +
" ordl.unt_mis_prod AS unt_ord,\n" +
" IsNull(colli.qta_col, ordl.qta_evasa_prod) as qta_prod,\n" +
" isNull(colli.qta_col, 0) AS qta_trasferite,\n" +
" isNull(colli.udc, 0) AS udc_trasferiti,\n" +
" ordl.cod_anag,\n" +
" ordl.cod_mdep,\n" +
" ordl.rap_conv_prod AS rap_conv,\n" +
" steps.cod_jfas,\n" +
" steps.data_fine,\n" +
" ordl.note AS note_lav,\n" +
" ordl.colli_pedana,\n" +
" ordl.riga_ord_rif riga_ord_prod,\n" +
" ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_prod,\n" +
" colli.data_scad,\n" +
" jl.id_lotto\n" +
"FROM dtb_ordt\n" +
" INNER JOIN dtb_ordt ordl ON dtb_ordt.gestione = ordl.gestione_rif\n" +
" AND dtb_ordt.data_ord = ordl.data_ord_rif\n" +
" AND dtb_ordt.num_ord = ordl.num_ord_rif\n" +
" INNER JOIN steps ON ordl.gestione = steps.gestione AND\n" +
" ordl.data_ord = steps.data_ord AND\n" +
" ordl.num_ord = steps.num_ord\n" +
" INNER JOIN mtb_aart ON ordl.cod_prod = mtb_aart.cod_mart\n" +
" INNER JOIN colli ON colli.gestione = ordl.gestione AND\n" +
" ordl.data_ord = colli.data_ord AND\n" +
" ordl.num_ord = colli.num_ord \n" +
" LEFT OUTER JOIN jtb_lotr jl\n" +
" ON steps.cod_jfas = jl.cod_jfas AND\n" +
" ordl.gestione = jl.gestione AND\n" +
" ordl.data_ord = jl.data_ord AND\n" +
" ordl.num_ord = jl.num_ord\n" +
"WHERE dtb_ordt.gestione = 'A'\n" +
" AND dtb_ordt.gestione_rif = 'A'\n" +
" AND dtb_ordt.data_ord BETWEEN [START_DATE] AND [END_DATE]\n" +
" AND ordl.flag_evaso_prod = 'E'\n" +
"ORDER BY dtb_ordt.data_ord,\n" +
" dtb_ordt.num_ord,\n" +
" ordl.gestione,\n" +
" ordl.data_ord,\n" +
" ordl.num_ord" )
.replace("[START_DATE]", UtilityDB.valueToString(startDate))
.replace("[END_DATE]", UtilityDB.valueToString(endDate));
String query = "SELECT * FROM MES_GetWorkOrders(" +
(linee != null && linee.size() == 1 ? UtilityDB.valueToString(linee.get(0)) : "NULL") + ", " +
UtilityDB.valueToString(startDate) + " , " +
UtilityDB.valueToString(endDate) + "," +
UtilityDB.valueToString(flagEvaso) + "," +
UtilityDB.valueToString(codAnag) + ")\n" +
"ORDER BY sort";
if (linee != null ) {
query = UtilityDB.addwhereCond(query, "ordl.cod_jfas IN (" + UtilityDB.listValueToString(linee) + ")", true);
}
} else {
query = "SELECT * FROM MES_GetWorkOrders(" +
(linee != null && linee.size() == 1 ? UtilityDB.valueToString(linee.get(0)) : "NULL") + ", " +
UtilityDB.valueToString(startDate) + " , " +
UtilityDB.valueToString(endDate) + "," +
UtilityDB.valueToString(flagEvaso) + "," +
UtilityDB.valueToString(codAnag) + ")\n" +
"ORDER BY sort";
}
//logger.debug("Query: " + query);
@@ -178,6 +270,8 @@ public class ProductionOrderDataHandlerService {
if (ordiniLavorazioneList == null || ordiniLavorazioneList.isEmpty())
return null;
if (flagEvaso.equalsIgnoreCase("E")) return ordiniLavorazioneList;
//Filter by codJfas
if (linee != null) {
linee = linee.stream()
@@ -194,7 +288,6 @@ public class ProductionOrderDataHandlerService {
return null;
}
for (OrdineLavorazioneDTO ordineDTO : ordiniLavorazioneList) {
if (ordineDTO.getStato().equalsIgnoreCase("IN CORSO")) {

27
ems-core/src/main/java/it/integry/ems/settings/SettingsController.java
View File

@@ -23,10 +23,8 @@ import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class SettingsController implements IFileWatcherEvents {
@@ -136,6 +134,7 @@ public class SettingsController implements IFileWatcherEvents {
settingsModel.getMinioConfiguration().setExcludedEntities(new ArrayList<>());
} else {
SettingsModel newSettingsModel = objectMapper.readValue(configurationFile, SettingsModel.class);
UtilityReflection.copyFields(newSettingsModel, settingsModel);
if (UtilityString.isNullOrEmpty(settingsModel.getDefaultProfile())) {
@@ -169,6 +168,26 @@ public class SettingsController implements IFileWatcherEvents {
this.save();
String availableProfiles = System.getenv("AVAILABLE_PROFILES");
if (!UtilityString.isNullOrEmpty(availableProfiles)) {
ArrayList<String> availableConnections = new ArrayList<>(Arrays.asList(availableProfiles.split(",")));
logger.info("Impostando connessioni a: " + availableProfiles);
if (availableConnections.stream().noneMatch(s -> s.equalsIgnoreCase(this.settingsModel.getDefaultProfile()))) {
availableConnections.add(this.settingsModel.getDefaultProfile());
}
List<AvailableConnectionsModel> availableConnectionsModels = this.settingsModel.getAvailableConnections()
.stream()
.filter(availableConnectionsModel ->
availableConnections.stream().anyMatch(s -> s.equalsIgnoreCase(availableConnectionsModel.getProfileName())))
.collect(Collectors.toList());
this.settingsModel.setAvailableConnections(new ArrayList<>(availableConnectionsModels));
}
FileWatcher fileWatcher = new FileWatcher(configurationFile);
fileWatcher.setFileWatcherEvents(this);
fileWatcher.start();

4
ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java
View File

@@ -19,9 +19,6 @@ public class EmsRestConstants {
public static final BigDecimal BIGDECIMAL_NULL = new BigDecimal(Integer.MIN_VALUE);
public static final String ENTITY_TYPE = "type";
public static final String PATH_CRM_CREA_NUOVO_CONTATTO = "creaNuovoContattoCRM";
public static final String PATH_CRM_COMPLETA_OFFERTA = "completaOffertaCRM";
public static final String PATH_CRM_SALVA_ATTIVITA = "salvaAttivitaCRM";
public static final String PATH_IMPORT_COSTI_TRASPORTO_PAPAGNI = "importCostiTrasportoPapagni";
public static final String PATH_IMPORT_COSTI_TRASPORTO_STEF = "importCostiTrasportoStef";
@@ -31,7 +28,6 @@ public class EmsRestConstants {
public static final String PATH_ICON_GENERA_LISTAMOV_DA_APPROV = "ICON_GENERA_LISTAMOV_DA_APPROV";
public static final String PATH_ICON_INVIO_MISSIONE_PICKING = "ICON_EXPORT_LISTAMOV";
public static final String PATH_ABILITA_GESTIONI_PVM = "abilitaGestioniPVM";
public static final String PATH_TRASFERIMENTO_PROSPECT_TO_CLIENTE = "trasferimentoProspectToCliente";
public static final String PATH_DELETE_UL_IF_EMPTY = "deleteULIfEmpty";
public static final String PATH_GET_ORDINE_APERTO_IN_LINEA = "getOrdineApertoInLinea";
public static final String PATH_CHECK_IF_VERSAMENTO_PRODUZIONE_IS_VALID = "checkIfVersamentoProduzioneIsValid";

54
ems-core/src/main/java/it/integry/ems_model/entity/AtbListData.java
View File

@@ -11,6 +11,8 @@ import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,16 +39,16 @@ public class AtbListData extends EntityBase {
private Integer versione;
@SqlField(value = "data_iniz", nullable = false, format = CommonConstants.SYSDATE)
private Date dataIniz;
private LocalDate dataIniz;
@SqlField(value = "data_iniz_sell_out", format = CommonConstants.SYSDATE)
private Date dataInizSellOut;
private LocalDate dataInizSellOut;
@SqlField(value = "data_fine", format = CommonConstants.SYSDATE)
private Date dataFine;
private LocalDate dataFine;
@SqlField(value = "data_fine_sell_out", format = CommonConstants.SYSDATE)
private Date dataFineSellOut;
private LocalDate dataFineSellOut;
@SqlField(value = "cod_divi_acq", maxLength = 5, nullable = false)
private String codDiviAcq;
@@ -58,13 +60,13 @@ public class AtbListData extends EntityBase {
private String codPromo;
@SqlField(value = "data_ins", defaultObjectValue = CommonConstants.TIMESTAMP)
private Date dataIns;
private LocalDateTime dataIns;
@SqlField(value = "inserito_da", maxLength = 40)
private String inseritoDa;
@SqlField(value = "data_mod", defaultObjectValue = CommonConstants.TIMESTAMP)
private Date dataMod;
private LocalDateTime dataMod;
@SqlField(value = "modificato_da", maxLength = 40)
private String modificatoDa;
@@ -123,42 +125,52 @@ public class AtbListData extends EntityBase {
return this;
}
public Date getDataIniz() {
public LocalDate getDataIniz() {
return dataIniz;
}
public AtbListData setDataIniz(Date dataIniz) {
public AtbListData setDataIniz(LocalDate dataIniz) {
this.dataIniz = dataIniz;
return this;
}
public Date getDataInizSellOut() {
public LocalDate getDataInizSellOut() {
return dataInizSellOut;
}
public AtbListData setDataInizSellOut(Date dataInizSellOut) {
public AtbListData setDataInizSellOut(LocalDate dataInizSellOut) {
this.dataInizSellOut = dataInizSellOut;
return this;
}
public Date getDataFine() {
public LocalDate getDataFine() {
return dataFine;
}
public AtbListData setDataFine(Date dataFine) {
public AtbListData setDataFine(LocalDate dataFine) {
this.dataFine = dataFine;
return this;
}
public Date getDataFineSellOut() {
public LocalDate getDataFineSellOut() {
return dataFineSellOut;
}
public AtbListData setDataFineSellOut(Date dataFineSellOut) {
public AtbListData setDataFineSellOut(LocalDate dataFineSellOut) {
this.dataFineSellOut = dataFineSellOut;
return this;
}
public AtbListData setDataIns(LocalDateTime dataIns) {
this.dataIns = dataIns;
return this;
}
public AtbListData setDataMod(LocalDateTime dataMod) {
this.dataMod = dataMod;
return this;
}
public String getCodDiviAcq() {
return codDiviAcq;
}
@@ -186,15 +198,10 @@ public class AtbListData extends EntityBase {
return this;
}
public Date getDataIns() {
public LocalDateTime getDataIns() {
return dataIns;
}
public AtbListData setDataIns(Date dataIns) {
this.dataIns = dataIns;
return this;
}
public String getInseritoDa() {
return inseritoDa;
}
@@ -204,15 +211,10 @@ public class AtbListData extends EntityBase {
return this;
}
public Date getDataMod() {
public LocalDateTime getDataMod() {
return dataMod;
}
public AtbListData setDataMod(Date dataMod) {
this.dataMod = dataMod;
return this;
}
public String getModificatoDa() {
return modificatoDa;
}

9
ems-core/src/main/java/it/integry/ems_model/entity/CtbAnag.java
View File

@@ -45,24 +45,27 @@ public class CtbAnag extends EntityBase implements EquatableEntityInterface<CtbA
return codAnag;
}
public void setCodAnag(String codAnag) {
public CtbAnag setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodCcon() {
return codCcon;
}
public void setCodCcon(String codCcon) {
public CtbAnag setCodCcon(String codCcon) {
this.codCcon = codCcon;
return this;
}
public BigDecimal getSaldoAtt() {
return saldoAtt;
}
public void setSaldoAtt(BigDecimal saldoAtt) {
public CtbAnag setSaldoAtt(BigDecimal saldoAtt) {
this.saldoAtt = saldoAtt;
return this;
}
@Override

2
ems-core/src/main/java/it/integry/ems_model/entity/JrlFlavUsers.java
View File

@@ -30,7 +30,7 @@ public class JrlFlavUsers extends EntityBase {
@SqlField(value = "user_name", maxLength = 40, nullable = false)
private String userName;
@SqlField(value = "flag_jflav_default", maxLength = 1)
@SqlField(value = "flag_jflav_default", maxLength = 1, nullable = false, defaultObjectValue = "N")
private String flagJflavDefault;
public JrlFlavUsers() {

91
ems-core/src/main/java/it/integry/ems_model/entity/JtbClavInd.java Normal file
View File

@@ -0,0 +1,91 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal;
@Master()
@PropertyReactive()
@Table(value = JtbClavInd.ENTITY)
@JsonTypeName(value = JtbClavInd.ENTITY)
public class JtbClavInd extends EntityBase {
public final static String ENTITY = "jtb_clav_ind";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public JtbClavInd() {
super(logger);
}
@PK()
@SqlField(value = "cod_jcos_ind", maxLength = 5, nullable = false)
private String codJcosInd;
@SqlField(value = "descrizione", maxLength = 40, nullable = true)
private String descrizione;
@SqlField(value = "perc_cost", nullable = true)
private BigDecimal percCost;
@SqlField(value = "tipo_calcolo", maxLength = 1, nullable = false, defaultObjectValue = "V")
private String tipoCalcolo;
@SqlField(value = "tipo_costo", maxLength = 20, nullable = true)
private String tipoCosto;
public String getCodJcosInd() {
return codJcosInd;
}
public JtbClavInd setCodJcosInd(String codJcosInd) {
this.codJcosInd = codJcosInd;
return this;
}
public String getDescrizione() {
return descrizione;
}
public JtbClavInd setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public BigDecimal getPercCost() {
return percCost;
}
public JtbClavInd setPercCost(BigDecimal percCost) {
this.percCost = percCost;
return this;
}
public String getTipoCalcolo() {
return tipoCalcolo;
}
public JtbClavInd setTipoCalcolo(String tipoCalcolo) {
this.tipoCalcolo = tipoCalcolo;
return this;
}
public String getTipoCosto() {
return tipoCosto;
}
public JtbClavInd setTipoCosto(String tipoCosto) {
this.tipoCosto = tipoCosto;
return this;
}
}

19
ems-core/src/main/java/it/integry/ems_model/entity/MtbAart.java
View File

@@ -307,6 +307,9 @@ public class MtbAart extends EntityBase implements EquatableEntityInterface<MtbA
@SqlField(value = "flag_stampa_docu_vend", nullable = false, defaultObjectValue = "1")
private Boolean flagStampaDocuVend;
@SqlField(value = "flag_reso_tec", nullable = false, defaultObjectValue = "0")
private Boolean flagResoTec;
@Priority(1)
private MtbAartMarchio mtbAartMarchio;
@@ -1186,13 +1189,7 @@ public class MtbAart extends EntityBase implements EquatableEntityInterface<MtbA
return this;
}
public Boolean getFlagStampaDocuVend() {
return flagStampaDocuVend;
}
public void setFlagStampaDocVend(Boolean flagStampaDocuVend) {
this.flagStampaDocuVend = flagStampaDocuVend;
}
public List<MtbAartAnag> getMtbAartAnag() {
return mtbAartAnag;
@@ -1303,6 +1300,16 @@ public class MtbAart extends EntityBase implements EquatableEntityInterface<MtbA
return this;
}
public Boolean getFlagResoTec() {
return flagResoTec;
}
public MtbAart setFlagResoTec(Boolean flagResoTec) {
this.flagResoTec = flagResoTec;
return this;
}
@Override
protected void updateChilds() throws Exception {
insertChilds();

38
ems-core/src/main/java/it/integry/ems_model/entity/MtbLisa.java
View File

@@ -12,6 +12,8 @@ import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@PropertyReactive
@@ -62,7 +64,7 @@ public class MtbLisa extends EntityBase {
private BigDecimal perc4;
@SqlField(value = "data_ult_prezzo")
private Date dataUltPrezzo;
private LocalDate dataUltPrezzo;
@SqlField(value = "gg_approvig", nullable = false, defaultObjectValue = "0")
private BigDecimal ggApprovig;
@@ -71,7 +73,7 @@ public class MtbLisa extends EntityBase {
private String flagFornPref;
@SqlField(value = "data_agg_prz", defaultObjectValue = CommonConstants.TIMESTAMP)
private Date dataAggPrz;
private LocalDateTime dataAggPrz;
@SqlField(value = "perc_oneri", nullable = false, defaultObjectValue = "0")
private BigDecimal percOneri;
@@ -127,6 +129,12 @@ public class MtbLisa extends EntityBase {
@SqlField(value = "shelf_life")
private Integer shelfLife;
@SqlField(value = "part_iva_prod", maxLength = 20)
private String partIvaProd;
@SqlField(value = "rag_soc_prod", maxLength = 255)
private String ragSocProd;
public MtbLisa() {
super(logger);
}
@@ -230,11 +238,11 @@ public class MtbLisa extends EntityBase {
return this;
}
public Date getDataUltPrezzo() {
public LocalDate getDataUltPrezzo() {
return dataUltPrezzo;
}
public MtbLisa setDataUltPrezzo(Date dataUltPrezzo) {
public MtbLisa setDataUltPrezzo(LocalDate dataUltPrezzo) {
this.dataUltPrezzo = dataUltPrezzo;
return this;
}
@@ -257,11 +265,11 @@ public class MtbLisa extends EntityBase {
return this;
}
public Date getDataAggPrz() {
public LocalDateTime getDataAggPrz() {
return dataAggPrz;
}
public MtbLisa setDataAggPrz(Date dataAggPrz) {
public MtbLisa setDataAggPrz(LocalDateTime dataAggPrz) {
this.dataAggPrz = dataAggPrz;
return this;
}
@@ -427,4 +435,22 @@ public class MtbLisa extends EntityBase {
this.shelfLife = shelfLife;
return this;
}
public String getPartIvaProd() {
return partIvaProd;
}
public MtbLisa setPartIvaProd(String partIvaProd) {
this.partIvaProd = partIvaProd;
return this;
}
public String getRagSocProd() {
return ragSocProd;
}
public MtbLisa setRagSocProd(String ragSocProd) {
this.ragSocProd = ragSocProd;
return this;
}
}

45
ems-core/src/main/java/it/integry/ems_model/entity/MtbLisaData.java
View File

@@ -9,7 +9,8 @@ import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
@PropertyReactive
@Table(MtbLisaData.ENTITY)
@@ -50,7 +51,7 @@ public class MtbLisaData extends EntityBase {
private String tipoVariazione;
@SqlField(value = "data_agg_prz", defaultObjectValue = CommonConstants.TIMESTAMP)
private Date dataAggPrz;
private LocalDateTime dataAggPrz;
@SqlField(value = "prz_ven_sug", nullable = false, defaultObjectValue = "0")
private BigDecimal przVenSug;
@@ -102,11 +103,11 @@ public class MtbLisaData extends EntityBase {
@ImportFromParent
@MapToTable(value = "data_iniz")
private Date dataIniz;
private LocalDate dataIniz;
@ImportFromParent
@MapToTable(value = "data_fine")
private Date dataFine;
private LocalDate dataFine;
@MapToTable(value = "flag_tipo_promo")
private String flagTipoPromo;
@@ -166,6 +167,12 @@ public class MtbLisaData extends EntityBase {
@MapToTable(value = "shelf_life")
private Integer shelfLife;
@MapToTable(value = "part_iva_prod")
private String partIvaProd;
@MapToTable(value = "rag_soc_prod")
private String ragSocProd;
private BigDecimal percPromo1;
private BigDecimal percPromo2;
@@ -259,11 +266,11 @@ public class MtbLisaData extends EntityBase {
return this;
}
public Date getDataAggPrz() {
public LocalDateTime getDataAggPrz() {
return dataAggPrz;
}
public MtbLisaData setDataAggPrz(Date dataAggPrz) {
public MtbLisaData setDataAggPrz(LocalDateTime dataAggPrz) {
this.dataAggPrz = dataAggPrz;
return this;
}
@@ -376,20 +383,20 @@ public class MtbLisaData extends EntityBase {
return this;
}
public Date getDataIniz() {
public LocalDate getDataIniz() {
return dataIniz;
}
public MtbLisaData setDataIniz(Date dataIniz) {
public MtbLisaData setDataIniz(LocalDate dataIniz) {
this.dataIniz = dataIniz;
return this;
}
public Date getDataFine() {
public LocalDate getDataFine() {
return dataFine;
}
public MtbLisaData setDataFine(Date dataFine) {
public MtbLisaData setDataFine(LocalDate dataFine) {
this.dataFine = dataFine;
return this;
}
@@ -565,6 +572,24 @@ public class MtbLisaData extends EntityBase {
return this;
}
public String getPartIvaProd() {
return partIvaProd;
}
public MtbLisaData setPartIvaProd(String partIvaProd) {
this.partIvaProd = partIvaProd;
return this;
}
public String getRagSocProd() {
return ragSocProd;
}
public MtbLisaData setRagSocProd(String ragSocProd) {
this.ragSocProd = ragSocProd;
return this;
}
public BigDecimal getPercPromo1() {
return percPromo1;
}

68
ems-core/src/main/java/it/integry/ems_model/entity/PtbDest.java
View File

@@ -79,147 +79,165 @@ public class PtbDest extends EntityBase {
super(logger);
}
public String getPrecode() {
return precode;
}
public void setPrecode(String precode) {
this.precode = precode;
}
public String getCodPdes() {
return codPdes;
}
public void setCodPdes(String codPdes) {
public PtbDest setCodPdes(String codPdes) {
this.codPdes = codPdes;
return this;
}
public String getCodPpro() {
return codPpro;
}
public void setCodPpro(String codPpro) {
public PtbDest setCodPpro(String codPpro) {
this.codPpro = codPpro;
return this;
}
public String getCap() {
return cap;
}
public void setCap(String cap) {
public PtbDest setCap(String cap) {
this.cap = cap;
return this;
}
public String getCitta() {
return citta;
}
public void setCitta(String citta) {
public PtbDest setCitta(String citta) {
this.citta = citta;
return this;
}
public String getCodVage() {
return codVage;
}
public void setCodVage(String codVage) {
public PtbDest setCodVage(String codVage) {
this.codVage = codVage;
return this;
}
public String getCodVlis() {
return codVlis;
}
public void setCodVlis(String codVlis) {
public PtbDest setCodVlis(String codVlis) {
this.codVlis = codVlis;
return this;
}
public String getCodVzon() {
return codVzon;
}
public void setCodVzon(String codVzon) {
public PtbDest setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
public PtbDest setFax(String fax) {
this.fax = fax;
return this;
}
public String getIndirizzo() {
return indirizzo;
}
public void setIndirizzo(String indirizzo) {
public PtbDest setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
return this;
}
public String getNazione() {
return nazione;
}
public void setNazione(String nazione) {
public PtbDest setNazione(String nazione) {
this.nazione = nazione;
return this;
}
public String getNote() {
return note;
}
public void setNote(String note) {
public PtbDest setNote(String note) {
this.note = note;
return this;
}
public String getProv() {
return prov;
}
public void setProv(String prov) {
public PtbDest setProv(String prov) {
this.prov = prov;
return this;
}
public String getRagSoc() {
return ragSoc;
}
public void setRagSoc(String ragSoc) {
public PtbDest setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
return this;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
public PtbDest setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String getCodAliqIn() {
return codAliqIn;
}
public void setCodAliqIn(String codAliqIn) {
public PtbDest setCodAliqIn(String codAliqIn) {
this.codAliqIn = codAliqIn;
return this;
}
public String getCodAliqOut() {
return codAliqOut;
}
public void setCodAliqOut(String codAliqOut) {
public PtbDest setCodAliqOut(String codAliqOut) {
this.codAliqOut = codAliqOut;
return this;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
public PtbDest seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getPrecode() {
return precode;
}
public PtbDest setPrecode(String precode) {
this.precode = precode;
return this;
}
}

173
ems-core/src/main/java/it/integry/ems_model/entity/PtbPrevt.java
View File

@@ -201,424 +201,477 @@ public class PtbPrevt extends EntityBase {
return idOfferta;
}
public void setIdOfferta(String idOfferta) {
public PtbPrevt setIdOfferta(String idOfferta) {
this.idOfferta = idOfferta;
return this;
}
public Date getDataPrev() {
return dataPrev;
}
public void setDataPrev(Date dataPrev) {
public PtbPrevt setDataPrev(Date dataPrev) {
this.dataPrev = dataPrev;
return this;
}
public String getRifPrev() {
return rifPrev;
}
public void setRifPrev(String rifPrev) {
public PtbPrevt setRifPrev(String rifPrev) {
this.rifPrev = rifPrev;
return this;
}
public String getCodPpro() {
return codPpro;
}
public void setCodPpro(String codPpro) {
public PtbPrevt setCodPpro(String codPpro) {
this.codPpro = codPpro;
return this;
}
public String getPorto() {
return porto;
}
public void setPorto(String porto) {
public PtbPrevt setPorto(String porto) {
this.porto = porto;
return this;
}
public String getMezzo() {
return mezzo;
}
public void setMezzo(String mezzo) {
public PtbPrevt setMezzo(String mezzo) {
this.mezzo = mezzo;
return this;
}
public String getDescrizionePag() {
return descrizionePag;
}
public void setDescrizionePag(String descrizionePag) {
public PtbPrevt setDescrizionePag(String descrizionePag) {
this.descrizionePag = descrizionePag;
return this;
}
public BigDecimal getSconto1() {
return sconto1;
}
public void setSconto1(BigDecimal sconto1) {
public PtbPrevt setSconto1(BigDecimal sconto1) {
this.sconto1 = sconto1;
return this;
}
public BigDecimal getSconto2() {
return sconto2;
}
public void setSconto2(BigDecimal sconto2) {
public PtbPrevt setSconto2(BigDecimal sconto2) {
this.sconto2 = sconto2;
return this;
}
public BigDecimal getSconto3() {
return sconto3;
}
public void setSconto3(BigDecimal sconto3) {
public PtbPrevt setSconto3(BigDecimal sconto3) {
this.sconto3 = sconto3;
return this;
}
public BigDecimal getSconto4() {
return sconto4;
}
public void setSconto4(BigDecimal sconto4) {
public PtbPrevt setSconto4(BigDecimal sconto4) {
this.sconto4 = sconto4;
return this;
}
public String getNote() {
return note;
}
public void setNote(String note) {
public PtbPrevt setNote(String note) {
this.note = note;
return this;
}
public byte[] getOggettoOle() {
return oggettoOle;
}
public void setOggettoOle(byte[] oggettoOle) {
public PtbPrevt setOggettoOle(byte[] oggettoOle) {
this.oggettoOle = oggettoOle;
return this;
}
public String getTermCons() {
return termCons;
}
public void setTermCons(String termCons) {
public PtbPrevt setTermCons(String termCons) {
this.termCons = termCons;
return this;
}
public BigDecimal getCambio() {
return cambio;
}
public void setCambio(BigDecimal cambio) {
public PtbPrevt setCambio(BigDecimal cambio) {
this.cambio = cambio;
return this;
}
public String getOggetto() {
return oggetto;
}
public void setOggetto(String oggetto) {
public PtbPrevt setOggetto(String oggetto) {
this.oggetto = oggetto;
return this;
}
public BigDecimal getPercProv() {
return percProv;
}
public void setPercProv(BigDecimal percProv) {
public PtbPrevt setPercProv(BigDecimal percProv) {
this.percProv = percProv;
return this;
}
public String getPersonaRif() {
return personaRif;
}
public void setPersonaRif(String personaRif) {
public PtbPrevt setPersonaRif(String personaRif) {
this.personaRif = personaRif;
return this;
}
public String getNomeFileDescr() {
return nomeFileDescr;
}
public void setNomeFileDescr(String nomeFileDescr) {
public PtbPrevt setNomeFileDescr(String nomeFileDescr) {
this.nomeFileDescr = nomeFileDescr;
return this;
}
public String getAgenziaBanca() {
return agenziaBanca;
}
public void setAgenziaBanca(String agenziaBanca) {
public PtbPrevt setAgenziaBanca(String agenziaBanca) {
this.agenziaBanca = agenziaBanca;
return this;
}
public String getCodAbi() {
return codAbi;
}
public void setCodAbi(String codAbi) {
public PtbPrevt setCodAbi(String codAbi) {
this.codAbi = codAbi;
return this;
}
public String getCodCab() {
return codCab;
}
public void setCodCab(String codCab) {
public PtbPrevt setCodCab(String codCab) {
this.codCab = codCab;
return this;
}
public String getCodAliq() {
return codAliq;
}
public void setCodAliq(String codAliq) {
public PtbPrevt setCodAliq(String codAliq) {
this.codAliq = codAliq;
return this;
}
public String getCodBanc() {
return codBanc;
}
public void setCodBanc(String codBanc) {
public PtbPrevt setCodBanc(String codBanc) {
this.codBanc = codBanc;
return this;
}
public String getCodDivi() {
return codDivi;
}
public void setCodDivi(String codDivi) {
public PtbPrevt setCodDivi(String codDivi) {
this.codDivi = codDivi;
return this;
}
public String getCodJcom() {
return codJcom;
}
public void setCodJcom(String codJcom) {
public PtbPrevt setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getCodLingua() {
return codLingua;
}
public void setCodLingua(String codLingua) {
public PtbPrevt setCodLingua(String codLingua) {
this.codLingua = codLingua;
return this;
}
public String getCodPaga() {
return codPaga;
}
public void setCodPaga(String codPaga) {
public PtbPrevt setCodPaga(String codPaga) {
this.codPaga = codPaga;
return this;
}
public String getCodVage() {
return codVage;
}
public void setCodVage(String codVage) {
public PtbPrevt setCodVage(String codVage) {
this.codVage = codVage;
return this;
}
public String getCodVlis() {
return codVlis;
}
public void setCodVlis(String codVlis) {
public PtbPrevt setCodVlis(String codVlis) {
this.codVlis = codVlis;
return this;
}
public String getCodVzon() {
return codVzon;
}
public void setCodVzon(String codVzon) {
public PtbPrevt setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
public BigDecimal getTotaleNetto() {
return totaleNetto;
}
public void setTotaleNetto(BigDecimal totaleNetto) {
public PtbPrevt setTotaleNetto(BigDecimal totaleNetto) {
this.totaleNetto = totaleNetto;
return this;
}
public Date getDataScadOff() {
return dataScadOff;
}
public void setDataScadOff(Date dataScadOff) {
public PtbPrevt setDataScadOff(Date dataScadOff) {
this.dataScadOff = dataScadOff;
return this;
}
public String getGestione() {
return gestione;
}
public void setGestione(String gestione) {
public PtbPrevt setGestione(String gestione) {
this.gestione = gestione;
return this;
}
public Date getDataOrd() {
return dataOrd;
}
public void setDataOrd(Date dataOrd) {
public PtbPrevt setDataOrd(Date dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public Integer getNumOrd() {
return numOrd;
}
public void setNumOrd(Integer numOrd) {
public PtbPrevt setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
return this;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
public PtbPrevt seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getEsitoOff() {
return esitoOff;
}
public void setEsitoOff(String esitoOff) {
public PtbPrevt setEsitoOff(String esitoOff) {
this.esitoOff = esitoOff;
return this;
}
public String getStatoOfferta() {
return statoOfferta;
}
public void setStatoOfferta(String statoOfferta) {
public PtbPrevt setStatoOfferta(String statoOfferta) {
this.statoOfferta = statoOfferta;
return this;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
public PtbPrevt setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
public PtbPrevt setFax(String fax) {
this.fax = fax;
return this;
}
public BigDecimal getTotMerce() {
return totMerce;
}
public void setTotMerce(BigDecimal totMerce) {
public PtbPrevt setTotMerce(BigDecimal totMerce) {
this.totMerce = totMerce;
return this;
}
public String getCodPproDest() {
return codPproDest;
}
public void setCodPproDest(String codPproDest) {
public PtbPrevt setCodPproDest(String codPproDest) {
this.codPproDest = codPproDest;
}
public String getUserNameResp() {
return userNameResp;
}
public void setUserNameResp(String userNameResp) {
this.userNameResp = userNameResp;
return this;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
public PtbPrevt setUserName(String userName) {
this.userName = userName;
return this;
}
public String getUserNameResp() {
return userNameResp;
}
public PtbPrevt setUserNameResp(String userNameResp) {
this.userNameResp = userNameResp;
return this;
}
public String getNomeDitta() {
return nomeDitta;
}
public void setNomeDitta(String nomeDitta) {
public PtbPrevt setNomeDitta(String nomeDitta) {
this.nomeDitta = nomeDitta;
return this;
}
public String getDescrizioneBanca() {
return descrizioneBanca;
}
public void setDescrizioneBanca(String descrizioneBanca) {
public PtbPrevt setDescrizioneBanca(String descrizioneBanca) {
this.descrizioneBanca = descrizioneBanca;
return this;
}
public Date getDataLastUpd() {
return dataLastUpd;
}
public void setDataLastUpd(Date dataLastUpd) {
public PtbPrevt setDataLastUpd(Date dataLastUpd) {
this.dataLastUpd = dataLastUpd;
return this;
}
public String getRifPrev2() {
return rifPrev2;
}
public void setRifPrev2(String rifPrev2) {
public PtbPrevt setRifPrev2(String rifPrev2) {
this.rifPrev2 = rifPrev2;
return this;
}
public Date getDataValidita() {
return dataValidita;
}
public void setDataValidita(Date dataValidita) {
public PtbPrevt setDataValidita(Date dataValidita) {
this.dataValidita = dataValidita;
return this;
}
public String getNumProt() {
return numProt;
}
public void setNumProt(String numProt) {
public PtbPrevt setNumProt(String numProt) {
this.numProt = numProt;
return this;
}
public Date getDataInizContratto() {
return dataInizContratto;
}
public void setDataInizContratto(Date dataInizContratto) {
public PtbPrevt setDataInizContratto(Date dataInizContratto) {
this.dataInizContratto = dataInizContratto;
return this;
}
public Date getDataFineContratto() {
return dataFineContratto;
}
public void setDataFineContratto(Date dataFineContratto) {
public PtbPrevt setDataFineContratto(Date dataFineContratto) {
this.dataFineContratto = dataFineContratto;
return this;
}
public String getCodMontatore() {

129
ems-core/src/main/java/it/integry/ems_model/entity/PtbPros.java
View File

@@ -164,8 +164,9 @@ public class PtbPros extends EntityBase {
return codPpro;
}
public void setCodPpro(String codPpro) {
public PtbPros setCodPpro(String codPpro) {
this.codPpro = codPpro;
return this;
}
public String getPrecode() {
@@ -181,336 +182,378 @@ public class PtbPros extends EntityBase {
return agenziaBanca;
}
public void setAgenziaBanca(String agenziaBanca) {
public PtbPros setAgenziaBanca(String agenziaBanca) {
this.agenziaBanca = agenziaBanca;
return this;
}
public String getCap() {
return cap;
}
public void setCap(String cap) {
public PtbPros setCap(String cap) {
this.cap = cap;
return this;
}
public String getCitta() {
return citta;
}
public void setCitta(String citta) {
public PtbPros setCitta(String citta) {
this.citta = citta;
return this;
}
public String getCodAbi() {
return codAbi;
}
public void setCodAbi(String codAbi) {
public PtbPros setCodAbi(String codAbi) {
this.codAbi = codAbi;
return this;
}
public String getCodAliq() {
return codAliq;
}
public void setCodAliq(String codAliq) {
public PtbPros setCodAliq(String codAliq) {
this.codAliq = codAliq;
return this;
}
public String getCodAnag() {
return codAnag;
}
public void setCodAnag(String codAnag) {
public PtbPros setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodBanc() {
return codBanc;
}
public void setCodBanc(String codBanc) {
public PtbPros setCodBanc(String codBanc) {
this.codBanc = codBanc;
return this;
}
public String getCodCab() {
return codCab;
}
public void setCodCab(String codCab) {
public PtbPros setCodCab(String codCab) {
this.codCab = codCab;
return this;
}
public String getCodFisc() {
return codFisc;
}
public void setCodFisc(String codFisc) {
public PtbPros setCodFisc(String codFisc) {
this.codFisc = codFisc;
return this;
}
public String getCodPaga() {
return codPaga;
}
public void setCodPaga(String codPaga) {
public PtbPros setCodPaga(String codPaga) {
this.codPaga = codPaga;
return this;
}
public String getCodVage() {
return codVage;
}
public void setCodVage(String codVage) {
public PtbPros setCodVage(String codVage) {
this.codVage = codVage;
return this;
}
public String getCodVatt() {
return codVatt;
}
public void setCodVatt(String codVatt) {
public PtbPros setCodVatt(String codVatt) {
this.codVatt = codVatt;
return this;
}
public String getCodVlis() {
return codVlis;
}
public void setCodVlis(String codVlis) {
public PtbPros setCodVlis(String codVlis) {
this.codVlis = codVlis;
return this;
}
public String getCodVseg() {
return codVseg;
}
public void setCodVseg(String codVseg) {
public PtbPros setCodVseg(String codVseg) {
this.codVseg = codVseg;
return this;
}
public String getCodVset() {
return codVset;
}
public void setCodVset(String codVset) {
public PtbPros setCodVset(String codVset) {
this.codVset = codVset;
return this;
}
public String getCodVtip() {
return codVtip;
}
public void setCodVtip(String codVtip) {
public PtbPros setCodVtip(String codVtip) {
this.codVtip = codVtip;
return this;
}
public String getCodVzon() {
return codVzon;
}
public void setCodVzon(String codVzon) {
public PtbPros setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
public Date getDataIns() {
return dataIns;
}
public void setDataIns(Date dataIns) {
public PtbPros setDataIns(Date dataIns) {
this.dataIns = dataIns;
return this;
}
public String getDescrizionePag() {
return descrizionePag;
}
public void setDescrizionePag(String descrizionePag) {
public PtbPros setDescrizionePag(String descrizionePag) {
this.descrizionePag = descrizionePag;
return this;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
public PtbPros seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
public PtbPros setFax(String fax) {
this.fax = fax;
return this;
}
public String getFlagRivClie() {
return flagRivClie;
}
public void setFlagRivClie(String flagRivClie) {
public PtbPros setFlagRivClie(String flagRivClie) {
this.flagRivClie = flagRivClie;
return this;
}
public String getFonte() {
return fonte;
}
public void setFonte(String fonte) {
public PtbPros setFonte(String fonte) {
this.fonte = fonte;
return this;
}
public String getGgChiusura() {
return ggChiusura;
}
public void setGgChiusura(String ggChiusura) {
public PtbPros setGgChiusura(String ggChiusura) {
this.ggChiusura = ggChiusura;
return this;
}
public String getIndirizzo() {
return indirizzo;
}
public void setIndirizzo(String indirizzo) {
public PtbPros setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
return this;
}
public String getNazione() {
return nazione;
}
public void setNazione(String nazione) {
public PtbPros setNazione(String nazione) {
this.nazione = nazione;
return this;
}
public String getNote() {
return note;
}
public void setNote(String note) {
public PtbPros setNote(String note) {
this.note = note;
return this;
}
public String getPartIva() {
return partIva;
}
public void setPartIva(String partIva) {
public PtbPros setPartIva(String partIva) {
this.partIva = partIva;
return this;
}
public String getPersonaRif() {
return personaRif;
}
public void setPersonaRif(String personaRif) {
public PtbPros setPersonaRif(String personaRif) {
this.personaRif = personaRif;
return this;
}
public String getProv() {
return prov;
}
public void setProv(String prov) {
public PtbPros setProv(String prov) {
this.prov = prov;
return this;
}
public String getRagSoc() {
return ragSoc;
}
public void setRagSoc(String ragSoc) {
public PtbPros setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
return this;
}
public String getRagSoc2() {
return ragSoc2;
}
public void setRagSoc2(String ragSoc2) {
public PtbPros setRagSoc2(String ragSoc2) {
this.ragSoc2 = ragSoc2;
return this;
}
public BigDecimal getSconto1() {
return sconto1;
}
public void setSconto1(BigDecimal sconto1) {
public PtbPros setSconto1(BigDecimal sconto1) {
this.sconto1 = sconto1;
return this;
}
public BigDecimal getSconto2() {
return sconto2;
}
public void setSconto2(BigDecimal sconto2) {
public PtbPros setSconto2(BigDecimal sconto2) {
this.sconto2 = sconto2;
return this;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
public PtbPros setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String getCuuPa() {
return cuuPa;
}
public void setCuuPa(String cuuPa) {
public PtbPros setCuuPa(String cuuPa) {
this.cuuPa = cuuPa;
return this;
}
public String geteMailPec() {
return eMailPec;
}
public void seteMailPec(String eMailPec) {
public PtbPros seteMailPec(String eMailPec) {
this.eMailPec = eMailPec;
return this;
}
public String getFlagInformativa() {
return flagInformativa;
}
public void setFlagInformativa(String flagInformativa) {
public PtbPros setFlagInformativa(String flagInformativa) {
this.flagInformativa = flagInformativa;
return this;
}
public String getFlagConsenso() {
return flagConsenso;
}
public void setFlagConsenso(String flagConsenso) {
public PtbPros setFlagConsenso(String flagConsenso) {
this.flagConsenso = flagConsenso;
return this;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
public PtbPros setUserName(String userName) {
this.userName = userName;
return this;
}
public List<PtbProsRif> getPtbProsRif() {
return ptbProsRif;
}
public void setPtbProsRif(List<PtbProsRif> ptbProsRif) {
public PtbPros setPtbProsRif(List<PtbProsRif> ptbProsRif) {
this.ptbProsRif = ptbProsRif;
return this;
}
public List<PtbDest> getPtbDest() {
return ptbDest;
}
public void setPtbDest(List<PtbDest> ptbDest) {
public PtbPros setPtbDest(List<PtbDest> ptbDest) {
this.ptbDest = ptbDest;
return this;
}
@Override

24
ems-core/src/main/java/it/integry/ems_model/entity/PtbProsRif.java
View File

@@ -56,63 +56,71 @@ public class PtbProsRif extends EntityBase {
return codPpro;
}
public void setCodPpro(String codPpro) {
public PtbProsRif setCodPpro(String codPpro) {
this.codPpro = codPpro;
return this;
}
public Integer getIdPersRif() {
return idPersRif;
}
public void setIdPersRif(Integer idPersRif) {
public PtbProsRif setIdPersRif(Integer idPersRif) {
this.idPersRif = idPersRif;
return this;
}
public String getPersonaRif() {
return personaRif;
}
public void setPersonaRif(String personaRif) {
public PtbProsRif setPersonaRif(String personaRif) {
this.personaRif = personaRif;
return this;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
public PtbProsRif seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
public PtbProsRif setFax(String fax) {
this.fax = fax;
return this;
}
public String getMansione() {
return mansione;
}
public void setMansione(String mansione) {
public PtbProsRif setMansione(String mansione) {
this.mansione = mansione;
return this;
}
public String getNumCellulare() {
return numCellulare;
}
public void setNumCellulare(String numCellulare) {
public PtbProsRif setNumCellulare(String numCellulare) {
this.numCellulare = numCellulare;
return this;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
public PtbProsRif setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
}

17
ems-core/src/main/java/it/integry/ems_model/entity/StbUser.java
View File

@@ -173,6 +173,9 @@ public class StbUser extends EntityBase {
@EntityChild
private List<SrlUserAttached> srlUserAttached = new ArrayList<>();
@EntityChild
private List<JrlFlavUsers> jrlFlavUsers = new ArrayList<>();
@Priority(101)
private SrlActivityTypeUser srlActivityTypeUser;
@@ -629,6 +632,15 @@ public class StbUser extends EntityBase {
return this;
}
public List<JrlFlavUsers> getJrlFlavUsers() {
return jrlFlavUsers;
}
public StbUser setJrlFlavUsers(List<JrlFlavUsers> jrlFlavUsers) {
this.jrlFlavUsers = jrlFlavUsers;
return this;
}
@Override
protected void insertChilds() throws Exception {
if (getStbAbil() != null) {
@@ -687,6 +699,9 @@ public class StbUser extends EntityBase {
for (SrlUserAttached srlUserAttached : getSrlUserAttached()) {
srlUserAttached.manageWithParentConnection(connection, srlUserAttached.getOperation(), dataCompleting, entityHolder);
}
for (JrlFlavUsers jrlFlavUsers : getJrlFlavUsers()) {
jrlFlavUsers.manageWithParentConnection(connection, jrlFlavUsers.getOperation(), dataCompleting, entityHolder);
}
}
@Override
@@ -732,5 +747,7 @@ public class StbUser extends EntityBase {
wrlUsersFasi.deleteAllEntities(connection, this);
WtbUsersInfo wtbUsersInfo = new WtbUsersInfo();
wtbUsersInfo.deleteAllEntities(connection, this);
JrlFlavUsers jrlFlavUsers = new JrlFlavUsers();
jrlFlavUsers.deleteAllEntities(connection, this);
}
}

93
ems-core/src/main/java/it/integry/ems_model/entity/TtbStyleDistCol.java Normal file
View File

@@ -0,0 +1,93 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
@Master()
@PropertyReactive()
@Table(value = TtbStyleDistCol.ENTITY)
@JsonTypeName(value = TtbStyleDistCol.ENTITY)
public class TtbStyleDistCol extends EntityBase {
public final static String ENTITY = "ttb_style_dist_col";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public TtbStyleDistCol() {
super(logger);
}
@PK()
@SqlField(value = "id_riga", nullable = false)
private Integer idRiga;
@PK()
@SqlField(value = "cod_style_pf", maxLength = 15, nullable = false)
private String codStylePf;
@PK()
@SqlField(value = "cod_col_pf", maxLength = 5, nullable = false)
private String codColPf;
@PK()
@SqlField(value = "cod_style_mp", maxLength = 15, nullable = false)
private String codStyleMp;
@PK()
@SqlField(value = "cod_col_mp", maxLength = 5, nullable = false)
private String codColMp;
public Integer getIdRiga() {
return idRiga;
}
public TtbStyleDistCol setIdRiga(Integer idRiga) {
this.idRiga = idRiga;
return this;
}
public String getCodStylePf() {
return codStylePf;
}
public TtbStyleDistCol setCodStylePf(String codStylePf) {
this.codStylePf = codStylePf;
return this;
}
public String getCodColPf() {
return codColPf;
}
public TtbStyleDistCol setCodColPf(String codColPf) {
this.codColPf = codColPf;
return this;
}
public String getCodStyleMp() {
return codStyleMp;
}
public TtbStyleDistCol setCodStyleMp(String codStyleMp) {
this.codStyleMp = codStyleMp;
return this;
}
public String getCodColMp() {
return codColMp;
}
public TtbStyleDistCol setCodColMp(String codColMp) {
this.codColMp = codColMp;
return this;
}
}

107
ems-core/src/main/java/it/integry/ems_model/entity/TtbStyleDistTagl.java Normal file
View File

@@ -0,0 +1,107 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal;
@Master()
@PropertyReactive()
@Table(value = TtbStyleDistTagl.ENTITY)
@JsonTypeName(value = TtbStyleDistTagl.ENTITY)
public class TtbStyleDistTagl extends EntityBase {
public final static String ENTITY = "ttb_style_dist_tagl";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public TtbStyleDistTagl() {
super(logger);
}
@PK()
@SqlField(value = "id_riga", nullable = false)
private Integer idRiga;
@PK()
@SqlField(value = "cod_style_pf", maxLength = 15, nullable = false)
private String codStylePf;
@PK()
@SqlField(value = "cod_tagl_pf", maxLength = 15, nullable = false)
private String codTaglPf;
@PK()
@SqlField(value = "cod_style_mp", maxLength = 15, nullable = false)
private String codStyleMp;
@PK()
@SqlField(value = "cod_tagl_mp", maxLength = 15, nullable = false)
private String codTaglMp;
@SqlField(value = "qta", nullable = true)
private BigDecimal qta;
public Integer getIdRiga() {
return idRiga;
}
public TtbStyleDistTagl setIdRiga(Integer idRiga) {
this.idRiga = idRiga;
return this;
}
public String getCodStylePf() {
return codStylePf;
}
public TtbStyleDistTagl setCodStylePf(String codStylePf) {
this.codStylePf = codStylePf;
return this;
}
public String getCodTaglPf() {
return codTaglPf;
}
public TtbStyleDistTagl setCodTaglPf(String codTaglPf) {
this.codTaglPf = codTaglPf;
return this;
}
public String getCodStyleMp() {
return codStyleMp;
}
public TtbStyleDistTagl setCodStyleMp(String codStyleMp) {
this.codStyleMp = codStyleMp;
return this;
}
public String getCodTaglMp() {
return codTaglMp;
}
public TtbStyleDistTagl setCodTaglMp(String codTaglMp) {
this.codTaglMp = codTaglMp;
return this;
}
public BigDecimal getQta() {
return qta;
}
public TtbStyleDistTagl setQta(BigDecimal qta) {
this.qta = qta;
return this;
}
}

4
ems-core/src/main/java/it/integry/security/service/AuthService.java
View File

@@ -81,6 +81,10 @@ public class AuthService {
throw new Exception("Device id mancante.");
}
if (requestDataDTO.getApplication() == null) {
throw new Exception("X-App-Token mancante.");
}
String username = loginRequestDTO.getUsername();
String password = loginRequestDTO.getPassword();
String deviceId = loginRequestDTO.getDeviceId();

2
ems-core/src/main/resources/menus/menu_config.json
View File

File diff suppressed because one or more lines are too long

14
ems-core/src/main/resources/rules/DocA.drl
View File

@@ -118,20 +118,6 @@ then
modify ( $docR ) { setCodCcon(codCcon) }
end
rule "completeDatiDocValA"
no-loop
when
eval(completeRulesEnabled)
$docT : DtbDoct(gestione == "A" && previstaFat == "N" && serDoc != null && numDoc != null && dataDoc != null && codDtip != null)
then
modify ( $docT ) {
setDataDocVal($docT.getDataDoc()),
setSerDocVal($docT.getSerDoc()),
setNumDocVal($docT.getNumDoc()),
setCodDtipVal($docT.getCodDtip())
}
end
rule "completeDatiSpesDocA"
no-loop
when

16
ems-core/src/main/resources/rules/DocL.drl
View File

@@ -76,22 +76,6 @@ then
}
end
rule "completeDatiDocValDocL"
no-loop
when
eval(completeRulesEnabled)
$docT : DtbDoct(((codDtipVal == null || dataDocVal == null || serDocVal == null || numDocVal == null )&& gestione == "L" && previstaFat != null && previstaFat == "N" && numDoc != null) ||
((codDtipVal != null || dataDocVal != null || serDocVal != null || numDocVal != null )&& gestione == "L" && previstaFat != null && previstaFat == "S" && numDoc != null))
then
HashMap<String, Object> dati = DocumentRules.completeDatiDocVal(conn, $docT);
modify($docT){
setCodDtipVal(dati.get("codDtipVal") == null ? null : dati.get("codDtipVal").toString()),
setDataDocVal(dati.get("dataDocVal") == null ? null : (Date) (dati.get("dataDocVal"))),
setSerDocVal(dati.get("serDocVal") == null ? null : dati.get("serDocVal").toString()),
setNumDocVal(dati.get("numDocVal") == null ? null : Integer.parseInt(dati.get("numDocVal").toString()))
}
end
rule "completeDatiSpesDocL"
no-loop
when

13
ems-core/src/main/resources/rules/DocV.drl
View File

@@ -180,16 +180,3 @@ then
modify ( $entity ) { setValUnt(valUnt) }
end
rule "completeDatiDocValV"
no-loop
when
eval(completeRulesEnabled)
$docT : DtbDoct(gestione == "V" && previstaFat == "N" && serDoc != null && numDoc != null && dataDoc != null && codDtip != null)
then
modify ( $docT ) {
setDataDocVal($docT.getDataDoc()),
setSerDocVal($docT.getSerDoc()),
setNumDocVal($docT.getNumDoc()),
setCodDtipVal($docT.getCodDtip())
}
end

7
ems-core/src/main/resources/rules/LisA.drl
View File

@@ -9,7 +9,8 @@ import it.integry.ems.rules.completing.*
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.types.OperationType
import it.integry.ems_model.utility.UtilityString
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDB
import java.time.LocalDate;
global Connection conn
global String username
@@ -167,7 +168,7 @@ when
eval(completeRulesEnabled)
$entity : AtbListData(dataFine == null && codAlis != null && versione != null)
then
Date dataFine = PurchasesRules.completeDataFine(conn, $entity.getCodAlis(), $entity.getVersione() );
LocalDate dataFine = PurchasesRules.completeDataFine(conn, $entity.getCodAlis(), $entity.getVersione() );
modify ( $entity ) { setDataFine(dataFine) }
end
@@ -231,7 +232,7 @@ when
then
String fullName = CommonRules.getFullName(conn, username);
modify ( $entity ) {
setDataMod(new Date()),
setDataMod(UtilityLocalDate.getNowTime()),
setModificatoDa(fullName),
setOperation($entity.getOperation()== OperationType.NO_OP?OperationType.INSERT_OR_UPDATE:$entity.getOperation())
}

14
ems-core/src/main/resources/rules/documenti.drl
View File

@@ -53,6 +53,20 @@ then
modify ( $docT ) { setGestione($docT.getDtbTipi().getGestione()) }
end
rule "completeDatiDocValV"
no-loop
when
eval(completeRulesEnabled)
$docT : DtbDoct(previstaFat == "N" && serDoc != null && numDoc != null && dataDoc != null && codDtip != null)
then
modify ( $docT ) {
setDataDocVal($docT.getDataDoc()),
setSerDocVal($docT.getSerDoc()),
setNumDocVal($docT.getNumDoc()),
setCodDtipVal($docT.getCodDtip())
}
end
rule "completeIsReso"
no-loop
when

7
ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java
View File

@@ -294,10 +294,9 @@ public class ActivityController {
@PreAuthorize("isAuthenticated()")
@RequestMapping(value = EmsRestConstants.PATH_DELETE_ACTIVITY, method = RequestMethod.GET)
public ServiceRestResponse deleteActivity(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam(value = "activityId") String activityId,
@RequestParam(value = "deleteSubActivity") boolean deleteSubActivity) throws Exception {
public ServiceRestResponse deleteActivity(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam String activityId,
@RequestParam(required = false) boolean deleteSubActivity) throws Exception {
return ServiceRestResponse.createPositiveResponse(activityService.deleteActivity(activityId, deleteSubActivity));

17
ems-engine/src/main/java/it/integry/ems/customizations/sales/service/ToscaSalesService.java
View File

@@ -77,6 +77,7 @@ public class ToscaSalesService {
List<ToscaOrdineVenditaDTO> ordiniDaImportare = new ArrayList<>();
List<Long> diacodNotFound = new ArrayList<>();
List<Integer> trasportIdNotFound = new ArrayList<>();
while (rowIterator.hasNext()) {
Row row = rowIterator.next();
ToscaOrdineVenditaDTO newDTO = new ToscaOrdineVenditaDTO();
@@ -88,6 +89,11 @@ public class ToscaSalesService {
diacodNotFound.add(diacod);
continue;
}
if (UtilityString.isNullOrEmpty(UtilityExcel.getCellAsString(row, 13))) {
trasportIdNotFound.add(row.getRowNum());
continue;
}
newDTO
.setTransactionNumber(UtilityExcel.getCellAsString(row, 0))
.setDateTransaction(UtilityExcel.getCellAsDate(row, 1, CommonConstants.DATE_FORMAT_DMY_DASHED))
@@ -114,8 +120,15 @@ public class ToscaSalesService {
ordiniDaImportare.add(newDTO);
}
if (!diacodNotFound.isEmpty()) {
throw new Exception("Articoli non trovati: " + String.join(", ", String.valueOf(diacodNotFound)));
if (!diacodNotFound.isEmpty() || !trasportIdNotFound.isEmpty()) {
String message = "Errore durante l'importazione degli ordini di vendita. ";
if ( !diacodNotFound.isEmpty() ) {
message += CommonConstants.A_CAPO + "Articoli non trovati: " + String.join(", ", String.valueOf(diacodNotFound));
}
if ( !trasportIdNotFound.isEmpty() ) {
message += CommonConstants.A_CAPO + "Transporter Id non presente sulle righe: " + String.join(", ", String.valueOf(trasportIdNotFound));
}
throw new Exception(message);
}
return ordiniDaImportare;

12
ems-engine/src/main/java/it/integry/ems/document/CostiTrasporto/service/DocCostiTrasporto.java
View File

@@ -315,9 +315,15 @@ public class DocCostiTrasporto {
serDoc = null;
note += "@RIF_DOC=" + rifDoc + " riferimento documento non valida";
} else {
numDoc = Integer.valueOf(args[0]);
serDoc = args[1];
codAnag = null;
if (!UtilityString.isNumber(args[0])){
serDoc = null;
note += "@RIF_DOC=" + rifDoc + " riferimento documento non valida";
} else {
numDoc = Integer.valueOf(args[0]);
serDoc = args[1];
codAnag = null;
}
// Condizione su vettore
String whereCond = "dtb_doct.cod_vvet = " + UtilityDB.valueToString(codVvet);

5
ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiConsortileService.java
View File

@@ -16,6 +16,7 @@ import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityLocalDate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -83,14 +84,14 @@ public class DocumentiConsortileService {
AtbListData headLisa = new AtbListData();
headLisa.setOperation(OperationType.INSERT_OR_UPDATE);
headLisa.setCodAlis(codAlis);
headLisa.setDataIniz(dataDoc);
headLisa.setDataIniz(UtilityLocalDate.localDateFromDate(dataDoc));
headLisa.setVersione(versione);
MtbLisaData rowLisa = new MtbLisaData();
rowLisa.setOperation(OperationType.INSERT_OR_UPDATE);
rowLisa.setVersione(versione);
rowLisa.setCodAlis(codAlis);
rowLisa.setDataIniz(dataDoc);
rowLisa.setDataIniz(UtilityLocalDate.localDateFromDate(dataDoc));
rowLisa.setCodArtFor(passaporto);
rowLisa.setPartitaMag(origine);
rowLisa.setCodMart(codMart);

23
ems-engine/src/main/java/it/integry/ems/document/dto/ULRowDTO.java
View File

@@ -2,6 +2,7 @@ package it.integry.ems.document.dto;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Objects;
public class ULRowDTO {
@@ -13,6 +14,7 @@ public class ULRowDTO {
private LocalDate dataOrd;
private Integer numOrd;
private Integer rigaOrd;
private String codMdep;
public String getBarcodeUl() {
return barcodeUl;
@@ -85,4 +87,25 @@ public class ULRowDTO {
this.rigaOrd = rigaOrd;
return this;
}
public String getCodMdep() {
return codMdep;
}
public ULRowDTO setCodMdep(String codMdep) {
this.codMdep = codMdep;
return this;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof ULRowDTO)) return false;
ULRowDTO ulRowDTO = (ULRowDTO) o;
return Objects.equals(getBarcodeUl(), ulRowDTO.getBarcodeUl()) && Objects.equals(getCodMart(), ulRowDTO.getCodMart()) && Objects.equals(getPartitaMag(), ulRowDTO.getPartitaMag()) && Objects.equals(getDataScad(), ulRowDTO.getDataScad()) && Objects.equals(getQtaCol(), ulRowDTO.getQtaCol()) && Objects.equals(getDataOrd(), ulRowDTO.getDataOrd()) && Objects.equals(getNumOrd(), ulRowDTO.getNumOrd()) && Objects.equals(getRigaOrd(), ulRowDTO.getRigaOrd()) && Objects.equals(getCodMdep(), ulRowDTO.getCodMdep());
}
@Override
public int hashCode() {
return Objects.hash(getBarcodeUl(), getCodMart(), getPartitaMag(), getDataScad(), getQtaCol(), getDataOrd(), getNumOrd(), getRigaOrd(), getCodMdep());
}
}

7
ems-engine/src/main/java/it/integry/ems/document/fatture/dto/DatiBodyFattura.java
View File

@@ -109,6 +109,9 @@ public class DatiBodyFattura {
@SqlField(value = "tipo_emissione")
private String tipoEmissione;
@SqlField(value = "cod_vdes")
private String codVdes;
public DatiBodyFattura() {
}
@@ -383,4 +386,8 @@ public class DatiBodyFattura {
public void setTipoEmissione(String tipoEmissione) {
this.tipoEmissione = tipoEmissione;
}
public String getCodVdes() {return codVdes;}
public void setCodVdes(String codVdes) {this.codVdes = codVdes;}
}

7
ems-engine/src/main/java/it/integry/ems/document/fatture/factory/DigitalInvoiceBodyFactory.java
View File

@@ -490,6 +490,13 @@ public class DigitalInvoiceBodyFactory {
datiGeneraliDocumento.getCausale().add(causaleTipoDoc);
}
if (bodyFattura.getCodVdes() != null){
String causaleDest = setupCustom.getSetup("FATTURA_ELETTRONICA_CUSTOM", "COD_ANAG_" + request.getCodAnag(), "CAUSALE_COD_VDES_" + bodyFattura.getCodVdes());
if (!UtilityString.isNullOrEmpty(causaleDest)) {
datiGeneraliDocumento.getCausale().add(causaleDest);
}
}
// se configurato inserisce nel tag CAUSALE le note del cliente
if (setupCustom.getSetupBoolean("FATTURA_ELETTRONICA_CUSTOM", "CAUSALE", "NOTE CLIENTE")) {
sql = "SELECT left(note, 200 )as note FROM vtb_clie WHERE cod_anag = " + UtilityDB.valueToString(request.getCodAnag());

3
ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceService.java
View File

@@ -230,7 +230,8 @@ public class DigitalInvoiceService {
"naziVett.cod_nazi_alpha_2 as nazione_vett, " +
"case when vtb_vett.cod_anag is null THEN vtb_vett.rag_soc ELSE gtb_anag.rag_soc END as rag_soc_vett, " +
"vtb_vett.num_autoriz as autoriz_vett, " +
"vtb_auto.descrizione as mezzo_vett " +
"vtb_auto.descrizione as mezzo_vett, " +
"dtb_doct.cod_vdes as cod_vdes " +
" FROM dtb_doct " +
" LEFT OUTER JOIN dtb_tipi ON dtb_doct.cod_dtip = dtb_tipi.cod_dtip " +
" LEFT OUTER JOIN dvw_tipi_integrazioni on dtb_doct.cod_dtip = dvw_tipi_integrazioni.cod_dtip " +

38
ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
View File

@@ -674,16 +674,20 @@ public class DocumentiDirettiService {
}
for (ULRowDTO ulRowDTO : createUDSFromDocuments.getUlRows()) {
if (!createUDSFromDocuments.isMonoUl() || uds == null) {
if (!createUDSFromDocuments.isMonoUl()) {
CreateUDSRequestOrderDTO ord = new CreateUDSRequestOrderDTO()
.setDataOrd(ulRowDTO.getDataOrd())
.setNumOrd(ulRowDTO.getNumOrd())
.setGestione(createUDSFromDocuments.getGestione());
createUDSRequestOrderDTO = new ArrayList<>();
createUDSRequestOrderDTO.add(ord);
}
Map<String, List<ULRowDTO>> ulGroup = createUDSFromDocuments.getUlRows().stream().collect(groupingBy(ULRowDTO::getCodMdep));
for(Map.Entry<String, List<ULRowDTO>> entry : ulGroup.entrySet()) {
String codMdep = entry.getKey();
for (ULRowDTO ulRowDTO : entry.getValue()) {
if (!createUDSFromDocuments.isMonoUl() || uds == null) {
if (!createUDSFromDocuments.isMonoUl()) {
CreateUDSRequestOrderDTO ord = new CreateUDSRequestOrderDTO()
.setDataOrd(ulRowDTO.getDataOrd())
.setNumOrd(ulRowDTO.getNumOrd())
.setGestione(createUDSFromDocuments.getGestione());
createUDSRequestOrderDTO = new ArrayList<>();
createUDSRequestOrderDTO.add(ord);
}
if (isLavorazione) {
uds = wmsLavorazioneService.createUDS(
@@ -697,12 +701,12 @@ public class DocumentiDirettiService {
uds = wmsSpedizioneService.createUDS(
new CreateUDSRequestDTO()
.setCodAnag(createUDSFromDocuments.getCodAnag())
.setCodMdep(createUDSFromDocuments.getCodMdep())
.setCodMdep(codMdep)
.setCodVdes(createUDSFromDocuments.getCodVdes())
.setOrders(createUDSRequestOrderDTO));
}
}
uds.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
uds.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
List<MvwSitArtUdcDetInventarioDTO> mvwSitArtUdcDetInventarioDTOS =
wmsGiacenzaULService.retrieveArtsInGiacenzaByArticolo(multiDBTransactionManager.getPrimaryConnection(), new RetrieveArtsInGiacenzaByArtRequestDTO()
@@ -717,10 +721,10 @@ public class DocumentiDirettiService {
.orElse(null);
if (mvwSitArtUdcDetInventarioDTO != null) {
if (mvwSitArtUdcDetInventarioDTO != null) {
sourceMtbColr = WMSUtility.convertMvwItemToMtbColr(mvwSitArtUdcDetInventarioDTO);
}
}
}
if (isLavorazione) {
wmsLavorazioneService.insertUDSRow(
@@ -749,7 +753,7 @@ public class DocumentiDirettiService {
);
}
if (!createUDSFromDocuments.isMonoUl()) {
if (!createUDSFromDocuments.isMonoUl()) {
if (isLavorazione) {
CloseUDSLavorazioneRequestDTO closeUDSLavorazioneRequestDTO =
new CloseUDSLavorazioneRequestDTO();
@@ -759,9 +763,11 @@ public class DocumentiDirettiService {
wmsSpedizioneService.closeUDS(new CloseUDSRequestDTO().setMtbColt(uds));
}
generatedMtbColt.add(uds);
generatedMtbColt.add(uds);
}
}
}
if (createUDSFromDocuments.isMonoUl()) {
if (isLavorazione) {
CloseUDSLavorazioneRequestDTO closeUDSLavorazioneRequestDTO =

5
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniConsortileService.java
View File

@@ -10,6 +10,7 @@ import it.integry.ems_model.entity.*;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -261,14 +262,14 @@ public class OrdiniConsortileService {
AtbListData headLisa = new AtbListData();
headLisa.setOperation(OperationType.INSERT_OR_UPDATE);
headLisa.setCodAlis(codAlis);
headLisa.setDataIniz(dataOrd);
headLisa.setDataIniz(UtilityLocalDate.localDateFromDate(dataOrd));
headLisa.setVersione(versione);
MtbLisaData rowLisa = new MtbLisaData();
rowLisa.setOperation(OperationType.INSERT_OR_UPDATE);
rowLisa.setVersione(versione);
rowLisa.setCodAlis(codAlis);
rowLisa.setDataIniz(dataOrd); /*Viene inserito il listino con la data del primo ordine di vendita importato*/
rowLisa.setDataIniz(UtilityLocalDate.localDateFromDate(dataOrd)); /*Viene inserito il listino con la data del primo ordine di vendita importato*/
rowLisa.setCodArtFor(passaporto);
rowLisa.setPartitaMag(origine);
rowLisa.setCodMart(codMart);

3
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniNewCliImportService.java
View File

@@ -5,6 +5,7 @@ import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.order.crm.service.CrmService;
import it.integry.ems.order.crm.utility.CRMUtility;
import it.integry.ems.order.dto.NewCliOrdDTO;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
@@ -92,7 +93,7 @@ public class OrdiniNewCliImportService {
// Creazione trasferimento prospect: il metodo restituisce tutte quante le entity da aggiornare con il nuovo codice
// cliente a queste entity vengono successivamente solo aggiornati i dati passati dall'eterno
arrayEntity = prospectImporterService.trasferimento(conn, codAnagAss, codAnag);
arrayEntity = CRMUtility.prospectToClie(conn, codAnagAss, codAnag).getEntityToProcess();
Optional<EntityBase> findGtbAnag = Stream.of(arrayEntity).filter(x -> x instanceof GtbAnag).findFirst();
if (findGtbAnag.isPresent())

2
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java
View File

@@ -1828,6 +1828,7 @@ public class OrdiniWebImportService {
String descrizioneEstesa = resOrdine.getString("descrizione_estesa");
String rifOrd = resOrdine.getString("rif_ord");
qtaCnf = resOrdine.getBigDecimal("qta_cnf");
BigDecimal numCnfOrdA = qtaOrd.divide(qtaCnf, RoundingMode.HALF_UP).setScale(0, RoundingMode.CEILING);
if (count == 1 && flagMate.compareTo("N") == 0) {
qtaOrd2 = resOrdine.getBigDecimal("qta_ord2");
@@ -1883,6 +1884,7 @@ public class OrdiniWebImportService {
ordL.setDescrEstesaProd(descrizioneEstesa);
ordL.setQtaProd(qtaOrd);
ordL.setFlagSospeso("S");
ordL.setNumCnfProd(numCnfOrdA);
if (codSpes != null) {
ordS = new DtbOrds();
ordS.setCodSpes(codSpes);

136
ems-engine/src/main/java/it/integry/ems/order/crm/controller/CrmController.java
View File

@@ -1,124 +1,86 @@
package it.integry.ems.order.crm.controller;
import com.fasterxml.jackson.databind.JsonNode;
import it.integry.common.var.CommonConstants;
import it.integry.ems.order.crm.dto.CrmAttivita;
import it.integry.ems.order.crm.dto.CrmCompletaOrd;
import it.integry.ems.order.crm.dto.CrmCreaContatto;
import it.integry.ems.order.crm.dto.CRMActivityDTO;
import it.integry.ems.order.crm.dto.completeOrder.CRMCompleteOrderRequestDTO;
import it.integry.ems.order.crm.dto.createContact.CRMCreateContactRequestDTO;
import it.integry.ems.order.crm.dto.transferProspect.CRMTransferProspectRequestDTO;
import it.integry.ems.order.crm.service.CrmService;
import it.integry.ems.response.EsitoType;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.config.EmsRestConstants;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDate;
import java.util.List;
import java.time.LocalDate;
@RestController
@Scope("request")
@RequestMapping("/crm")
public class CrmController {
private final Logger logger = LogManager.getLogger();
@Autowired
private CrmService crmService;
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@RequestMapping(value = EmsRestConstants.PATH_TRASFERIMENTO_PROSPECT_TO_CLIENTE, method = RequestMethod.POST)
public ServiceRestResponse trasferimentoProspectToCliente(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody JsonNode jsonBody) {
ServiceRestResponse response;
try {
List<EntityBase> responseEntities = crmService.trasferimentoProspect(jsonBody);
multiDBTransactionManager.commitAll();
@RequestMapping(value = "createContact", method = RequestMethod.POST)
public ServiceRestResponse createContact(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestBody CRMCreateContactRequestDTO createContactDTO) throws Exception {
response = new ServiceRestResponse(EsitoType.OK, responseEntities, configuration);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
return ServiceRestResponse.createPositiveResponse(crmService.createContact(createContactDTO));
}
@RequestMapping(value = EmsRestConstants.PATH_CRM_CREA_NUOVO_CONTATTO, method = RequestMethod.POST)
public ServiceRestResponse creaNuovoContattoCRM(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CrmCreaContatto jsonBody) {
ServiceRestResponse response;
try {
List<EntityBase> responseEntities = crmService.CRMNuovoContatto(jsonBody);
multiDBTransactionManager.commitAll();
@RequestMapping(value = "saveActivity", method = RequestMethod.POST)
public ServiceRestResponse saveActivity(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestBody CRMActivityDTO activityRequest) throws Exception {
response = new ServiceRestResponse(EsitoType.OK, responseEntities, configuration);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
return ServiceRestResponse.createPositiveResponse(crmService.saveActivity(activityRequest));
}
@RequestMapping(value = EmsRestConstants.PATH_CRM_SALVA_ATTIVITA, method = RequestMethod.POST)
public ServiceRestResponse salvaAttivitaCRM(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody List<CrmAttivita> jsonBody) {
ServiceRestResponse response = new ServiceRestResponse();
try {
List<EntityBase> responseEntities = crmService.CRMSalvaAttivita(jsonBody);
multiDBTransactionManager.commitAll();
response = new ServiceRestResponse(EsitoType.OK, responseEntities, configuration);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
@RequestMapping(value = "completeOrder", method = RequestMethod.POST)
public ServiceRestResponse completeOrder(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestBody CRMCompleteOrderRequestDTO completeOrder) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.completeOrder(completeOrder));
}
@RequestMapping(value = EmsRestConstants.PATH_CRM_COMPLETA_OFFERTA, method = RequestMethod.POST)
public ServiceRestResponse completaOffertaCRM(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CrmCompletaOrd body) {
ServiceRestResponse response;
try {
List<EntityBase> responseEntities = crmService.CRMCompletaOfferta(body);
response = new ServiceRestResponse(EsitoType.OK, responseEntities, configuration);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
@RequestMapping(value = "transferProspect", method = RequestMethod.POST)
public ServiceRestResponse transferProspect(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestBody CRMTransferProspectRequestDTO prospectToTransfer) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.transferProspect(prospectToTransfer));
}
@RequestMapping(value = "getActivityCrm", method = RequestMethod.GET)
public ServiceRestResponse getActivity(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.getActivity(dateFilter));
@RequestMapping(value = "retrieveActivity", method = RequestMethod.GET)
public ServiceRestResponse retrieveActivity(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam() @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.retrieveActivity(dateFilter));
}
@RequestMapping(value = "getCommesseCrm", method = RequestMethod.GET)
public ServiceRestResponse getCommesse(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.getCommesse(dateFilter));
@RequestMapping(value = "retrieveCommesse", method = RequestMethod.GET)
public ServiceRestResponse retrieveCommesse(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.retrieveCommesse(dateFilter));
}
@RequestMapping(value = "getProspectCrm", method = RequestMethod.GET)
public ServiceRestResponse getProspect(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.getProspect(dateFilter));
@RequestMapping(value = "retrieveProspect", method = RequestMethod.GET)
public ServiceRestResponse retrieveProspect(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.retrieveProspect(dateFilter));
}
@RequestMapping(value = "getAnagClieCrm", method = RequestMethod.GET)
public ServiceRestResponse getAnagClie(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.getAnagClie(dateFilter));
@RequestMapping(value = "retrieveClienti", method = RequestMethod.GET)
public ServiceRestResponse retrieveClienti(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateFilter) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.retrieveClienti(dateFilter));
}
@RequestMapping(value = "retrieveSettings", method = RequestMethod.GET)
public ServiceRestResponse retrieveSettings(@RequestParam(CommonConstants.PROFILE_DB) String profileDB) throws Exception {
return ServiceRestResponse.createPositiveResponse(crmService.retrieveSettings());
}
}

12
ems-engine/src/main/java/it/integry/ems/order/crm/dto/AnagClieDTO.java
View File

@@ -82,6 +82,9 @@ public class AnagClieDTO {
@SqlField(value = "data_mod")
private Date dataMod;
@SqlField(value = "flag_stato")
private String flagStato;
public String getCodAnag() {
return codAnag;
}
@@ -306,4 +309,13 @@ public class AnagClieDTO {
this.dataMod = dataMod;
return this;
}
public String getFlagStato() {
return flagStato;
}
public AnagClieDTO setFlagStato(String flagStato) {
this.flagStato = flagStato;
return this;
}
}

216
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMActivityDTO.java Normal file
View File

@@ -0,0 +1,216 @@
package it.integry.ems.order.crm.dto;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class CRMActivityDTO {
private String activityId;
private String parentActivityId;
private String codJcom;
private String tipoAnag;
private String codAnag;
private String activityTypeId;
private String activityDescription;
private String activityResultId;
private String note;
private String flagTipologia;
private String userName;
private String userCreator;
private String userModifier;
private Date oraModAct;
private Date oraViewAct;
private Date estimatedTime;
private Date estimatedEndtime;
private Date effectiveTime;
private Date effectiveEndtime;
private List<String> userNameList;
public String getActivityId() {
return activityId;
}
public CRMActivityDTO setActivityId(String activityId) {
this.activityId = activityId;
return this;
}
public String getParentActivityId() {
return parentActivityId;
}
public CRMActivityDTO setParentActivityId(String parentActivityId) {
this.parentActivityId = parentActivityId;
return this;
}
public String getCodJcom() {
return codJcom;
}
public CRMActivityDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getTipoAnag() {
return tipoAnag;
}
public CRMActivityDTO setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CRMActivityDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getActivityTypeId() {
return activityTypeId;
}
public CRMActivityDTO setActivityTypeId(String activityTypeId) {
this.activityTypeId = activityTypeId;
return this;
}
public String getActivityDescription() {
return activityDescription;
}
public CRMActivityDTO setActivityDescription(String activityDescription) {
this.activityDescription = activityDescription;
return this;
}
public String getActivityResultId() {
return activityResultId;
}
public CRMActivityDTO setActivityResultId(String activityResultId) {
this.activityResultId = activityResultId;
return this;
}
public String getNote() {
return note;
}
public CRMActivityDTO setNote(String note) {
this.note = note;
return this;
}
public String getFlagTipologia() {
return flagTipologia;
}
public CRMActivityDTO setFlagTipologia(String flagTipologia) {
this.flagTipologia = flagTipologia;
return this;
}
public String getUserName() {
return userName;
}
public CRMActivityDTO setUserName(String userName) {
this.userName = userName;
return this;
}
public List<String> getUserNameList() {
if (userNameList == null && userName != null) {
userNameList = new ArrayList<>();
userNameList.add(userName);
}
return userNameList;
}
public CRMActivityDTO setUserNameList(List<String> userNameList) {
this.userNameList = userNameList;
return this;
}
public String getUserCreator() {
return userCreator;
}
public CRMActivityDTO setUserCreator(String userCreator) {
this.userCreator = userCreator;
return this;
}
public String getUserModifier() {
return userModifier;
}
public CRMActivityDTO setUserModifier(String userModifier) {
this.userModifier = userModifier;
return this;
}
public Date getOraModAct() {
return oraModAct;
}
public CRMActivityDTO setOraModAct(Date oraModAct) {
this.oraModAct = oraModAct;
return this;
}
public Date getOraViewAct() {
return oraViewAct;
}
public CRMActivityDTO setOraViewAct(Date oraViewAct) {
this.oraViewAct = oraViewAct;
return this;
}
public Date getEstimatedTime() {
return estimatedTime;
}
public CRMActivityDTO setEstimatedTime(Date estimatedTime) {
this.estimatedTime = estimatedTime;
return this;
}
public Date getEstimatedEndtime() {
return estimatedEndtime;
}
public CRMActivityDTO setEstimatedEndtime(Date estimatedEndtime) {
this.estimatedEndtime = estimatedEndtime;
return this;
}
public Date getEffectiveTime() {
return effectiveTime;
}
public CRMActivityDTO setEffectiveTime(Date effectiveTime) {
this.effectiveTime = effectiveTime;
return this;
}
public Date getEffectiveEndtime() {
return effectiveEndtime;
}
public CRMActivityDTO setEffectiveEndtime(Date effectiveEndtime) {
this.effectiveEndtime = effectiveEndtime;
return this;
}
}

185
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMClienteDTO.java Normal file
View File

@@ -0,0 +1,185 @@
package it.integry.ems.order.crm.dto;
public class CRMClienteDTO {
private String ragSoc;
private String ragSoc2;
private String codVtip;
private String codVzon;
private String indirizzo;
private String cap;
private String citta;
private String prov;
private String nazione;
private String telefono;
private String partIva;
private String codFisc;
private String eMail;
private String eMailPec;
private String cuuPa;
private String flagInformativa;
private String flagConsenso;
private String codVlis;
public String getRagSoc() {
return ragSoc;
}
public CRMClienteDTO setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
return this;
}
public String getRagSoc2() {
return ragSoc2;
}
public CRMClienteDTO setRagSoc2(String ragSoc2) {
this.ragSoc2 = ragSoc2;
return this;
}
public String getCodVtip() {
return codVtip;
}
public CRMClienteDTO setCodVtip(String codVtip) {
this.codVtip = codVtip;
return this;
}
public String getCodVzon() {
return codVzon;
}
public CRMClienteDTO setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
public String getIndirizzo() {
return indirizzo;
}
public CRMClienteDTO setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
return this;
}
public String getCap() {
return cap;
}
public CRMClienteDTO setCap(String cap) {
this.cap = cap;
return this;
}
public String getCitta() {
return citta;
}
public CRMClienteDTO setCitta(String citta) {
this.citta = citta;
return this;
}
public String getProv() {
return prov;
}
public CRMClienteDTO setProv(String prov) {
this.prov = prov;
return this;
}
public String getNazione() {
return nazione;
}
public CRMClienteDTO setNazione(String nazione) {
this.nazione = nazione;
return this;
}
public String getTelefono() {
return telefono;
}
public CRMClienteDTO setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String getPartIva() {
return partIva;
}
public CRMClienteDTO setPartIva(String partIva) {
this.partIva = partIva;
return this;
}
public String getCodFisc() {
return codFisc;
}
public CRMClienteDTO setCodFisc(String codFisc) {
this.codFisc = codFisc;
return this;
}
public String geteMail() {
return eMail;
}
public CRMClienteDTO seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String geteMailPec() {
return eMailPec;
}
public CRMClienteDTO seteMailPec(String eMailPec) {
this.eMailPec = eMailPec;
return this;
}
public String getCuuPa() {
return cuuPa;
}
public CRMClienteDTO setCuuPa(String cuuPa) {
this.cuuPa = cuuPa;
return this;
}
public String getFlagInformativa() {
return flagInformativa;
}
public CRMClienteDTO setFlagInformativa(String flagInformativa) {
this.flagInformativa = flagInformativa;
return this;
}
public String getFlagConsenso() {
return flagConsenso;
}
public CRMClienteDTO setFlagConsenso(String flagConsenso) {
this.flagConsenso = flagConsenso;
return this;
}
public String getCodVlis() {
return codVlis;
}
public CRMClienteDTO setCodVlis(String codVlis) {
this.codVlis = codVlis;
return this;
}
}

65
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMCommessaDTO.java Normal file
View File

@@ -0,0 +1,65 @@
package it.integry.ems.order.crm.dto;
public class CRMCommessaDTO {
private String descrizione;
private String descrizioneEstesa;
private String note;
private String codJflav;
private String codJfas;
private String statoCommessa;
public String getDescrizione() {
return descrizione;
}
public CRMCommessaDTO setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public String getDescrizioneEstesa() {
return descrizioneEstesa;
}
public CRMCommessaDTO setDescrizioneEstesa(String descrizioneEstesa) {
this.descrizioneEstesa = descrizioneEstesa;
return this;
}
public String getNote() {
return note;
}
public CRMCommessaDTO setNote(String note) {
this.note = note;
return this;
}
public String getCodJflav() {
return codJflav;
}
public CRMCommessaDTO setCodJflav(String codJflav) {
this.codJflav = codJflav;
return this;
}
public String getCodJfas() {
return codJfas;
}
public CRMCommessaDTO setCodJfas(String codJfas) {
this.codJfas = codJfas;
return this;
}
public String getStatoCommessa() {
return statoCommessa;
}
public CRMCommessaDTO setStatoCommessa(String statoCommessa) {
this.statoCommessa = statoCommessa;
return this;
}
}

57
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMCreateNewCommessaRequestDTO.java Normal file
View File

@@ -0,0 +1,57 @@
package it.integry.ems.order.crm.dto;
public class CRMCreateNewCommessaRequestDTO {
private String tipoAnag;
private String codAnag;
private String codVdes;
private CRMCommessaDTO commessa;
private boolean skipCommit;
public String getTipoAnag() {
return tipoAnag;
}
public CRMCreateNewCommessaRequestDTO setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CRMCreateNewCommessaRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodVdes() {
return codVdes;
}
public CRMCreateNewCommessaRequestDTO setCodVdes(String codVdes) {
this.codVdes = codVdes;
return this;
}
public CRMCommessaDTO getCommessa() {
return commessa;
}
public CRMCreateNewCommessaRequestDTO setCommessa(CRMCommessaDTO commessa) {
this.commessa = commessa;
return this;
}
public boolean isSkipCommit() {
return skipCommit;
}
public CRMCreateNewCommessaRequestDTO setSkipCommit(boolean skipCommit) {
this.skipCommit = skipCommit;
return this;
}
}

48
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMCreateNewQuoteRequestDTO.java Normal file
View File

@@ -0,0 +1,48 @@
package it.integry.ems.order.crm.dto;
import it.integry.ems.order.crm.dto.createContact.CRMCreateContactRequestDTO;
public class CRMCreateNewQuoteRequestDTO {
private String codJcom;
private String codAnag;
private String codVdes;
private CRMCreateContactRequestDTO createContact;
public String getCodJcom() {
return codJcom;
}
public CRMCreateNewQuoteRequestDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CRMCreateNewQuoteRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodVdes() {
return codVdes;
}
public CRMCreateNewQuoteRequestDTO setCodVdes(String codVdes) {
this.codVdes = codVdes;
return this;
}
public CRMCreateContactRequestDTO getCreateContact() {
return createContact;
}
public CRMCreateNewQuoteRequestDTO setCreateContact(CRMCreateContactRequestDTO createContact) {
this.createContact = createContact;
return this;
}
}

114
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMDestinazioneDTO.java Normal file
View File

@@ -0,0 +1,114 @@
package it.integry.ems.order.crm.dto;
public class CRMDestinazioneDTO {
private String codAliqIn;
private String codAliqOut;
private String ragSoc;
private String indirizzo;
private String cap;
private String citta;
private String prov;
private String nazione;
private String telefono;
private String eMail;
private String codVzon;
public String getCodAliqIn() {
return codAliqIn;
}
public CRMDestinazioneDTO setCodAliqIn(String codAliqIn) {
this.codAliqIn = codAliqIn;
return this;
}
public String getCodAliqOut() {
return codAliqOut;
}
public CRMDestinazioneDTO setCodAliqOut(String codAliqOut) {
this.codAliqOut = codAliqOut;
return this;
}
public String getRagSoc() {
return ragSoc;
}
public CRMDestinazioneDTO setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
return this;
}
public String getIndirizzo() {
return indirizzo;
}
public CRMDestinazioneDTO setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
return this;
}
public String getCap() {
return cap;
}
public CRMDestinazioneDTO setCap(String cap) {
this.cap = cap;
return this;
}
public String getCitta() {
return citta;
}
public CRMDestinazioneDTO setCitta(String citta) {
this.citta = citta;
return this;
}
public String getProv() {
return prov;
}
public CRMDestinazioneDTO setProv(String prov) {
this.prov = prov;
return this;
}
public String getNazione() {
return nazione;
}
public CRMDestinazioneDTO setNazione(String nazione) {
this.nazione = nazione;
return this;
}
public String getTelefono() {
return telefono;
}
public CRMDestinazioneDTO setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String geteMail() {
return eMail;
}
public CRMDestinazioneDTO seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getCodVzon() {
return codVzon;
}
public CRMDestinazioneDTO setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
}

38
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmPersRif.java → ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMPersRifDTO.java
View File

@@ -1,67 +1,75 @@
package it.integry.ems.order.crm.dto;
public class CrmPersRif {
public Integer idPersRif;
public String personaRif;
public String mansione;
public String telefono;
public String fax;
public String eMail;
public String numCellulare;
public class CRMPersRifDTO {
private Integer idPersRif;
private String personaRif;
private String mansione;
private String telefono;
private String fax;
private String eMail;
private String numCellulare;
public Integer getIdPersRif() {
return idPersRif;
}
public void setIdPersRif(Integer idPersRif) {
public CRMPersRifDTO setIdPersRif(Integer idPersRif) {
this.idPersRif = idPersRif;
return this;
}
public String getPersonaRif() {
return personaRif;
}
public void setPersonaRif(String personaRif) {
public CRMPersRifDTO setPersonaRif(String personaRif) {
this.personaRif = personaRif;
return this;
}
public String getMansione() {
return mansione;
}
public void setMansione(String mansione) {
public CRMPersRifDTO setMansione(String mansione) {
this.mansione = mansione;
return this;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
public CRMPersRifDTO setTelefono(String telefono) {
this.telefono = telefono;
return this;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
public CRMPersRifDTO setFax(String fax) {
this.fax = fax;
return this;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
public CRMPersRifDTO seteMail(String eMail) {
this.eMail = eMail;
return this;
}
public String getNumCellulare() {
return numCellulare;
}
public void setNumCellulare(String numCellulare) {
public CRMPersRifDTO setNumCellulare(String numCellulare) {
this.numCellulare = numCellulare;
return this;
}
}

41
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMSettingsResponseDTO.java Normal file
View File

@@ -0,0 +1,41 @@
package it.integry.ems.order.crm.dto;
import it.integry.ems_model.entity.StbActivityResult;
import it.integry.ems_model.entity.StbActivityType;
import it.integry.ems_model.entity.StbUser;
import java.util.List;
public class CRMSettingsResponseDTO {
private List<StbActivityType> activityTypes;
private List<StbActivityResult> activityResults;
private List<StbUser> stbUsers;
public List<StbActivityType> getActivityTypes() {
return activityTypes;
}
public CRMSettingsResponseDTO setActivityTypes(List<StbActivityType> activityTypes) {
this.activityTypes = activityTypes;
return this;
}
public List<StbActivityResult> getActivityResults() {
return activityResults;
}
public CRMSettingsResponseDTO setActivityResults(List<StbActivityResult> activityResults) {
this.activityResults = activityResults;
return this;
}
public List<StbUser> getStbUsers() {
return stbUsers;
}
public CRMSettingsResponseDTO setStbUsers(List<StbUser> stbUsers) {
this.stbUsers = stbUsers;
return this;
}
}

22
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmSpese.java → ems-engine/src/main/java/it/integry/ems/order/crm/dto/CRMSpeseDTO.java
View File

@@ -2,41 +2,45 @@ package it.integry.ems.order.crm.dto;
import java.math.BigDecimal;
public class CrmSpese {
public String codSpes;
public String descrizione;
public BigDecimal importo;
public String codAliq;
public class CRMSpeseDTO {
private String codSpes;
private String descrizione;
private BigDecimal importo;
private String codAliq;
public String getCodSpes() {
return codSpes;
}
public void setCodSpes(String codSpes) {
public CRMSpeseDTO setCodSpes(String codSpes) {
this.codSpes = codSpes;
return this;
}
public String getDescrizione() {
return descrizione;
}
public void setDescrizione(String descrizione) {
public CRMSpeseDTO setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public BigDecimal getImporto() {
return importo;
}
public void setImporto(BigDecimal importo) {
public CRMSpeseDTO setImporto(BigDecimal importo) {
this.importo = importo;
return this;
}
public String getCodAliq() {
return codAliq;
}
public void setCodAliq(String codAliq) {
public CRMSpeseDTO setCodAliq(String codAliq) {
this.codAliq = codAliq;
return this;
}
}

200
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmAttivita.java
View File

@@ -1,200 +0,0 @@
package it.integry.ems.order.crm.dto;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import it.integry.ems.adapter.JsonDateAdapterDeserializer;
import it.integry.ems.adapter.JsonDateAdapterSerializer;
import java.util.Date;
public class CrmAttivita {
public String activityId;
public String parentActivityId;
public String codJcom;
public String tipoAnag;
public String codAnag;
public String activityTypeId;
public String activityDescription;
public String activityResultId;
public String note;
public String flagTipologia;
public String userName;
public String userCreator;
public String userModifier;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date oraModAct;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date oraViewAct;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date estimatedTime;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date estimatedEndtime;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date effectiveTime;
@JsonSerialize(using = JsonDateAdapterSerializer.class)
@JsonDeserialize(using = JsonDateAdapterDeserializer.class)
public Date effectiveEndtime;
public String getCodJcom() {
return codJcom;
}
public void setCodJcom(String codJcom) {
this.codJcom = codJcom;
}
public String getTipoAnag() {
return tipoAnag;
}
public void setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
}
public String getCodAnag() {
return codAnag;
}
public void setCodAnag(String codAnag) {
this.codAnag = codAnag;
}
public String getActivityId() {
return activityId;
}
public void setActivityId(String activityId) {
this.activityId = activityId;
}
public String getActivityTypeId() {
return activityTypeId;
}
public void setActivityTypeId(String activityTypeId) {
this.activityTypeId = activityTypeId;
}
public String getParentActivityId() {
return parentActivityId;
}
public void setParentActivityId(String parentActivityId) {
this.parentActivityId = parentActivityId;
}
public String getActivityDescription() {
return activityDescription;
}
public void setActivityDescription(String activityDescription) {
this.activityDescription = activityDescription;
}
public String getActivityResultId() {
return activityResultId;
}
public void setActivityResultId(String activityResultId) {
this.activityResultId = activityResultId;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getFlagTipologia() {
return flagTipologia;
}
public void setFlagTipologia(String flagTipologia) {
this.flagTipologia = flagTipologia;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserCreator() {
return userCreator;
}
public void setUserCreator(String userCreator) {
this.userCreator = userCreator;
}
public String getUserModifier() {
return userModifier;
}
public void setUserModifier(String userModifier) {
this.userModifier = userModifier;
}
public Date getOraModAct() {
return oraModAct;
}
public void setOraModAct(Date oraModAct) {
this.oraModAct = oraModAct;
}
public Date getOraViewAct() {
return oraViewAct;
}
public void setOraViewAct(Date oraViewAct) {
this.oraViewAct = oraViewAct;
}
public Date getEstimatedTime() {
return estimatedTime;
}
public void setEstimatedTime(Date estimatedTime) {
this.estimatedTime = estimatedTime;
}
public Date getEstimatedEndtime() {
return estimatedEndtime;
}
public void setEstimatedEndtime(Date estimatedEndtime) {
this.estimatedEndtime = estimatedEndtime;
}
public Date getEffectiveTime() {
return effectiveTime;
}
public void setEffectiveTime(Date effectiveTime) {
this.effectiveTime = effectiveTime;
}
public Date getEffectiveEndtime() {
return effectiveEndtime;
}
public void setEffectiveEndtime(Date effectiveEndtime) {
this.effectiveEndtime = effectiveEndtime;
}
}

148
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmCliente.java
View File

@@ -1,148 +0,0 @@
package it.integry.ems.order.crm.dto;
public class CrmCliente {
public String ragSoc;
public String ragSoc2;
public String codVtip;
public String indirizzo;
public String cap;
public String citta;
public String prov;
public String nazione;
public String telefono;
public String partIva;
public String codFisc;
public String eMail;
public String eMailPec;
public String cuuPa;
public String flagInformativa;
public String flagConsenso;
public String getRagSoc() {
return ragSoc;
}
public void setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
}
public String getRagSoc2() {
return ragSoc2;
}
public void setRagSoc2(String ragSoc2) {
this.ragSoc2 = ragSoc2;
}
public String getCodVtip() {
return codVtip;
}
public void setCodVtip(String codVtip) {
this.codVtip = codVtip;
}
public String getIndirizzo() {
return indirizzo;
}
public void setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
}
public String getCap() {
return cap;
}
public void setCap(String cap) {
this.cap = cap;
}
public String getCitta() {
return citta;
}
public void setCitta(String citta) {
this.citta = citta;
}
public String getProv() {
return prov;
}
public void setProv(String prov) {
this.prov = prov;
}
public String getNazione() {
return nazione;
}
public void setNazione(String nazione) {
this.nazione = nazione;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
this.telefono = telefono;
}
public String getPartIva() {
return partIva;
}
public void setPartIva(String partIva) {
this.partIva = partIva;
}
public String getCodFisc() {
return codFisc;
}
public void setCodFisc(String codFisc) {
this.codFisc = codFisc;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
this.eMail = eMail;
}
public String geteMailPec() {
return eMailPec;
}
public void seteMailPec(String eMailPec) {
this.eMailPec = eMailPec;
}
public String getCuuPa() {
return cuuPa;
}
public void setCuuPa(String cuuPa) {
this.cuuPa = cuuPa;
}
public String getFlagInformativa() {
return flagInformativa;
}
public void setFlagInformativa(String flagInformativa) {
this.flagInformativa = flagInformativa;
}
public String getFlagConsenso() {
return flagConsenso;
}
public void setFlagConsenso(String flagConsenso) {
this.flagConsenso = flagConsenso;
}
}

58
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmCommessa.java
View File

@@ -1,58 +0,0 @@
package it.integry.ems.order.crm.dto;
public class CrmCommessa {
public String descrizione;
public String descrizioneEstesa;
public String note;
public String codJflav;
public String codJfas;
public String statoCommessa;
public String getDescrizione() {
return descrizione;
}
public void setDescrizione(String descrizione) {
this.descrizione = descrizione;
}
public String getDescrizioneEstesa() {
return descrizioneEstesa;
}
public void setDescrizioneEstesa(String descrizioneEstesa) {
this.descrizioneEstesa = descrizioneEstesa;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getCodJflav() {
return codJflav;
}
public void setCodJflav(String codJflav) {
this.codJflav = codJflav;
}
public String getCodJfas() {
return codJfas;
}
public void setCodJfas(String codJFas) {
this.codJfas = codJFas;
}
public String getStatoCommessa() {
return statoCommessa;
}
public void setStatoCommessa(String statoCommessa) {
this.statoCommessa = statoCommessa;
}
}

242
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmCompletaOrd.java
View File

@@ -1,242 +0,0 @@
package it.integry.ems.order.crm.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.math.BigDecimal;
import java.util.List;
public class CrmCompletaOrd {
public String dataOrd;
public String gestione;
public Integer numOrd;
public String serie;
public String codJcom;
public String codAnag;
public String tipoAnag;
public String codVdes;
public String codPaga;
public String descrizionePaga;
public String mezzo;
public String termCons;
public String rifOrd;
public String note;
public String codVage2;
public String activityTypeId;
public String flagTipologia;
public CrmCliente cliente;
public CrmDestinazione destinazione;
public CrmCommessa commessa;
public String processActivityId;
public List<CrmAttivita> crmAttivita = null;
public List<CrmPersRif> persRif;
public List<CrmSpese> spese;
BigDecimal acconto;
public String getDataOrd() {
return dataOrd;
}
public void setDataOrd(String dataOrd) {
this.dataOrd = dataOrd;
}
public String getGestione() {
return gestione;
}
public void setGestione(String gestione) {
this.gestione = gestione;
}
public Integer getNumOrd() {
return numOrd;
}
public void setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
}
public String getSerie() {
return serie;
}
public void setSerie(String serie) {
this.serie = serie;
}
public String getCodJcom() {
return codJcom;
}
public void setCodJcom(String codJcom) {
this.codJcom = codJcom;
}
public String getCodAnag() {
return codAnag;
}
public void setCodAnag(String codAnag) {
this.codAnag = codAnag;
}
public String getTipoAnag() {
return tipoAnag;
}
public void setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
}
public String getCodVdes() {
return codVdes;
}
public void setCodVdes(String codVdes) {
this.codVdes = codVdes;
}
public CrmCliente getCliente() {
return cliente;
}
@JsonProperty("CRMCliente")
public void setCliente(CrmCliente cliente) {
this.cliente = cliente;
}
public CrmDestinazione getDestinazione() {
return destinazione;
}
@JsonProperty("CRMDestinazione")
public void setDestinazione(CrmDestinazione destinazione) {
this.destinazione = destinazione;
}
public CrmCommessa getCommessa() {
return commessa;
}
@JsonProperty("CRMCommessa")
public CrmCompletaOrd setCommessa(CrmCommessa commessa) {
this.commessa = commessa;
return this;
}
public String getProcessActivityId() {
return processActivityId;
}
public CrmCompletaOrd setProcessActivityId(String processActivityId) {
this.processActivityId = processActivityId;
return this;
}
public List<CrmAttivita> getCrmAttivita() {
return crmAttivita;
}
@JsonProperty("CRMAttivita")
public void setCrmAttivita(List<CrmAttivita> crmAttivita) {
this.crmAttivita = crmAttivita;
}
public List<CrmPersRif> getPersRif() {
return persRif;
}
@JsonProperty("CRMPersRif")
public void setPersRif(List<CrmPersRif> persRif) {
this.persRif = persRif;
}
public List<CrmSpese> getSpese() {
return spese;
}
@JsonProperty("CRMSpese")
public void setSpese(List<CrmSpese> spese) {
this.spese = spese;
}
public BigDecimal getAcconto() {
return acconto;
}
public void setAcconto(BigDecimal acconto) {
this.acconto = acconto;
}
public String getCodPaga() {
return codPaga;
}
public void setCodPaga(String codPaga) {
this.codPaga = codPaga;
}
public String getTermCons() {
return termCons;
}
public void setTermCons(String termCons) {
this.termCons = termCons;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getCodVage2() {
return codVage2;
}
public void setCodVage2(String codVage2) {
this.codVage2 = codVage2;
}
public String getDescrizionePaga() {
return descrizionePaga;
}
public void setDescrizionePaga(String descrizionePaga) {
this.descrizionePaga = descrizionePaga;
}
public String getMezzo() {
return mezzo;
}
public void setMezzo(String mezzo) {
this.mezzo = mezzo;
}
public String getActivityTypeId() {
return activityTypeId;
}
public void setActivityTypeId(String activityTypeId) {
this.activityTypeId = activityTypeId;
}
public String getFlagTipologia() {
return flagTipologia;
}
public void setFlagTipologia(String flagTipologia) {
this.flagTipologia = flagTipologia;
}
public String getRifOrd() {
return rifOrd;
}
public void setRifOrd(String rifOrd) {
this.rifOrd = rifOrd;
}
}

103
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmCreaContatto.java
View File

@@ -1,103 +0,0 @@
package it.integry.ems.order.crm.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
public class CrmCreaContatto {
public String codJcom;
public String codAnag;
public String tipoAnag;
public String codVdes;
public String processActivityId;
public CrmProspect crmProspect;
public CrmCommessa crmCommessa;
public CrmDestinazione destinazione;
public List<CrmAttivita> crmAttivita = null;
public List<CrmPersRif> persRif;
public String getCodJcom() {
return codJcom;
}
public void setCodJcom(String codJcom) {
this.codJcom = codJcom;
}
public String getCodAnag() {
return codAnag;
}
public void setCodAnag(String codAnag) {
this.codAnag = codAnag;
}
public String getTipoAnag() {
return tipoAnag;
}
public void setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
}
public String getCodVdes() {
return codVdes;
}
public void setCodVdes(String codVdes) {
this.codVdes = codVdes;
}
public String getProcessActivityId() {
return processActivityId;
}
public void setProcessActivityId(String processActivityId) {
this.processActivityId = processActivityId;
}
public CrmProspect getCrmProspect() {
return crmProspect;
}
@JsonProperty("CRMCliente")
public void setCrmProspect(CrmProspect crmProspect) {
this.crmProspect = crmProspect;
}
public CrmDestinazione getDestinazione() {
return destinazione;
}
@JsonProperty("CRMDestinazione")
public void setDestinazione(CrmDestinazione destinazione) {
this.destinazione = destinazione;
}
public CrmCommessa getCrmCommessa() {
return crmCommessa;
}
@JsonProperty("CRMCommessa")
public void setCrmCommessa(CrmCommessa crmCommessa) {
this.crmCommessa = crmCommessa;
}
public List<CrmAttivita> getCrmAttivita() {
return crmAttivita;
}
@JsonProperty("CRMAttivita")
public void setCrmAttivita(List<CrmAttivita> crmAttivita) {
this.crmAttivita = crmAttivita;
}
public List<CrmPersRif> getPersRif() {
return persRif;
}
@JsonProperty("CRMPersRif")
public void setPersRif(List<CrmPersRif> persRif) {
this.persRif = persRif;
}
}

103
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmDestinazione.java
View File

@@ -1,103 +0,0 @@
package it.integry.ems.order.crm.dto;
public class CrmDestinazione {
public String codAliqIn;
public String codAliqOut;
public String ragSoc;
public String indirizzo;
public String cap;
public String citta;
public String prov;
public String nazione;
public String telefono;
public String eMail;
public String codVzon;
public String getCodAliqIn() {
return codAliqIn;
}
public void setCodAliqIn(String codAliqIn) {
this.codAliqIn = codAliqIn;
}
public String getCodAliqOut() {
return codAliqOut;
}
public void setCodAliqOut(String codAliqOut) {
this.codAliqOut = codAliqOut;
}
public String getRagSoc() {
return ragSoc;
}
public void setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
}
public String getIndirizzo() {
return indirizzo;
}
public void setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
}
public String getCap() {
return cap;
}
public void setCap(String cap) {
this.cap = cap;
}
public String getCitta() {
return citta;
}
public void setCitta(String citta) {
this.citta = citta;
}
public String getProv() {
return prov;
}
public void setProv(String prov) {
this.prov = prov;
}
public String getNazione() {
return nazione;
}
public void setNazione(String nazione) {
this.nazione = nazione;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
this.telefono = telefono;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
this.eMail = eMail;
}
public String getCodVzon() {
return codVzon;
}
public void setCodVzon(String codVzon) {
this.codVzon = codVzon;
}
}

157
ems-engine/src/main/java/it/integry/ems/order/crm/dto/CrmProspect.java
View File

@@ -1,157 +0,0 @@
package it.integry.ems.order.crm.dto;
public class CrmProspect {
public String ragSoc;
public String ragSoc2;
public String codVtip;
public String codVzon;
public String indirizzo;
public String cap;
public String citta;
public String prov;
public String nazione;
public String telefono;
public String partIva;
public String codFisc;
public String eMail;
public String eMailPec;
public String cuuPa;
public String flagInformativa;
public String flagConsenso;
public String getRagSoc() {
return ragSoc;
}
public void setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
}
public String getRagSoc2() {
return ragSoc2;
}
public void setRagSoc2(String ragSoc2) {
this.ragSoc2 = ragSoc2;
}
public String getIndirizzo() {
return indirizzo;
}
public void setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
}
public String getCap() {
return cap;
}
public void setCap(String cap) {
this.cap = cap;
}
public String getCitta() {
return citta;
}
public void setCitta(String citta) {
this.citta = citta;
}
public String getProv() {
return prov;
}
public void setProv(String prov) {
this.prov = prov;
}
public String getNazione() {
return nazione;
}
public void setNazione(String nazione) {
this.nazione = nazione;
}
public String getTelefono() {
return telefono;
}
public void setTelefono(String telefono) {
this.telefono = telefono;
}
public String getPartIva() {
return partIva;
}
public void setPartIva(String partIva) {
this.partIva = partIva;
}
public String getCodFisc() {
return codFisc;
}
public void setCodFisc(String codFisc) {
this.codFisc = codFisc;
}
public String geteMail() {
return eMail;
}
public void seteMail(String eMail) {
this.eMail = eMail;
}
public String geteMailPec() {
return eMailPec;
}
public void seteMailPec(String eMailPec) {
this.eMailPec = eMailPec;
}
public String getCuuPa() {
return cuuPa;
}
public void setCuuPa(String cuuPa) {
this.cuuPa = cuuPa;
}
public String getCodVtip() {
return codVtip;
}
public void setCodVtip(String codVtip) {
this.codVtip = codVtip;
}
public String getCodVzon() {
return codVzon;
}
public void setCodVzon(String codVzon) {
this.codVzon = codVzon;
}
public String getFlagInformativa() {
return flagInformativa;
}
public void setFlagInformativa(String flagInformativa) {
this.flagInformativa = flagInformativa;
}
public String getFlagConsenso() {
return flagConsenso;
}
public void setFlagConsenso(String flagConsenso) {
this.flagConsenso = flagConsenso;
}
}

253
ems-engine/src/main/java/it/integry/ems/order/crm/dto/completeOrder/CRMCompleteOrderRequestDTO.java Normal file
View File

@@ -0,0 +1,253 @@
package it.integry.ems.order.crm.dto.completeOrder;
import it.integry.ems.order.crm.dto.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
public class CRMCompleteOrderRequestDTO {
private Date dataOrd;
private String gestione;
private Integer numOrd;
private String serie;
private String codJcom;
private String tipoAnag;
private String codAnag;
private String codVdes;
private String codPaga;
private String descrizionePaga;
private String mezzo;
private String termCons;
private String rifOrd;
private String note;
private String codVage2;
private String flagElaborato = "I";
private BigDecimal acconto;
private String activityId;
private CRMClienteDTO cliente;
private CRMDestinazioneDTO destinazione;
private CRMCommessaDTO commessa;
private CRMActivityDTO activity;
private List<CRMPersRifDTO> persRif;
private List<CRMSpeseDTO> spese;
public Date getDataOrd() {
return dataOrd;
}
public CRMCompleteOrderRequestDTO setDataOrd(Date dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public String getGestione() {
return gestione;
}
public CRMCompleteOrderRequestDTO setGestione(String gestione) {
this.gestione = gestione;
return this;
}
public Integer getNumOrd() {
return numOrd;
}
public CRMCompleteOrderRequestDTO setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
return this;
}
public String getSerie() {
return serie;
}
public CRMCompleteOrderRequestDTO setSerie(String serie) {
this.serie = serie;
return this;
}
public String getCodJcom() {
return codJcom;
}
public CRMCompleteOrderRequestDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getTipoAnag() {
return tipoAnag;
}
public CRMCompleteOrderRequestDTO setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CRMCompleteOrderRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodVdes() {
return codVdes;
}
public CRMCompleteOrderRequestDTO setCodVdes(String codVdes) {
this.codVdes = codVdes;
return this;
}
public String getCodPaga() {
return codPaga;
}
public CRMCompleteOrderRequestDTO setCodPaga(String codPaga) {
this.codPaga = codPaga;
return this;
}
public String getDescrizionePaga() {
return descrizionePaga;
}
public CRMCompleteOrderRequestDTO setDescrizionePaga(String descrizionePaga) {
this.descrizionePaga = descrizionePaga;
return this;
}
public String getMezzo() {
return mezzo;
}
public CRMCompleteOrderRequestDTO setMezzo(String mezzo) {
this.mezzo = mezzo;
return this;
}
public String getTermCons() {
return termCons;
}
public CRMCompleteOrderRequestDTO setTermCons(String termCons) {
this.termCons = termCons;
return this;
}
public String getRifOrd() {
return rifOrd;
}
public CRMCompleteOrderRequestDTO setRifOrd(String rifOrd) {
this.rifOrd = rifOrd;
return this;
}
public String getNote() {
return note;
}
public CRMCompleteOrderRequestDTO setNote(String note) {
this.note = note;
return this;
}
public String getCodVage2() {
return codVage2;
}
public CRMCompleteOrderRequestDTO setCodVage2(String codVage2) {
this.codVage2 = codVage2;
return this;
}
public String getFlagElaborato() {
return flagElaborato;
}
public CRMCompleteOrderRequestDTO setFlagElaborato(String flagElaborato) {
this.flagElaborato = flagElaborato;
return this;
}
public BigDecimal getAcconto() {
return acconto;
}
public CRMCompleteOrderRequestDTO setAcconto(BigDecimal acconto) {
this.acconto = acconto;
return this;
}
public String getActivityId() {
return activityId;
}
public CRMCompleteOrderRequestDTO setActivityId(String activityId) {
this.activityId = activityId;
return this;
}
public CRMClienteDTO getCliente() {
return cliente;
}
public CRMCompleteOrderRequestDTO setCliente(CRMClienteDTO cliente) {
this.cliente = cliente;
return this;
}
public CRMDestinazioneDTO getDestinazione() {
return destinazione;
}
public CRMCompleteOrderRequestDTO setDestinazione(CRMDestinazioneDTO destinazione) {
this.destinazione = destinazione;
return this;
}
public CRMCommessaDTO getCommessa() {
return commessa;
}
public CRMCompleteOrderRequestDTO setCommessa(CRMCommessaDTO commessa) {
this.commessa = commessa;
return this;
}
public CRMActivityDTO getActivity() {
return activity;
}
public CRMCompleteOrderRequestDTO setActivity(CRMActivityDTO activity) {
this.activity = activity;
return this;
}
public List<CRMPersRifDTO> getPersRif() {
return persRif;
}
public CRMCompleteOrderRequestDTO setPersRif(List<CRMPersRifDTO> persRif) {
this.persRif = persRif;
return this;
}
public List<CRMSpeseDTO> getSpese() {
return spese;
}
public CRMCompleteOrderRequestDTO setSpese(List<CRMSpeseDTO> spese) {
this.spese = spese;
return this;
}
}

28
ems-engine/src/main/java/it/integry/ems/order/crm/dto/completeOrder/CRMCompleteOrderResponseDTO.java Normal file
View File

@@ -0,0 +1,28 @@
package it.integry.ems.order.crm.dto.completeOrder;
import it.integry.ems_model.entity.JtbComt;
import it.integry.ems_model.entity.WdtbOrdt;
public class CRMCompleteOrderResponseDTO {
private JtbComt jtbComt;
private WdtbOrdt wdtbOrdt;
public JtbComt getJtbComt() {
return jtbComt;
}
public CRMCompleteOrderResponseDTO setJtbComt(JtbComt jtbComt) {
this.jtbComt = jtbComt;
return this;
}
public WdtbOrdt getWdtbOrdt() {
return wdtbOrdt;
}
public CRMCompleteOrderResponseDTO setWdtbOrdt(WdtbOrdt wdtbOrdt) {
this.wdtbOrdt = wdtbOrdt;
return this;
}
}

111
ems-engine/src/main/java/it/integry/ems/order/crm/dto/createContact/CRMCreateContactRequestDTO.java Normal file
View File

@@ -0,0 +1,111 @@
package it.integry.ems.order.crm.dto.createContact;
import it.integry.ems.order.crm.dto.*;
import java.util.List;
public class CRMCreateContactRequestDTO {
private String codJcom;
private String codAnag;
private String tipoAnag;
private String codVdes;
private String processActivityId;
private CRMClienteDTO cliente;
private CRMCommessaDTO commessa;
private CRMDestinazioneDTO destinazione;
private CRMActivityDTO activityRequest;
private List<CRMPersRifDTO> persRif;
public String getCodJcom() {
return codJcom;
}
public CRMCreateContactRequestDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CRMCreateContactRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getTipoAnag() {
return tipoAnag;
}
public CRMCreateContactRequestDTO setTipoAnag(String tipoAnag) {
this.tipoAnag = tipoAnag;
return this;
}
public String getCodVdes() {
return codVdes;
}
public CRMCreateContactRequestDTO setCodVdes(String codVdes) {
this.codVdes = codVdes;
return this;
}
public String getProcessActivityId() {
return processActivityId;
}
public CRMCreateContactRequestDTO setProcessActivityId(String processActivityId) {
this.processActivityId = processActivityId;
return this;
}
public CRMClienteDTO getCliente() {
return cliente;
}
public CRMCreateContactRequestDTO setCliente(CRMClienteDTO cliente) {
this.cliente = cliente;
return this;
}
public CRMCommessaDTO getCommessa() {
return commessa;
}
public CRMCreateContactRequestDTO setCommessa(CRMCommessaDTO commessa) {
this.commessa = commessa;
return this;
}
public CRMDestinazioneDTO getDestinazione() {
return destinazione;
}
public CRMCreateContactRequestDTO setDestinazione(CRMDestinazioneDTO destinazione) {
this.destinazione = destinazione;
return this;
}
public CRMActivityDTO getActivityRequest() {
return activityRequest;
}
public CRMCreateContactRequestDTO setActivityRequest(CRMActivityDTO activityRequest) {
this.activityRequest = activityRequest;
return this;
}
public List<CRMPersRifDTO> getPersRif() {
return persRif;
}
public CRMCreateContactRequestDTO setPersRif(List<CRMPersRifDTO> persRif) {
this.persRif = persRif;
return this;
}
}

28
ems-engine/src/main/java/it/integry/ems/order/crm/dto/createContact/CRMCreateContactResponseDTO.java Normal file
View File

@@ -0,0 +1,28 @@
package it.integry.ems.order.crm.dto.createContact;
import it.integry.ems_model.entity.JtbComt;
import it.integry.ems_model.entity.StbActivity;
public class CRMCreateContactResponseDTO {
private JtbComt jtbComt;
private StbActivity stbActivity;
public JtbComt getJtbComt() {
return jtbComt;
}
public CRMCreateContactResponseDTO setJtbComt(JtbComt jtbComt) {
this.jtbComt = jtbComt;
return this;
}
public StbActivity getStbActivity() {
return stbActivity;
}
public CRMCreateContactResponseDTO setStbActivity(StbActivity stbActivity) {
this.stbActivity = stbActivity;
return this;
}
}

25
ems-engine/src/main/java/it/integry/ems/order/crm/dto/transferProspect/CRMTransferProspectRequestDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package it.integry.ems.order.crm.dto.transferProspect;
public class CRMTransferProspectRequestDTO {
private String codAnag;
private String codPpro;
public String getCodAnag() {
return codAnag;
}
public CRMTransferProspectRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getCodPpro() {
return codPpro;
}
public CRMTransferProspectRequestDTO setCodPpro(String codPpro) {
this.codPpro = codPpro;
return this;
}
}

101
ems-engine/src/main/java/it/integry/ems/order/crm/dto/transferProspect/CRMTransferProspectResponseDTO.java Normal file
View File

@@ -0,0 +1,101 @@
package it.integry.ems.order.crm.dto.transferProspect;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.*;
import java.util.ArrayList;
import java.util.List;
public class CRMTransferProspectResponseDTO {
private GtbAnag gtbAnag;
private CtbAnag ctbAnag;
private List<WdtbOrdt> wdtbOrdts = new ArrayList<>();
private List<JtbComt> jtbComts = new ArrayList<>();
private List<PtbPros> ptbPros = new ArrayList<>();
private List<StbActivity> stbActivities = new ArrayList<>();
private List<PtbPrevt> ptbPrevts = new ArrayList<>();
public GtbAnag getGtbAnag() {
return gtbAnag;
}
public CRMTransferProspectResponseDTO setGtbAnag(GtbAnag gtbAnag) {
this.gtbAnag = gtbAnag;
return this;
}
public CtbAnag getCtbAnag() {
return ctbAnag;
}
public CRMTransferProspectResponseDTO setCtbAnag(CtbAnag ctbAnag) {
this.ctbAnag = ctbAnag;
return this;
}
public List<WdtbOrdt> getWdtbOrdts() {
return wdtbOrdts;
}
public CRMTransferProspectResponseDTO setWdtbOrdts(List<WdtbOrdt> wdtbOrdts) {
this.wdtbOrdts = wdtbOrdts;
return this;
}
public List<JtbComt> getJtbComts() {
return jtbComts;
}
public CRMTransferProspectResponseDTO setJtbComts(List<JtbComt> jtbComts) {
this.jtbComts = jtbComts;
return this;
}
public List<PtbPros> getPtbPros() {
return ptbPros;
}
public CRMTransferProspectResponseDTO setPtbPros(List<PtbPros> ptbPros) {
this.ptbPros = ptbPros;
return this;
}
public List<StbActivity> getStbActivities() {
return stbActivities;
}
public CRMTransferProspectResponseDTO setStbActivities(List<StbActivity> stbActivities) {
this.stbActivities = stbActivities;
return this;
}
public List<PtbPrevt> getPtbPrevts() {
return ptbPrevts;
}
public CRMTransferProspectResponseDTO setPtbPrevts(List<PtbPrevt> ptbPrevts) {
this.ptbPrevts = ptbPrevts;
return this;
}
public List<EntityBase> getEntityToProcess() {
List<EntityBase> entities = new ArrayList<>();
if (gtbAnag != null) {
entities.add(gtbAnag);
}
if (ctbAnag != null) {
entities.add(ctbAnag);
}
entities.addAll(wdtbOrdts);
entities.addAll(jtbComts);
entities.addAll(ptbPros);
entities.addAll(stbActivities);
entities.addAll(ptbPrevts);
return entities;
}
}

1789
ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
View File

File diff suppressed because it is too large Load Diff

587
ems-engine/src/main/java/it/integry/ems/order/crm/utility/CRMUtility.java Normal file
View File

@@ -0,0 +1,587 @@
package it.integry.ems.order.crm.utility;
import it.integry.ems.order.crm.dto.*;
import it.integry.ems.order.crm.dto.completeOrder.CRMCompleteOrderRequestDTO;
import it.integry.ems.order.crm.dto.transferProspect.CRMTransferProspectResponseDTO;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityString;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
public class CRMUtility {
public static <T> T buildEntityDest(String codAnag, String codVdes, CRMDestinazioneDTO crmDestinazione, Class<T> clazz) {
if (clazz.equals(VtbDest.class)) { // Cliente
return clazz.cast(buildVtbDest(codAnag, codVdes, crmDestinazione));
} else if (clazz.equals(PtbDest.class)) { // Prospect
return clazz.cast(buildPtbDest(codAnag, codVdes, crmDestinazione));
}
return null;
}
private static VtbDest buildVtbDest(String codAnag, String codVdes, CRMDestinazioneDTO crmDestinazione) {
VtbDest vtbDest = new VtbDest()
.setCodAnag(codAnag)
.setCodVdes(codVdes)
.setDestinatario(crmDestinazione.getRagSoc())
.setIndirizzo(crmDestinazione.getIndirizzo())
.setCap(crmDestinazione.getCap())
.setCitta(crmDestinazione.getCitta())
.setProv(crmDestinazione.getProv())
.setNazione(crmDestinazione.getNazione())
.setTel(crmDestinazione.getTelefono())
.seteMail(crmDestinazione.geteMail())
.setCodAliqIn(crmDestinazione.getCodAliqIn())
.setCodAliqOut(crmDestinazione.getCodAliqOut())
.setCodVzon(crmDestinazione.getCodVzon())
.setCodVdes(codVdes);
if (codVdes == null)
vtbDest.setOperation(OperationType.INSERT);
else
vtbDest.setOperation(OperationType.UPDATE);
return vtbDest;
}
private static PtbDest buildPtbDest(String codAnag, String codVdes, CRMDestinazioneDTO crmDestinazione) {
PtbDest ptbDest = new PtbDest()
.setCodPpro(codAnag)
.setRagSoc(crmDestinazione.getRagSoc())
.setIndirizzo(crmDestinazione.getIndirizzo())
.setCap(crmDestinazione.getCap())
.setCitta(crmDestinazione.getCitta())
.setProv(crmDestinazione.getProv())
.setNazione(crmDestinazione.getNazione())
.setTelefono(crmDestinazione.getTelefono())
.seteMail(crmDestinazione.geteMail())
.setCodAliqIn(crmDestinazione.getCodAliqIn())
.setCodAliqOut(crmDestinazione.getCodAliqOut())
.setCodVzon(crmDestinazione.getCodVzon())
.setCodPdes(codVdes);
if (codVdes == null)
ptbDest.setOperation(OperationType.INSERT);
else
ptbDest.setOperation(OperationType.UPDATE);
return ptbDest;
}
public static <T> List<T> buildEntityPersRif(Connection conn, String codAnag, List<CRMPersRifDTO> crmPersRifList, Class<T> clazz) throws Exception {
List<?> processedList = null;
if (clazz.equals(VtbCliePersRif.class)) { // Cliente
processedList = buildVtbCliePersRif(conn, codAnag, crmPersRifList);
} else if (clazz.equals(PtbProsRif.class)) { // Prospect
processedList = buildPtbProsRif(conn, codAnag, crmPersRifList);
}
if (processedList == null) return null;
List<T> listToReturn = new ArrayList<>();
for (Object item : processedList) {
listToReturn.add(clazz.cast(item));
}
return listToReturn;
}
private static List<VtbCliePersRif> buildVtbCliePersRif(Connection conn, String codAnag, List<CRMPersRifDTO> crmPersRifList) throws SQLException {
List<VtbCliePersRif> vtbCliePersRifList = new ArrayList<>();
List<Integer> idPersRifToDeleteList = getIdPersRifToDelete(conn, codAnag, crmPersRifList, false);
if (idPersRifToDeleteList != null && !idPersRifToDeleteList.isEmpty()) {
for (Integer idPersRifToDelete : idPersRifToDeleteList) {
VtbCliePersRif vtbCliePersRif = new VtbCliePersRif()
.setCodAnag(codAnag)
.setIdPersRif(idPersRifToDelete);
vtbCliePersRif.setOperation(OperationType.DELETE);
vtbCliePersRifList.add(vtbCliePersRif);
}
}
if (crmPersRifList != null) {
for (CRMPersRifDTO crmPersRif : crmPersRifList) {
VtbCliePersRif vtbCliePersRif = new VtbCliePersRif()
.setCodAnag(codAnag)
.setIdPersRif(crmPersRif.getIdPersRif())
.setPersonaRif(crmPersRif.getPersonaRif())
.setMansione(crmPersRif.getMansione())
.seteMail(crmPersRif.geteMail())
.setTelefono(crmPersRif.getTelefono())
.setNumCellulare(crmPersRif.getNumCellulare());
vtbCliePersRif.setOperation(OperationType.INSERT_OR_UPDATE);
vtbCliePersRifList.add(vtbCliePersRif);
}
}
return vtbCliePersRifList;
}
private static List<PtbProsRif> buildPtbProsRif(Connection conn, String codAnag, List<CRMPersRifDTO> crmPersRifList) throws SQLException {
List<PtbProsRif> ptbProsRifList = new ArrayList<>();
List<Integer> idPersRifToDeleteList = getIdPersRifToDelete(conn, codAnag, crmPersRifList, true);
if (idPersRifToDeleteList != null && !idPersRifToDeleteList.isEmpty()) {
for (Integer idPersRifToDelete : idPersRifToDeleteList) {
PtbProsRif ptbProsRif = new PtbProsRif()
.setCodPpro(codAnag)
.setIdPersRif(idPersRifToDelete);
ptbProsRif.setOperation(OperationType.DELETE);
ptbProsRifList.add(ptbProsRif);
}
}
if (crmPersRifList != null) {
for (CRMPersRifDTO crmPersRif : crmPersRifList) {
PtbProsRif ptbProsRif = new PtbProsRif()
.setCodPpro(codAnag)
.setIdPersRif(crmPersRif.getIdPersRif())
.setPersonaRif(crmPersRif.getPersonaRif())
.setMansione(crmPersRif.getMansione())
.seteMail(crmPersRif.geteMail())
.setTelefono(crmPersRif.getTelefono())
.setNumCellulare(crmPersRif.getNumCellulare());
ptbProsRif.setOperation(OperationType.INSERT_OR_UPDATE);
ptbProsRifList.add(ptbProsRif);
}
}
return ptbProsRifList;
}
private static List<Integer> getIdPersRifToDelete(Connection conn, String codAnag, List<CRMPersRifDTO> crmPersRifList, boolean isProspect) throws SQLException {
List<Integer> idPersRifList = crmPersRifList == null ? new ArrayList<>() :
crmPersRifList.stream()
.map(CRMPersRifDTO::getIdPersRif)
.filter(Objects::nonNull)
.collect(Collectors.toList());
String table = "vtb_clie_pers_rif";
String columnName = "cod_anag";
if (isProspect ){
table = "ptb_pros_rif";
columnName = "cod_ppro";
}
String sql = Query.format(
"SELECT id_pers_rif\n" +
"FROM " + table + "\n" +
"WHERE " +columnName +" = %s ",
codAnag
);
if (!idPersRifList.isEmpty()) {
sql += " AND id_pers_rif NOT IN ( " + UtilityDB.listValueToString(idPersRifList) + " )";
}
return UtilityDB.executeSimpleQueryOnlyFirstColumn(conn, sql);
}
public static String getCodVageFromCodJflav(Connection conn, String codJflav) throws Exception {
String sql = Query.format(
"SELECT vtb_agen.cod_vage\n" +
"FROM wtb_users\n" +
" INNER JOIN stb_user ON wtb_users.User_name = stb_user.user_name\n" +
" INNER JOIN jrl_flav_users ON stb_user.user_name = jrl_flav_users.user_name\n" +
" INNER JOIN vtb_agen ON wtb_users.user_code = vtb_agen.cod_vage\n" +
"WHERE jrl_flav_users.cod_jflav = %s",
codJflav
);
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
}
public static StbActivity buildStbActivity(CRMActivityDTO activityRequest) {
return new StbActivity()
.setTipoAnag(activityRequest.getTipoAnag())
.setCodAnag(activityRequest.getCodAnag())
.setCodJcom(activityRequest.getCodJcom())
.setActivityTypeId(activityRequest.getActivityTypeId())
.setActivityDescription(activityRequest.getActivityDescription())
.setActivityResultId(activityRequest.getActivityResultId())
.setNote(activityRequest.getNote())
.setFlagTipologia(activityRequest.getFlagTipologia())
.setUserName(activityRequest.getUserName())
.setUserCreator(activityRequest.getUserCreator())
.setUserModifier(activityRequest.getUserModifier())
.setOraViewAct(activityRequest.getOraViewAct())
.setEstimatedDate(activityRequest.getEstimatedTime())
.setEstimatedTime(activityRequest.getEstimatedTime())
.setEstimatedEnddate(activityRequest.getEstimatedEndtime())
.setEstimatedEndtime(activityRequest.getEstimatedEndtime())
.setEffectiveDate(activityRequest.getEffectiveTime())
.setEffectiveTime(activityRequest.getEffectiveTime())
.setEffectiveEnddate(activityRequest.getEffectiveEndtime())
.setEffectiveEndtime(activityRequest.getEffectiveEndtime());
}
public static <T> T buildEntityCustomer(String codAnag, CRMClienteDTO cliente, Class<T> clazz) {
if (clazz.equals(GtbAnag.class)) { // Cliente
return clazz.cast(buildGtbAnag(codAnag, cliente));
} else if (clazz.equals(PtbPros.class)) { // Prospect
return clazz.cast(buildPtbPros(codAnag, cliente));
}
return null;
}
private static GtbAnag buildGtbAnag(String codAnag, CRMClienteDTO cliente) {
return new GtbAnag()
.setCodAnag(codAnag)
.setRagSoc(cliente.getRagSoc())
.setRagSoc2(cliente.getRagSoc2())
.setIndirizzo(cliente.getIndirizzo())
.setCap(cliente.getCap())
.setCitta(cliente.getCitta())
.setProv(cliente.getProv())
.setNazione(cliente.getNazione())
.setTelefono(cliente.getTelefono())
.setPartIva(cliente.getPartIva())
.setCodFisc(cliente.getCodFisc())
.seteMail(cliente.geteMail())
.seteMailPec(cliente.geteMailPec())
.setCuuPa(cliente.getCuuPa())
.setFlagInformativa(cliente.getFlagInformativa())
.setFlagConsenso(cliente.getFlagConsenso());
}
private static PtbPros buildPtbPros(String codAnag, CRMClienteDTO cliente) {
return new PtbPros()
.setCodPpro(codAnag)
.setCodVtip(cliente.getCodVtip())
.setCodVlis(cliente.getCodVlis())
.setRagSoc(cliente.getRagSoc())
.setRagSoc2(cliente.getRagSoc2())
.setIndirizzo(cliente.getIndirizzo())
.setCap(cliente.getCap())
.setCitta(cliente.getCitta())
.setProv(cliente.getProv())
.setNazione(cliente.getNazione())
.setTelefono(cliente.getTelefono())
.setPartIva(cliente.getPartIva())
.setCodFisc(cliente.getCodFisc())
.seteMail(cliente.geteMail())
.seteMailPec(cliente.geteMailPec())
.setCuuPa(cliente.getCuuPa())
.setFlagInformativa(cliente.getFlagInformativa())
.setFlagConsenso(cliente.getFlagConsenso());
}
public static WdtbOrdt buildWdtbOrdt(CRMCompleteOrderRequestDTO order) {
return new WdtbOrdt()
.setGestione(order.getGestione())
.setDataOrd(order.getDataOrd())
.setNumOrd(order.getNumOrd())
.setSerie(order.getSerie())
.setCodJcom(order.getCodJcom())
.setTipoAnag(order.getTipoAnag())
.setCodAnag(order.getCodAnag())
.setCodVdes(order.getCodVdes())
.setCodPaga(order.getCodPaga())
.setDescrizionePaga(order.getDescrizionePaga())
.setTermCons(order.getTermCons())
.setRifOrd(order.getRifOrd())
.setNote(order.getNote())
.setCodVage2(order.getCodVage2())
.setMezzo(order.getMezzo())
.setFlagElaborato(order.getFlagElaborato())
.setAcconto(order.getAcconto())
.setActivityId(order.getActivityId());
}
public static CRMTransferProspectResponseDTO prospectToClie(Connection conn, String codAnag, String codPpro) throws Exception {
if (UtilityString.isNullOrEmpty(codAnag))
throw new Exception("Codice cliente da generare obbligatorio");
if (UtilityString.isNullOrEmpty(codPpro))
throw new Exception("Codice prospect da trasferire in anagrafica obbligatorio");
CRMTransferProspectResponseDTO response = new CRMTransferProspectResponseDTO();
//Verifica esistenza prospect
String sql = Query.format(
"SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM ptb_pros\n" +
"WHERE cod_ppro = %s",
codPpro
);
boolean existingCodPpro = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (!existingCodPpro)
throw new Exception("Codice prospect inesistente (" + codPpro + ")");
//Verifica esisteza cliente
sql = Query.format(
"SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM gtb_anag\n" +
"WHERE cod_anag = %s",
codAnag
);
boolean existingCodAnag = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (existingCodAnag)
throw new Exception("Codice cliente già esistente (" + codAnag + ")");
//Verifica esistenza cliente trasformato in prospect
sql = Query.format(
"SELECT cod_anag\n" +
"FROM ptb_pros\n" +
"WHERE cod_ppro = %s\n" +
" AND cod_anag IS NOT NULL",
codPpro
);
String codAnagInPtbPros = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (!UtilityString.isNullOrEmpty(codAnagInPtbPros))
throw new Exception("Codice prospect già trasferito in anagrafica (Codice cliente: " + codAnagInPtbPros + ")");
//Acquisizione dati anagrafici
sql = Query.format(
"SELECT %s AS cod_anag,\n" +
" ptb_pros.rag_soc,\n" +
" ptb_pros.indirizzo,\n" +
" ptb_pros.cap,\n" +
" ptb_pros.citta,\n" +
" ptb_pros.prov,\n" +
" ptb_pros.nazione,\n" +
" ptb_pros.telefono,\n" +
" ptb_pros.fax,\n" +
" ptb_pros.part_iva,\n" +
" ptb_pros.cod_fisc,\n" +
" ptb_pros.note,\n" +
" ptb_pros.e_mail,\n" +
" ptb_pros.rag_soc2,\n" +
" ptb_pros.persona_rif,\n" +
" 'S' AS allegato,\n" +
" 'G' AS flag_persona_fg,\n" +
" 0 AS classe_merito\n" +
"FROM ptb_pros\n" +
"WHERE cod_ppro = %s",
codAnag, codPpro
);
GtbAnag gtbAnag = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(conn, sql, GtbAnag.class);
gtbAnag.setOperation(OperationType.INSERT);
CtbAnag ctbAnag = new CtbAnag()
.setCodCcon(getCodCcon(conn));
ctbAnag.setOperation(OperationType.INSERT);
gtbAnag.setCtbAnag(ctbAnag);
//Acquisizione dati anagrafici cliente
sql = Query.format(
"SELECT ptb_pros.cod_vtip,\n" +
" ptb_pros.cod_vzon,\n" +
" ptb_pros.cod_vage,\n" +
" ptb_pros.gg_chiusura,\n" +
" ptb_pros.cod_banc,\n" +
" ptb_pros.agenzia_banca,\n" +
" ptb_pros.cod_abi,\n" +
" ptb_pros.cod_cab,\n" +
" ptb_pros.cod_paga,\n" +
" ptb_pros.cod_vlis,\n" +
" ISNULL(ptb_pros.sconto1, 0),\n" +
" ISNULL(ptb_pros.sconto2, 0),\n" +
" ptb_pros.cod_aliq,\n" +
" 0 AS fido,\n" +
" 'S' AS flag_spese,\n" +
" 0 AS perc_prov,\n" +
" 'A' AS flag_stato,\n" +
" 'GIORNALIERA' AS period_fat,\n" +
" 'SINGOLA BOLLA' AS tipo_fat_dif,\n" +
" ptb_pros.fonte,\n" +
" ptb_pros.cod_vseg,\n" +
" ptb_pros.cod_vset,\n" +
" ptb_pros.cod_vatt\n" +
"FROM ptb_pros\n" +
"WHERE cod_ppro = %s",
codPpro
);
VtbClie vtbClie = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(conn, sql, VtbClie.class);
vtbClie.setOperation(OperationType.INSERT);
gtbAnag.setVtbClie(vtbClie);
//Acquisizione dati anagrafici destinatario
sql = Query.format(
"SELECT ptb_dest.cod_pdes AS cod_vdes,\n" +
" ptb_dest.rag_soc AS destinatario,\n" +
" ptb_dest.indirizzo,\n" +
" ptb_dest.cap,\n" +
" ptb_dest.citta,\n" +
" ptb_dest.prov,\n" +
" ptb_dest.nazione,\n" +
" ptb_dest.telefono AS tel,\n" +
" ptb_dest.fax,\n" +
" ptb_dest.note,\n" +
" ptb_dest.cod_vzon,\n" +
" ptb_dest.cod_vlis,\n" +
" ptb_dest.cod_vage,\n" +
" ptb_dest.cod_aliq_in,\n" +
" ptb_dest.cod_aliq_out,\n" +
" ptb_dest.e_mail\n" +
"FROM ptb_dest\n" +
"WHERE ptb_dest.cod_ppro = %s",
codPpro
);
List<VtbDest> vtbDests = UtilityDB.executeSimpleQueryDTO(conn, sql, VtbDest.class);
if (vtbDests != null && !vtbDests.isEmpty()) {
vtbDests.forEach(x -> x.setOperation(OperationType.INSERT));
gtbAnag.setVtbDest(vtbDests);
}
//Acquisizione dati prospect persone di riferimento
sql = Query.format(
"SELECT ptb_pros_rif.persona_rif,\n" +
" ptb_pros_rif.mansione,\n" +
" ptb_pros_rif.telefono,\n" +
" ptb_pros_rif.fax,\n" +
" ptb_pros_rif.e_mail,\n" +
" ptb_pros_rif.num_cellulare\n" +
"FROM ptb_pros_rif\n" +
"WHERE cod_ppro = %s",
codPpro
);
List<VtbCliePersRif> persRif = UtilityDB.executeSimpleQueryDTO(conn, sql, VtbCliePersRif.class);
if (persRif != null) {
persRif.forEach(x -> x.setOperation(OperationType.INSERT));
gtbAnag.setVtbCliePersRif(persRif);
}
//Assegnazione nuovo cliente a eventuali offerte
sql = Query.format(
"SELECT *\n" +
"FROM ptb_prevt\n" +
"WHERE cod_ppro = %s",
codPpro
);
List<PtbPrevt> ptbPrevtToUpdate = UtilityDB.executeSimpleQueryDTO(conn, sql, PtbPrevt.class);
if (ptbPrevtToUpdate != null && !ptbPrevtToUpdate.isEmpty()) {
ptbPrevtToUpdate.forEach(x -> {
x.setCodPpro(codAnag);
x.setOperation(OperationType.UPDATE);
});
response.getPtbPrevts().addAll(ptbPrevtToUpdate);
}
//Assegnazione Nuovo Codice Cliente alle attività
sql = Query.format(
"SELECT *\n" +
"FROM stb_activity\n" +
"WHERE cod_anag = %s",
codPpro
);
List<StbActivity> stbActivityToUpdate = UtilityDB.executeSimpleQueryDTO(conn, sql, StbActivity.class);
if (stbActivityToUpdate != null && !stbActivityToUpdate.isEmpty()) {
stbActivityToUpdate.forEach(x -> {
x.setCodAnag(codAnag);
x.setTipoAnag("C");
x.setOperation(OperationType.UPDATE);
});
response.getStbActivities().addAll(stbActivityToUpdate);
}
//Assegnazione codice anagrafico al prospect
sql = Query.format(
"SELECT *\n" +
"FROM ptb_pros\n" +
"WHERE cod_ppro = %s",
codPpro
);
List<PtbPros> ptbProsToUpdate = UtilityDB.executeSimpleQueryDTO(conn, sql, PtbPros.class);
if (ptbProsToUpdate != null && !ptbProsToUpdate.isEmpty()) {
ptbProsToUpdate.forEach(x -> {
x.setCodAnag(codAnag);
x.setOperation(OperationType.UPDATE);
});
response.getPtbPros().addAll(ptbProsToUpdate);
}
//Assegnazione codice anagrafico alla commessa
sql = Query.format(
"SELECT *\n" +
"FROM jtb_comt\n" +
"WHERE cod_anag = %s",
codPpro
);
List<JtbComt> jtbComtToUpdate = UtilityDB.executeSimpleQueryDTO(conn, sql, JtbComt.class);
if (jtbComtToUpdate != null && !jtbComtToUpdate.isEmpty()) {
jtbComtToUpdate.forEach(x -> {
x.setCodAnag(codAnag);
x.setTipoAnag("C");
x.setOperation(OperationType.UPDATE);
});
response.getJtbComts().addAll(jtbComtToUpdate);
}
//Assegnazione codice anagrafico agli ordini web
sql = Query.format(
"SELECT *\n" +
"FROM wdtb_ordt\n" +
"WHERE cod_anag = %s",
codPpro
);
List<WdtbOrdt> wdtbOrdtToUpdate = UtilityDB.executeSimpleQueryDTO(conn, sql, WdtbOrdt.class);
if (wdtbOrdtToUpdate != null && !wdtbOrdtToUpdate.isEmpty()) {
wdtbOrdtToUpdate.forEach(x -> {
x.setCodAnag(codAnag);
x.setTipoAnag("C");
x.setOperation(OperationType.UPDATE);
});
response.getWdtbOrdts().addAll(wdtbOrdtToUpdate);
}
response.setGtbAnag(gtbAnag);
return response;
}
private static String getCodCcon(Connection conn) throws Exception {
String codCcon;
String sql = "SELECT value\n" +
"FROM stb_gest_setup\n" +
"WHERE gest_name = 'CRM'\n" +
" AND section = 'COD_CCON'\n" +
" AND key_section = 'PREFISSO_I'";
codCcon = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (UtilityString.isNullOrEmpty(codCcon)) {
sql = "SELECT value\n" +
"FROM stb_gest_setup\n" +
"WHERE gest_name = 'CRM'\n" +
" AND section = 'COD_CCON'\n" +
" AND key_section = 'DEFAULT'";
codCcon = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
}
if (UtilityString.isNullOrEmpty(codCcon)) {
sql = "SELECT cod_ccon\n" +
"FROM ctb_cont\n" +
"WHERE tipo_riep = 'CREDITI V/CLIENTI'\n" +
"ORDER BY cod_ccon";
codCcon = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
}
if (UtilityString.isNullOrEmpty(codCcon))
throw new Exception("Codice conto CREDITI V/CLIENTI non trovato");
return codCcon;
}
}

37
ems-engine/src/main/java/it/integry/ems/product/importaz/dto/ListinoApuliaCarrefourDTO.java
View File

@@ -3,6 +3,7 @@ package it.integry.ems.product.importaz.dto;
import it.integry.ems_model.annotation.SqlField;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
public class ListinoApuliaCarrefourDTO {
@@ -25,10 +26,10 @@ public class ListinoApuliaCarrefourDTO {
private Integer countArtFor;
@SqlField(value = "data_iniz")
private Date dataIniz;
private LocalDate dataIniz;
@SqlField(value = "data_iniz_lisa")
private Date dataInizLisa;
private LocalDate dataInizLisa;
@SqlField(value = "descrizione")
private String descrizione;
@@ -60,6 +61,12 @@ public class ListinoApuliaCarrefourDTO {
@SqlField(value = "val_promo")
private BigDecimal valPromo;
@SqlField(value = "rag_soc_prod")
private String ragSocProd;
@SqlField(value = "part_iva_prod")
private String partIvaProd;
public String getBarcode() {
return barcode;
}
@@ -114,20 +121,20 @@ public class ListinoApuliaCarrefourDTO {
return this;
}
public Date getDataIniz() {
public LocalDate getDataIniz() {
return dataIniz;
}
public ListinoApuliaCarrefourDTO setDataIniz(Date dataIniz) {
public ListinoApuliaCarrefourDTO setDataIniz(LocalDate dataIniz) {
this.dataIniz = dataIniz;
return this;
}
public Date getDataInizLisa() {
public LocalDate getDataInizLisa() {
return dataInizLisa;
}
public ListinoApuliaCarrefourDTO setDataInizLisa(Date dataInizLisa) {
public ListinoApuliaCarrefourDTO setDataInizLisa(LocalDate dataInizLisa) {
this.dataInizLisa = dataInizLisa;
return this;
}
@@ -221,4 +228,22 @@ public class ListinoApuliaCarrefourDTO {
this.valPromo = valPromo;
return this;
}
public String getRagSocProd() {
return ragSocProd;
}
public ListinoApuliaCarrefourDTO setRagSocProd(String ragSocProd) {
this.ragSocProd = ragSocProd;
return this;
}
public String getPartIvaProd() {
return partIvaProd;
}
public ListinoApuliaCarrefourDTO setPartIvaProd(String partIvaProd) {
this.partIvaProd = partIvaProd;
return this;
}
}

23
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportAnagListiniService.java
View File

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@Service
@@ -222,8 +223,8 @@ public class ImportAnagListiniService {
else {
atbListData = new AtbListData()
.setCodAlis(data.getCodAlis())
.setDataIniz(data.getDataIniz())
.setDataIns(new Date())
.setDataIniz(UtilityLocalDate.localDateFromDate(data.getDataIniz()))
.setDataIns(UtilityLocalDate.getNowTime())
.setInseritoDa(userName)
.setNote(data.getNoteListino())
.setMtbLisaData(new ArrayList<>());
@@ -449,14 +450,14 @@ public class ImportAnagListiniService {
public List<EntityBase> importAnagListinoAcq(List<EntityBase> entityList, String tipoImportListino, String codAlisParm, String dataValiditaStr,
Boolean confrontaPrezzi, Boolean singleTransaction) throws Exception {
String tableName = null, codAlis = null, codAlisOld = null;
Date dataInizLisa = null, dataInizLisaOld = null;
LocalDate dataInizLisa = null, dataInizLisaOld = null;
Boolean existLisa = false;
AtbListData atbListData = null;
AtbList atbList = null;
Date dataValidita = null;
if (dataValiditaStr != null && !("".equals(dataValiditaStr))) {
dataValidita = UtilityString.parseDate(dataValiditaStr);
LocalDate dataValidita = null;
if (!UtilityString.isNullOrEmpty(dataValiditaStr)) {
dataValidita = UtilityString.parseLocalDate(dataValiditaStr);
}
List<MtbLisaData> listMtbLisaData = null;
@@ -490,10 +491,10 @@ public class ImportAnagListiniService {
dataInizLisa = ((MtbLisaData) entityList.get(0)).getDataIniz();
Integer versione = ((MtbLisaData) entityList.get(0)).getVersione();
String inseritoDa = ((MtbLisaData) entityList.get(0)).getInseritoDa();
Date dataFineLisa = ((MtbLisaData) entityList.get(0)).getDataFine();
LocalDate dataFineLisa = ((MtbLisaData) entityList.get(0)).getDataFine();
String flagTipoPromo = ((MtbLisaData) entityList.get(0)).getFlagTipoPromo();
if (dataInizLisa != null && dataInizLisa.equals(EmsRestConstants.DATE_NULL)) {
if (dataInizLisa != null && dataInizLisa.equals(EmsRestConstants.LOCAL_DATE_NULL)) {
dataInizLisa = null;
}
if (!(codAlis.equals(codAlisOld) && !UtilityString.isNullOrEmpty(dataInizLisa) && dataInizLisa.equals(dataInizLisaOld))) {
@@ -564,7 +565,7 @@ public class ImportAnagListiniService {
String sql =
"SELECT Cast(case when count(*)>0 THEN 0 ELSE 1 END as bit) " +
" FROM dbo.getListinoAcquisto( "
+ UtilityDB.valueDateToString(((MtbLisaData) entityList.get(0)).getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getDataIniz()) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodAlis()) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodArtFor()) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodMart()) + " , "
@@ -666,7 +667,7 @@ public class ImportAnagListiniService {
}
private List<MtbLisaData> getDiffLisa(Connection conn, String codAlisParm, String tableName, Date dataValidita) throws Exception {
private List<MtbLisaData> getDiffLisa(Connection conn, String codAlisParm, String tableName, LocalDate dataValidita) throws Exception {
//query per estrarre differenze
String queryLisa =
"SELECT IsNull(lisaNew.cod_alis,mtb_lisa.cod_alis) as cod_alis, " +
@@ -704,7 +705,7 @@ public class ImportAnagListiniService {
" IsNull(lisaNew.note,mtb_lisa.note) as note," +
" IsNull(lisaNew.colli_strato,mtb_lisa.colli_strato) as colli_strato " +
" FROM " + tableName + " lisaNew " +
" full outer join dbo.getListinoAcquisto(" + UtilityDB.valueDateToString(dataValidita, CommonConstants.DATE_FORMAT_YMD) + ", " + UtilityDB.valueToString(codAlisParm) + ", null, null, 'N', null) mtb_lisa on lisaNew.cod_alis = mtb_lisa.cod_alis and lisaNew.cod_art_for = mtb_lisa.cod_art_for" +
" full outer join dbo.getListinoAcquisto(" + UtilityDB.valueToString(dataValidita) + ", " + UtilityDB.valueToString(codAlisParm) + ", null, null, 'N', null) mtb_lisa on lisaNew.cod_alis = mtb_lisa.cod_alis and lisaNew.cod_art_for = mtb_lisa.cod_art_for" +
" WHERE ( IsNull(mtb_lisa.tipo_variazione, 'I') <> 'D' OR " +
" (IsNull(mtb_lisa.tipo_variazione, 'I') = 'D' AND IsNull(lisaNew.tipo_variazione, 'D') <> 'D' )) AND " +
" ((IsNull(lisaNew.cod_mart,0) <> IsNull(mtb_lisa.cod_mart,0)) or " +

35
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java
View File

@@ -15,17 +15,16 @@ import it.integry.ems_model.entity.AtbListData;
import it.integry.ems_model.entity.MtbLisaData;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityString;
import it.integry.ems_model.utility.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@Service
@@ -123,24 +122,24 @@ public class ImportApuliaPromoService {
}
Date dataIniz = promozione.getDataIniz();
Date dataFine = promozione.getDataFine();
LocalDate dataIniz = promozione.getDataIniz();
LocalDate dataFine = promozione.getDataFine();
for (MtbLisaData lisa : mtbLisaData) {
//Verifichiamo se esiste una promozione contemporanea nel file
Date finalDataIniz = dataIniz;
LocalDate finalDataIniz = dataIniz;
String finalCodAlis = codAlis;
Optional<MtbLisaData> first = mtbLisaDataList.stream()
.filter(x ->
x.getCodArtFor().equalsIgnoreCase(lisa.getCodArtFor()) &&
x.getCodAlis().equalsIgnoreCase(finalCodAlis) &&
x.getDataIniz().before(finalDataIniz) &&
x.getDataFine().after(finalDataIniz))
x.getDataIniz().isBefore(finalDataIniz) &&
x.getDataFine().isAfter(finalDataIniz))
.findFirst();
if (first.isPresent()) {
dataIniz = first.get().getDataFine();
dataIniz = UtilityDate.dateAdd(dataIniz, 1);
dataIniz = dataIniz.plusDays(1);
} else {
sql =
Query.format(
@@ -156,10 +155,10 @@ public class ImportApuliaPromoService {
lisa.getCodArtFor(),
dataIniz);
Date dataFinePromo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
if (dataFinePromo != null && dataFinePromo.getTime() != dataFine.getTime()) {
LocalDate dataFinePromo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
if (dataFinePromo != null && dataFinePromo.equals(dataFine)) {
dataIniz = dataFinePromo;
dataIniz = UtilityDate.dateAdd(dataIniz, 1);
dataIniz = dataIniz.plusDays( 1);
}
}
@@ -209,7 +208,7 @@ public class ImportApuliaPromoService {
}
public static class PromoDto {
public static final SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
public static final String format = "yyyyMMdd";
@JsonProperty("NUMERO OFFERTA CE.DI.")
private String numOffCedi;
@@ -263,16 +262,16 @@ public class ImportApuliaPromoService {
return dataIniz;
}
public Date getDataIniz() throws ParseException {
return format.parse(dataIniz);
public LocalDate getDataIniz() throws Exception {
return UtilityString.parseLocalDate(dataIniz);
}
public String getDataFineString() {
return dataFine;
}
public Date getDataFine() throws ParseException {
return format.parse(dataFine);
public LocalDate getDataFine() throws Exception {
return UtilityString.parseLocalDate(dataFine);
}
public String getCodArtCedi() {

19
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportImeService.java
View File

@@ -14,6 +14,7 @@ import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -28,6 +29,7 @@ import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -115,9 +117,7 @@ public class ImportImeService {
dsMexal2Wingest.initialize(profileSourceMexal2Wingest);
Connection connMexal2Wingest = dsMexal2Wingest.getConnection();
String dataIniz = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(new Date());
// String dataInizPromo = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(new Date());
// String dataFinePromo = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(UtilityDate.RelativeDateTime(new Date(), 365));
LocalDate dataIniz = null;
String dataInizLisv = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(new Date());
sql = "SELECT max(data_iniz) as data_iniz FROM vtb_list_data WHERE cod_vlis = " + UtilityDB.valueToString(codVlis);
@@ -207,21 +207,18 @@ public class ImportImeService {
atbListData = new AtbListData();
}*/
}
dataIniz = "";
// dataInizPromo = "";
// dataFinePromo = "";
sql = "SELECT max(data_iniz) as data_iniz, versione FROM atb_list_data WHERE cod_alis = " + UtilityDB.valueToString(codAlis) + " AND cod_promo IS NULL GROUP BY versione ";
infoInternal = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
resInternal = infoInternal.executeQuery();
while (resInternal.next()) {
dataIniz = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(resInternal.getDate("data_iniz"));
dataIniz = UtilityLocalDate.localDateFromDate(resInternal.getDate("data_iniz"));
versione = resInternal.getInt("versione");
}
resInternal.close();
infoInternal.close();
if (dataIniz.compareTo("") == 0) {
dataIniz = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(new Date());
if (dataIniz == null) {
dataIniz = UtilityLocalDate.getNow();
}
/* sql = "SELECT max(data_iniz) as data_iniz, data_fine, versione FROM atb_list_data WHERE cod_alis = "+UtilityDB.valueToString(codAlis) +" AND cod_promo IS NOT NULL GROUP BY versione, data_fine ";
@@ -484,7 +481,7 @@ public class ImportImeService {
if (prezzo.compareTo(BigDecimal.ZERO) != 0) {
mtblisaData = new MtbLisaData();
mtblisaData.setOperation(OperationType.INSERT_OR_UPDATE);
mtblisaData.setDataIniz(UtilityDate.StringToDate(dataIniz, CommonConstants.DATE_FORMAT_YMD));
mtblisaData.setDataIniz(dataIniz);
mtblisaData.setVersione(versione);
mtblisaData.setCodAlis(codAlis);
mtblisaData.setCodMart(codMart);
@@ -538,7 +535,7 @@ public class ImportImeService {
mtblisaData = new MtbLisaData();
mtblisaData.setOperation(OperationType.INSERT_OR_UPDATE);
mtblisaData.setCodMart(codMart);
mtblisaData.setDataIniz(UtilityDate.StringToDate(dataIniz, CommonConstants.DATE_FORMAT_YMD));
mtblisaData.setDataIniz(dataIniz);
mtblisaData.setVersione(versione);
mtblisaData.setCodAlis(codAlis);
mtblisaData.setCodArtFor(codArtForn);

65
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java
View File

@@ -31,6 +31,8 @@ import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -104,11 +106,11 @@ public class ImportListiniAcquistoApuliaCarrefourService {
boolean importVarFuture = setup.get("IMPORT_VAR_FUTURE").equalsIgnoreCase("S");
List<ListinoApuliaCarrefourDTO> variazioniListini = getVariazioni(type, format, setup, dataImport, dataInizVarizioni, conn, importVarFuture);
Date dataOraImport = new Date();
LocalDateTime dataOraImport = UtilityLocalDate.getNowTime();
List<MtbLisaData> righeListino =
variazioniListini.parallelStream()
.filter(x -> x.getCountArtFor().intValue() == 1 &&
(x.getDataInizLisa() == null || UtilityDate.DaysAfter(x.getDataInizLisa(), x.getDataIniz()) >= 0))
(x.getDataInizLisa() == null || UtilityLocalDate.daysAfterDate(x.getDataInizLisa(), x.getDataIniz()) >= 0))
.map(
x -> {
MtbLisaData mtbLisaData = new MtbLisaData()
@@ -133,47 +135,14 @@ public class ImportListiniAcquistoApuliaCarrefourService {
.setPerc3(BigDecimal.ZERO)
.setPerc4(BigDecimal.ZERO)
.setPercOneri(UtilityBigDecimal.isNull(x.getPercOneri(), BigDecimal.ZERO))
.setValOneri(BigDecimal.ZERO);
.setValOneri(BigDecimal.ZERO)
.setRagSocProd(x.getRagSocProd())
.setPartIvaProd(x.getPartIvaProd());
mtbLisaData.setOperation(OperationType.INSERT);
return mtbLisaData;
}
).collect(Collectors.toList());
// List<String> listCond =
// righeListino.parallelStream()
// .filter(x -> x.getQtaCnf() != null)
// .map(lisa -> {
// String whereCond =
// "mtb_lisa.cod_art_for = " + UtilityDB.valueToString(lisa.getCodArtFor()) + " AND " +
// "mtb_lisa.cod_alis = " + UtilityDB.valueToString(lisa.getCodAlis());
// return whereCond;
// }).collect(Collectors.toList());
//
// if (listCond != null && !listCond.isEmpty()) {
// sql =
// "SELECT mtb_lisa.cod_art_for, mtb_lisa.rap_conv\n" +
// "FROM mtb_lisa\n" +
// " INNER JOIN mtb_aart ON mtb_lisa.cod_mart = mtb_aart.cod_mart AND mtb_lisa.rap_conv <> 1 ";
// String whereCond = StringUtils.join(listCond, ") OR (");
//
// sql = UtilityDB.addwhereCond(sql, "(" + whereCond + ")", false);
// List<HashMap<String, Object>> datiLisa = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), sql);
// for (HashMap<String, Object> l : datiLisa) {
// String codArtForDb = UtilityHashMap.getValueIfExists(l, "cod_art_for");
// BigDecimal rapConvDb = UtilityHashMap.getValueIfExists(l, "rap_conv");
// List<MtbLisaData> list = Stream.of(righeListino)
// .filter(x -> x.getCodArtFor().equalsIgnoreCase(codArtForDb) &&
// x.getQtaCnf() != null
// ).toList();
// for (MtbLisaData e : list) {
// righeListino.remove(e);
// BigDecimal qtaCnf = e.getQtaCnf().multiply(rapConvDb);
// e.setQtaCnf(qtaCnf);
// righeListino.add(e);
// }
// }
// }
//salvataggio testate listini
if (atbList != null)
UtilityEntity.throwEntitiesException(entityProcessor.processEntityList(atbList, multiDBTransactionManager, false));
@@ -197,7 +166,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
for (Map.Entry<AtbListData, List<MtbLisaData>> listino : listini) {
AtbListData atbListData = listino.getKey();
if (UtilityLocalDate.isAfterToday(UtilityLocalDate.localDateFromDate(atbListData.getDataIniz()))) {
if (UtilityLocalDate.isAfterToday(atbListData.getDataIniz())) {
atbListData.setOperation(OperationType.INSERT_OR_UPDATE);
listino.getValue().stream().forEach(x -> x.setOperation(OperationType.INSERT_OR_UPDATE));
}
@@ -274,7 +243,9 @@ public class ImportListiniAcquistoApuliaCarrefourService {
" apulia.cod_aliq,\n" +
" apulia.prz_base_prop,\n" +
" apulia.perc_premio AS prec_promo,\n" +
" ISNULL(apulia.val_premio, 0) AS val_promo\n" +
" ISNULL(apulia.val_premio, 0) AS val_promo,\n" +
" ISNULL(apulia.rag_soc_forn, lisa.rag_soc_prod) as rag_soc_prod, \n" +
" ISNULL(apulia.partita_iva_forn, lisa.part_iva_prod) as part_iva_prod \n" +
"FROM (SELECT DISTINCT mtb_lisa_apulia_succ.cod_alis,\n" +
" mtb_lisa_apulia_succ.data_prz_acq,\n" +
" mtb_lisa_apulia_succ.cod_art_for AS cod_art_for,\n" +
@@ -312,7 +283,9 @@ public class ImportListiniAcquistoApuliaCarrefourService {
" perc_oneri,\n" +
" prz_ven_sug,\n" +
" CASE WHEN data_iniz < '2020/01/01' THEN '2020/01/01' ELSE data_iniz END AS data_iniz,\n" +
" tipo_variazione\n" +
" tipo_variazione,\n" +
" rag_soc_prod,\n" +
" part_iva_prod\n" +
" FROM dbo.getlistinoacquisto([DATA_IMPORT], NULL, NULL, NULL, 'N', NULL) lisa\n" +
" WHERE lisa.cod_alis LIKE 'AP%'\n" +
" AND lisa.tipo_variazione <> 'D'\n" +
@@ -447,7 +420,11 @@ public class ImportListiniAcquistoApuliaCarrefourService {
+ " um_peso varchar(80),"
+ " espolodi_dist varchar(80),"
+ " partita_iva_forn varchar(80),"
+ " altro varchar(max))";
+ " altro varchar(max),"
+ " famiglia_2 varchar(max),"
+ " altro_2 varchar(max),"
+ " altro_3 varchar(max))";
}
ps = conn.prepareStatement(sql);
ps.executeUpdate();
@@ -579,7 +556,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
" descrizione,\n" +
" barcode,\n" +
" settore,\n" +
" famiglia,\n" +
" famiglia_2 as famiglia,\n" +
" cod_forn,\n" +
" NULL AS cod_divisione_forn,\n" +
" NULL AS descrizione_divisione_forn,\n" +
@@ -620,7 +597,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
" LEFT(tabp.descrizione, 80) AS descrizione,\n" +
" CASE WHEN LEN(barcode) = 0 THEN NULL ELSE barcode END AS barcode,\n" +
" tabp.settore,\n" +
" tabp.famiglia,\n" +
" tabp.famiglia_2,\n" +
" tabp.cod_forn,\n" +
" LEFT(tabp.rag_soc_forn, 40) AS rag_soc_forn,\n" +
" tabp.partita_iva_forn,\n" +

13
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java
View File

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -41,11 +42,11 @@ public class ImportListiniAcquistoService {
throw new Exception("Nessun csv da importare.");
}
Date dataVariazione;
LocalDate dataVariazione;
if (request != null && request.getDataImportazione() != null) {
dataVariazione = request.getDataImportazione();
dataVariazione = UtilityLocalDate.localDateFromDate(request.getDataImportazione());
} else {
dataVariazione = new Date();
dataVariazione = UtilityLocalDate.getNow();
}
HashMap<String, String> setup = setupGest.getImportSetupSection(multiDBTransactionManager.getPrimaryConnection(), type, format);
@@ -138,10 +139,10 @@ public class ImportListiniAcquistoService {
AtbListData atbListData
= new AtbListData()
.setCodAlis(vtbListData.getCodVlis())
.setDataIniz(vtbListData.getDataIniz())
.setDataFine(vtbListData.getDataFine())
.setDataIniz(UtilityLocalDate.localDateFromDate(vtbListData.getDataIniz()))
.setDataFine(UtilityLocalDate.localDateFromDate(vtbListData.getDataFine()))
.setCodPromo(vtbListData.getCodPromo())
.setNote(vtbListData.getVersione() + (vtbListData.getNote()==null?"":vtbListData.getNote()));
.setNote(vtbListData.getVersione() + (vtbListData.getNote()==null?"":" " + vtbListData.getNote()));
atbListData.setOperation(OperationType.INSERT);
atbListDataList.add(atbListData);
for (MtbLisvData mtbLisvData: vtbListData.getMtbLisvData()){

14
ems-engine/src/main/java/it/integry/ems/product/importaz/service/RipianificaOrdineLavRequestDTO.java
View File

@@ -1,12 +1,12 @@
package it.integry.ems.product.importaz.service;
import java.time.LocalDate;
import java.util.Date;
public class RipianificaOrdineLavRequestDTO {
private String gestione;
private Date dataOrd;
private LocalDate dataOrd;
private Integer numOrd;
@@ -16,7 +16,7 @@ public class RipianificaOrdineLavRequestDTO {
private String codJfasNew;
private Date dataPianificazione;
private LocalDate dataPianificazione;
public String getGestione() {
return gestione;
@@ -27,11 +27,11 @@ public class RipianificaOrdineLavRequestDTO {
return this;
}
public Date getDataOrd() {
public LocalDate getDataOrd() {
return dataOrd;
}
public RipianificaOrdineLavRequestDTO setDataOrd(Date dataOrd) {
public RipianificaOrdineLavRequestDTO setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}
@@ -72,11 +72,11 @@ public class RipianificaOrdineLavRequestDTO {
return this;
}
public Date getDataPianificazione() {
public LocalDate getDataPianificazione() {
return dataPianificazione;
}
public RipianificaOrdineLavRequestDTO setDataPianificazione(Date dataPianificazione) {
public RipianificaOrdineLavRequestDTO setDataPianificazione(LocalDate dataPianificazione) {
this.dataPianificazione = dataPianificazione;
return this;
}

51
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java
View File

@@ -9,9 +9,7 @@ import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import it.integry.ems_model.utility.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,22 +106,52 @@ public class AgribookFieldService {
.setNote(dto.getNote())
.setQtaAttesa(dto.getQtaAttesa())
.setPartitaMagProd(dto.getPartitaMagProd())
.setMtbPartitaMagCarat(new ArrayList<>())
.setOperation(OperationType.INSERT_OR_UPDATE);
if (!UtilityString.isNullOrEmpty(dto.getVarieta())) {
MtbPartitaMagCarat carat = this.getVarieta(connection, dto.getCodMart(), dto.getPartitaMag());
MtbPartitaMagCarat carat = this.getCarat(connection, dto.getCodMart(), dto.getPartitaMag(), "VARIETA");
if (carat == null) {
carat = new MtbPartitaMagCarat();
carat.setCarat("VARIETA");
}
carat
.setValCarat(dto.getVarieta())
.setOperation(OperationType.INSERT_OR_UPDATE);
List<MtbPartitaMagCarat> caratList = new ArrayList<>();
caratList.add(carat);
partitaMag.setMtbPartitaMagCarat(caratList);
partitaMag.getMtbPartitaMagCarat().add(carat);
}
if (!UtilityInteger.isNullOrZero(dto.getnPiante())) {
MtbPartitaMagCarat carat = this.getCarat(connection, dto.getCodMart(), dto.getPartitaMag(), "n-piante");
if (carat == null) {
carat = new MtbPartitaMagCarat()
.setCarat("n-piante");
}
carat
.setValCarat(String.valueOf(dto.getnPiante()))
.setOperation(OperationType.INSERT_OR_UPDATE);
partitaMag.getMtbPartitaMagCarat().add(carat);
}
if (!UtilityBigDecimal.isNullOrZero(dto.getSuperficie())) {
MtbPartitaMagCarat carat = this.getCarat(connection, dto.getCodMart(), dto.getPartitaMag(), "superficie");
if (carat == null) {
carat = new MtbPartitaMagCarat()
.setCarat("superficie");
}
carat
.setValCarat(String.valueOf(dto.getSuperficie()))
.setOperation(OperationType.INSERT_OR_UPDATE);
partitaMag.getMtbPartitaMagCarat().add(carat);
}
entityList.add(partitaMag);
@@ -160,8 +188,13 @@ public class AgribookFieldService {
}
private MtbPartitaMagCarat getVarieta(MultiDBTransactionManager connection, String codMart, String partitaMag) throws Exception {
String sql = "SELECT * FROM " + MtbPartitaMagCarat.ENTITY + " Where cod_mart = " + UtilityDB.valueToString(codMart) + " and partita_mag = " + UtilityDB.valueToString(partitaMag) + " AND carat = 'VARIETA'";
private MtbPartitaMagCarat getCarat(MultiDBTransactionManager connection, String codMart, String partitaMag, String carat) throws Exception {
String sql = Query.format(
"SELECT * FROM mtb_partita_mag_carat Where cod_mart = %s and partita_mag = %s AND carat = %s",
codMart,
partitaMag,
carat
);
return UtilityDB.executeSimpleQueryOnlyFirstRowDTO(connection.getPrimaryConnection(), sql, MtbPartitaMagCarat.class);
}

2
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java
View File

@@ -473,7 +473,7 @@ public class AgribookOrderService {
" mtb_aart.cod_mtip,\n" +
" mtb_tipi.descrizione AS macro_varieta,\n" +
" CAST(ISNULL(mtb_partita_mag_carat.val_carat, 0) AS INT) AS num_piante,\n" +
" CAST(ISNULL(carat_superficie.val_carat, 0) AS NUMERIC(7, 2)) AS superficie,\n" +
" CAST(ISNULL(carat_superficie.val_carat, 0) AS NUMERIC(7, 4)) AS superficie,\n" +
" evase_totalmente\n" +
" FROM opened_orders\n" +
" INNER JOIN gtb_anag ON opened_orders.cod_anag = gtb_anag.cod_anag\n" +

20
ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookNewFieldRequestDTO.java
View File

@@ -32,6 +32,8 @@ public class AgribookNewFieldRequestDTO {
private String datiCatastali;
private String note;
private String varieta;
private Integer nPiante;
private BigDecimal superficie;
private String codVzon;
private LocalDate dataInizProd;
private LocalDate dataOrd;
@@ -234,6 +236,24 @@ public class AgribookNewFieldRequestDTO {
return this;
}
public Integer getnPiante() {
return nPiante;
}
public AgribookNewFieldRequestDTO setnPiante(Integer nPiante) {
this.nPiante = nPiante;
return this;
}
public BigDecimal getSuperficie() {
return superficie;
}
public AgribookNewFieldRequestDTO setSuperficie(BigDecimal superficie) {
this.superficie = superficie;
return this;
}
public BigDecimal getValUnt() {
return valUnt;
}

8
ems-engine/src/main/java/it/integry/ems/production/service/FLProductionService.java
View File

@@ -14,6 +14,7 @@ import it.integry.ems_model.entity.*;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.*;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -342,7 +344,7 @@ public class FLProductionService {
Integer versione = 0;
OperationType operationType = null;
String codAlis = flAggListinoProdDTO.getCodAlis();
Date dataIniz = flAggListinoProdDTO.getDataProd();
LocalDate dataIniz = UtilityLocalDate.localDateFromDate(flAggListinoProdDTO.getDataProd());
String contoLavoro = flAggListinoProdDTO.getContoLavoro();
if (contoLavoro == null) {
contoLavoro = "N";
@@ -373,7 +375,7 @@ public class FLProductionService {
sql = "SELECT versione " +
"FROM atb_list_data " +
" WHERE cod_alis = " + UtilityDB.valueToString(codAlis) + " AND " +
" data_iniz = " + UtilityDB.valueDateToString(dataIniz, CommonConstants.DATE_FORMAT_YMD) + " AND " +
" data_iniz = " + UtilityDB.valueToString(dataIniz) + " AND " +
" data_fine is null";
ps = multiDBTransactionManager.prepareStatement(sql);
@@ -447,7 +449,7 @@ public class FLProductionService {
sql = "SELECT versione " +
"FROM atb_list_data " +
" WHERE cod_alis = " + UtilityDB.valueToString(codAlis) + " AND " +
" data_iniz = " + UtilityDB.valueDateToString(dataIniz, CommonConstants.DATE_FORMAT_YMD) + " AND " +
" data_iniz = " + UtilityDB.valueToString(dataIniz) + " AND " +
" data_fine is null";
ps = connDBCentrale.prepareStatement(sql);

18
ems-engine/src/main/java/it/integry/ems/production/service/ProductionOrdersLifecycleService.java
View File

@@ -333,11 +333,12 @@ public class ProductionOrdersLifecycleService {
}
public void ripianificaOrdLav(RipianificaOrdineLavRequestDTO ripianificaOrdineLavRequestDTO) throws Exception {
DtbOrdt dtbOrdtP = new DtbOrdt()
.setCodJfas(UtilityString.isNull(ripianificaOrdineLavRequestDTO.getCodJfasNew(), ripianificaOrdineLavRequestDTO.getCodJfasOld()))
.setDataOrd(ripianificaOrdineLavRequestDTO.getDataPianificazione() == null ?
.setDataOrd(UtilityLocalDate.localDateToDate(ripianificaOrdineLavRequestDTO.getDataPianificazione() == null ?
ripianificaOrdineLavRequestDTO.getDataOrd() :
ripianificaOrdineLavRequestDTO.getDataPianificazione()
ripianificaOrdineLavRequestDTO.getDataPianificazione())
)
.setGestione("A")
.setGestioneRif("A")
@@ -347,6 +348,9 @@ public class ProductionOrdersLifecycleService {
dtbOrdtP.setOnlyPkMaster(false);
entityProcessor.processEntity(dtbOrdtP, multiDBTransactionManager);
boolean reimpostaLotto = setupGest.getSetupDepoBoolean("PVM", "MONITORAGGIO_LINEE_V2", "REIMPOSTA_LOTTO_ORDINE_RIPIANIFICATO", dtbOrdtP.getCodMdep());
if (dtbOrdtP.getNumOrd() == null) {
String sql =
Query.format(
@@ -362,7 +366,7 @@ public class ProductionOrdersLifecycleService {
dtbOrdtP = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdt.class);
dtbOrdtP
.setCodJfas(ripianificaOrdineLavRequestDTO.getCodJfasNew() == null ? dtbOrdtP.getCodJfas() : ripianificaOrdineLavRequestDTO.getCodJfasNew())
.setDataOrd(ripianificaOrdineLavRequestDTO.getDataPianificazione() == null ? dtbOrdtP.getDataOrd() : ripianificaOrdineLavRequestDTO.getDataPianificazione())
.setDataOrd(ripianificaOrdineLavRequestDTO.getDataPianificazione() == null ? dtbOrdtP.getDataOrd() : UtilityLocalDate.localDateToDate(ripianificaOrdineLavRequestDTO.getDataPianificazione()))
.setNumOrd(null)
.setGeneraOrdLavDaProd(false)
.setOrdTrasf(false);
@@ -380,11 +384,11 @@ public class ProductionOrdersLifecycleService {
Integer rigaOrdProd = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
HashMap<String, Object> oldPk = new HashMap<>();
Date dataOrd = ripianificaOrdineLavRequestDTO.getDataOrd();
Date dataOrd = UtilityLocalDate.localDateToDate(ripianificaOrdineLavRequestDTO.getDataOrd());
if (ripianificaOrdineLavRequestDTO.getDataPianificazione() != null &&
!ripianificaOrdineLavRequestDTO.getDataOrd().equals(ripianificaOrdineLavRequestDTO.getDataPianificazione())) {
oldPk.put("dataOrd", ripianificaOrdineLavRequestDTO.getDataOrd());
dataOrd = ripianificaOrdineLavRequestDTO.getDataPianificazione();
dataOrd = UtilityLocalDate.localDateToDate(ripianificaOrdineLavRequestDTO.getDataPianificazione());
}
DtbOrdt dtbOrdl = new DtbOrdt()
@@ -402,6 +406,10 @@ public class ProductionOrdersLifecycleService {
dtbOrdl.setOperation(OperationType.UPDATE);
}
if ( !reimpostaLotto) {
dtbOrdl.setPartitaMag(EmsRestConstants.NULL);
}
if (UtilityString.equalsIgnoreCase(ripianificaOrdineLavRequestDTO.getCodJfasNew(), ripianificaOrdineLavRequestDTO.getCodJfasOld())) {
sql =
Query.format(

26
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java
View File

@@ -17,6 +17,9 @@ public class ArticoloDTO {
@SqlField("mtb_aart.unt_mis")
private String untMis;
@SqlField("mtb_aart.tipo_codice")
private String tipoCodice;
@SqlField("barcode")
private String barcode;
@@ -43,6 +46,9 @@ public class ArticoloDTO {
private String codMtip;
private boolean flagStato;
@SqlField("mtb_aart.tipo_codice_imballo")
private String tipoCodiceImballo;
@SqlField("cod_barre_imb")
private String barcodeImballo;
private String diacod;
@@ -87,6 +93,15 @@ public class ArticoloDTO {
return this;
}
public String getTipoCodice() {
return tipoCodice;
}
public ArticoloDTO setTipoCodice(String tipoCodice) {
this.tipoCodice = tipoCodice;
return this;
}
public String getBarcode() {
return barcode;
}
@@ -204,6 +219,15 @@ public class ArticoloDTO {
return this;
}
public String getTipoCodiceImballo() {
return tipoCodiceImballo;
}
public ArticoloDTO setTipoCodiceImballo(String tipoCodiceImballo) {
this.tipoCodiceImballo = tipoCodiceImballo;
return this;
}
public String getBarcodeImballo() {
return barcodeImballo;
}
@@ -291,6 +315,7 @@ public class ArticoloDTO {
.setCodMart(codMart)
.setDescrizione(descrizione)
.setUntMis(untMis)
.setTipoCodice(UtilityString.emsNullIfBlank(tipoCodice))
.setBarCode(UtilityString.emsNullIfBlank(barcode))
.setQtaCnf(qtaCnf)
.setCodAliq(codAliq)
@@ -304,6 +329,7 @@ public class ArticoloDTO {
.setCodMstp(codMstp)
.setCodMtip(codMtip)
.setFlagStato(flagStato ? "A" : "I")
.setTipoCodiceImballo(UtilityString.emsNullIfBlank(tipoCodiceImballo))
.setCodBarreImb(UtilityString.emsNullIfBlank(barcodeImballo))
.setDiacod(diacod)
.setFlagQtaCnfFissa(flagQtaCnfFissa ? "S" : "N")

2
ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
View File

@@ -214,7 +214,7 @@ public class SystemService {
case GESTIONALE_BASE:
sql += " WHERE ( stb_user.flag_intra_user = 'S' OR stb_user.flag_dba = 's') ";
break;
case PVM:
default:
sql += " WHERE ( stb_user.flag_intra_user = 'S' OR stb_user.flag_extra_user = 's') ";
break;
}