Merge branch 'master' into develop
This commit is contained in:
@@ -810,15 +810,13 @@ public class RossoGarganoSyncService {
|
|||||||
" ELSE NULL END AS mezzo,\n" +
|
" ELSE NULL END AS mezzo,\n" +
|
||||||
" CASE WHEN LEN(fo_categoria_fornitore) > 0 THEN fo_categoria_fornitore ELSE NULL END AS cod_atip,\n" +
|
" CASE WHEN LEN(fo_categoria_fornitore) > 0 THEN fo_categoria_fornitore ELSE NULL END AS cod_atip,\n" +
|
||||||
" CASE WHEN LEN(cl_esenz_iva) > 0 THEN cl_esenz_iva ELSE NULL END AS cod_aliq,\n" +
|
" CASE WHEN LEN(cl_esenz_iva) > 0 THEN cl_esenz_iva ELSE NULL END AS cod_aliq,\n" +
|
||||||
" ctb_cont.cod_ccon AS cod_ccon_costi\n" +
|
" ctb_cont.cod_ccon AS cod_ccon_costi,\n" +
|
||||||
|
" convert(datetime, cast( CL_DATA_INSERIMENTO as varchar),112) AS data_ins,\n" +
|
||||||
|
" convert(datetime, cast( CL_DATA_MODIFICA as varchar),112) AS data_mod\n" +
|
||||||
"FROM anag\n" +
|
"FROM anag\n" +
|
||||||
" LEFT OUTER JOIN " + multiDBTransactionManager.getPrimaryDatasource().getDbName() + ".dbo.ctb_cont ON cl_conto_acquisti = ctb_cont.diacod\n" +
|
" LEFT OUTER JOIN " + multiDBTransactionManager.getPrimaryDatasource().getDbName() + ".dbo.ctb_cont ON cl_conto_acquisti = ctb_cont.diacod\n" +
|
||||||
"WHERE (cl_codice IN (SELECT LTRIM(pn_cod_anag)\n" +
|
"WHERE cl_data_inserimento >= 20240901 \n" +
|
||||||
" FROM pnota\n" +
|
" AND cl_rif_bilancio NOT IN ('24', '28', '32')\n" +
|
||||||
" WHERE pn_cod_anag LIKE '9%'\n" +
|
|
||||||
" AND pn_data_competenza >= 20180101) OR \n" +
|
|
||||||
" (CONVERT(DATETIME, CAST(cl_data_inserimento AS VARCHAR), 112) >= DATEADD(MONTH, -1, GETDATE()) AND\n" +
|
|
||||||
" cl_rif_bilancio NOT IN ('24', '28', '32')))\n" +
|
|
||||||
" AND cl_codice LIKE '9%' \n" +
|
" AND cl_codice LIKE '9%' \n" +
|
||||||
" AND cl_codice NOT IN (SELECT diacod FROM " + multiDBTransactionManager.getPrimaryDatasource().getDbName() + ".dbo.gtb_anag WHERE diacod IS NOT NULL)";
|
" AND cl_codice NOT IN (SELECT diacod FROM " + multiDBTransactionManager.getPrimaryDatasource().getDbName() + ".dbo.gtb_anag WHERE diacod IS NOT NULL)";
|
||||||
|
|
||||||
@@ -838,7 +836,9 @@ public class RossoGarganoSyncService {
|
|||||||
.setPartIva(UtilityHashMap.getValueIfExists(x, "part_iva"))
|
.setPartIva(UtilityHashMap.getValueIfExists(x, "part_iva"))
|
||||||
.setProv(UtilityHashMap.getValueIfExists(x, "prov"))
|
.setProv(UtilityHashMap.getValueIfExists(x, "prov"))
|
||||||
.setCap(UtilityHashMap.getValueIfExists(x, "cap"))
|
.setCap(UtilityHashMap.getValueIfExists(x, "cap"))
|
||||||
.setCitta(UtilityHashMap.getValueIfExists(x, "citta"));
|
.setCitta(UtilityHashMap.getValueIfExists(x, "citta"))
|
||||||
|
.setDataIns(UtilityHashMap.getValueIfExists(x, "data_ins"))
|
||||||
|
.setDataMod(UtilityHashMap.getValueIfExists(x, "data_mod"));
|
||||||
forn.setOperation(OperationType.INSERT);
|
forn.setOperation(OperationType.INSERT);
|
||||||
|
|
||||||
AtbForn atbForn = new AtbForn()
|
AtbForn atbForn = new AtbForn()
|
||||||
|
|||||||
Reference in New Issue
Block a user