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

Modifica gestione incassi per prevendita SEVEN
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Fabio Narracci
2025-03-20 12:56:05 +01:00
parent 727eb84d9b
commit ebb51f815f
1 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ems-engine/src/main/java/it/integry/ems/order/puddy/service/PuddyService.java
View File

@@ -1042,28 +1042,40 @@ public class PuddyService {
List<EntityBase> listDistIncatVG = new ArrayList<EntityBase>();
Connection conn = multiDBTransactionManager.getPrimaryDatasource().getConnection();
MultiDBTransactionManager multiDBTransactionManagerVG = new MultiDBTransactionManager();
String columnTipoAzienda, query;
String profileDBVG = setupGest.getSetup("IMPORT_ORDINI", "PUDDY", "PROFILE_DB_VG");
// Connessione DB VG
String columnTipoAzienda = multiDBTransactionManager.getPrimaryDatasource().getProfile();
if (!UtilityString.isNullOrEmpty(profileDBVG)){
DataSource dsSync = new DataSource();
dsSync.initialize(profileDBVG);
multiDBTransactionManagerVG.setPrimaryDs(profileDBVG);
columnTipoAzienda = "case when ser_doc like 'V%' then 'ASS_VG' else 'ASS_SEVEN' end";
columnTipoAzienda = "case when ser_doc like 'S%' then 'ASS_VG' else 'ASS_SEVEN' end";
}
/*Acquisizione dati agente/data incasso*/
String query =
/*Acquisizione dati agente/data incasso*/
query =
"SELECT DISTINCT x_puddy3_prev_incassi.data_incasso, " +
" x_puddy3_prev_incassi.cod_vage, " +
columnTipoAzienda + ", " +
" x_puddy3_prev_intercode_agenti_vg.cod_vage_vg " +
" x_puddy3_prev_intercode_agenti_vg.cod_vage_vg " +
" FROM x_puddy3_prev_incassi left outer join x_puddy3_prev_intercode_agenti_vg on x_puddy3_prev_incassi.cod_vage = x_puddy3_prev_intercode_agenti_vg.cod_vage " +
" WHERE x_puddy3_prev_incassi.flag_elaborato = 'N' " +
" ORDER BY 3 ";
} else {
columnTipoAzienda = multiDBTransactionManager.getPrimaryDatasource().getProfile();
/*Acquisizione dati agente/data incasso*/
query =
"SELECT DISTINCT x_puddy3_prev_incassi.data_incasso, " +
" x_puddy3_prev_incassi.cod_vage, " +
UtilityDB.valueToString(columnTipoAzienda) + ", " +
" null " +
" FROM x_puddy3_prev_incassi " +
" WHERE x_puddy3_prev_incassi.flag_elaborato = 'N' " +
" ORDER BY 3 ";
}
query = UtilityDB.addwhereCond(query, whereCond, false);
PreparedStatement ps = multiDBTransactionManager.prepareStatement(query);
ResultSet rs = ps.executeQuery();
@@ -1087,20 +1099,35 @@ public class PuddyService {
}
// Generazione distinta incassi
query =
"SELECT case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'S' then x_puddy3_prev_intercode_clienti_VG.cod_anag_vg ELSE x_puddy3_prev_incassi.cod_anag end as cod_anag, " +
" case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'S' then x_puddy3_prev_intercode_clienti_VG.cod_vdes_vg ELSE x_puddy3_prev_incassi.cod_vdes end as cod_vdes, " +
" x_puddy3_prev_incassi.cod_causale, " +
" x_puddy3_prev_incassi.data_doc, " +
" case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'S' then SUBSTRING(x_puddy3_prev_incassi.ser_doc, 2, 2) else x_puddy3_prev_incassi.ser_doc end as ser_doc, " +
" x_puddy3_prev_incassi.num_doc, " +
" x_puddy3_prev_incassi.imp_incasso " +
" FROM x_puddy3_prev_incassi left outer join x_puddy3_prev_intercode_clienti_VG on x_puddy3_prev_incassi.cod_anag = x_puddy3_prev_intercode_clienti_VG.cod_anag and " +
" x_puddy3_prev_incassi.cod_vdes = x_puddy3_prev_intercode_clienti_VG.cod_vdes " +
" WHERE x_puddy3_prev_incassi.flag_elaborato = 'N' AND " +
" x_puddy3_prev_incassi.data_incasso = " + UtilityDB.valueToString(dataIncasso) + " AND " +
" x_puddy3_prev_incassi.cod_vage = " + UtilityDB.valueToString(codVage) + " AND " +
columnTipoAzienda + " = " + UtilityDB.valueToString(azienda);
if (!UtilityString.isNullOrEmpty(profileDBVG)){
query =
"SELECT case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'V' then x_puddy3_prev_intercode_clienti_VG.cod_anag_vg ELSE x_puddy3_prev_incassi.cod_anag end as cod_anag, " +
" case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'V' then x_puddy3_prev_intercode_clienti_VG.cod_vdes_vg ELSE x_puddy3_prev_incassi.cod_vdes end as cod_vdes, " +
" x_puddy3_prev_incassi.cod_causale, " +
" x_puddy3_prev_incassi.data_doc, " +
" case when left(x_puddy3_prev_incassi.ser_doc, 1) = 'V' then SUBSTRING(x_puddy3_prev_incassi.ser_doc, 2, 2) else x_puddy3_prev_incassi.ser_doc end as ser_doc, " +
" x_puddy3_prev_incassi.num_doc, " +
" x_puddy3_prev_incassi.imp_incasso " +
" FROM x_puddy3_prev_incassi left outer join x_puddy3_prev_intercode_clienti_VG on x_puddy3_prev_incassi.cod_anag = x_puddy3_prev_intercode_clienti_VG.cod_anag and " +
" x_puddy3_prev_incassi.cod_vdes = x_puddy3_prev_intercode_clienti_VG.cod_vdes " +
" WHERE x_puddy3_prev_incassi.flag_elaborato = 'N' AND " +
" x_puddy3_prev_incassi.data_incasso = " + UtilityDB.valueToString(dataIncasso) + " AND " +
" x_puddy3_prev_incassi.cod_vage = " + UtilityDB.valueToString(codVage) + " AND " +
columnTipoAzienda + " = " + UtilityDB.valueToString(azienda);
} else {
query =
"SELECT x_puddy3_prev_incassi.cod_anag as cod_anag, " +
" x_puddy3_prev_incassi.cod_vdes as cod_vdes, " +
" x_puddy3_prev_incassi.cod_causale, " +
" x_puddy3_prev_incassi.data_doc, " +
" x_puddy3_prev_incassi.ser_doc as ser_doc, " +
" x_puddy3_prev_incassi.num_doc, " +
" x_puddy3_prev_incassi.imp_incasso " +
" FROM x_puddy3_prev_incassi " +
" WHERE x_puddy3_prev_incassi.flag_elaborato = 'N' AND " +
" x_puddy3_prev_incassi.data_incasso = " + UtilityDB.valueToString(dataIncasso) + " AND " +
" x_puddy3_prev_incassi.cod_vage = " + UtilityDB.valueToString(codVage);
}
PreparedStatement psDistintaAgente = multiDBTransactionManager.prepareStatement(query);
ResultSet rsDistintaAgente = psDistintaAgente.executeQuery();