Modifica export documenti STEF

This commit is contained in:
2024-04-29 16:52:52 +02:00
parent 374fe08fe2
commit 2a5831c971

View File

@@ -87,7 +87,14 @@ public class DocumentiStefExportService {
"CONVERT(char(9), azienda.cap) + " +
"CONVERT(char(2), azienda.prov) + " +
" CONVERT(char(2), azienda.nazione) + " +
"SPACE(153) + " +
"SPACE(16) + " +
" CONVERT(char(36), azienda.nome_ditta) + " +
"CONVERT(char(36), mtb_depo.indirizzo) + " +
"CONVERT(char(36), mtb_depo.citta) + " +
"CONVERT(char(9), mtb_depo.cap) + " +
"CONVERT(char(2), mtb_depo.prov) + " +
" CONVERT(char(2), mtb_depo.nazione) + " +
"SPACE(16) + " +
"CONVERT(char(36), CASE WHEN dtb_doct.cod_vvet2 IS NOT NULL THEN ISNULL(vtb_vett.rag_soc, '') ELSE ISNULL(ISNULL(vtb_dest.destinatario, gtb_anag.rag_soc), '') END ) + " +
"CONVERT(char(36), CASE WHEN dtb_doct.cod_vvet2 IS NOT NULL THEN ISNULL(vtb_vett.indirizzo, '') ELSE ISNULL(ISNULL(vtb_dest.indirizzo, gtb_anag.indirizzo), '')END) + " +
"CONVERT(char(36), CASE WHEN dtb_doct.cod_vvet2 IS NOT NULL THEN ISNULL(vtb_vett.citta, '') ELSE ISNULL(ISNULL(vtb_dest.citta, gtb_anag.citta), '') END ) + " +
@@ -124,6 +131,7 @@ public class DocumentiStefExportService {
" dtb_doct.data_doc = dtb_docr.data_doc and " +
" dtb_doct.ser_doc = dtb_docr.ser_doc and " +
" dtb_doct.num_doc = dtb_docr.num_doc " +
" INNER JOIN mtb_depo ON dtb_doct.cod_mdep = mtb_depo.cod_mdep " +
" LEFT OUTER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " +
" LEFT OUTER JOIN (select cod_anag, cod_dtip, data_doc, ser_doc, num_doc, MAX(versione) as versione from dtb_doc_pdf " +
" group by cod_anag, cod_dtip, data_doc, ser_doc, num_doc) dtb_doc_pdf ON dtb_doct.cod_dtip = dtb_doc_pdf.cod_dtip and " +
@@ -146,7 +154,12 @@ public class DocumentiStefExportService {
" GROUP BY dtb_doct.cod_vvet2, vtb_vett.rag_soc, vtb_vett.cap, vtb_vett.citta, vtb_vett.cap, vtb_vett.nazione, vtb_vett.indirizzo, vtb_vett.prov, dtb_doct.data_cons, dtb_doct.posti_pallet, dtb_doct.tot_omaggi, dtb_doct.tot_iva, dtb_doct.tot_imponib,elenco_contrass, dtb_doct.cod_paga, dtb_doct.ser_doc, dtb_doct.num_doc, dtb_doct.data_doc, azienda.nome_ditta, " +
" azienda.indirizzo, azienda.citta, azienda.cap, azienda.prov, azienda.nazione, " +
" vtb_dest.destinatario, vtb_dest.indirizzo, vtb_dest.citta, vtb_dest.cap, vtb_dest.prov, vtb_dest.nazione, dtb_doct.num_colli, docCollo.num_pedane, " +
" dtb_doct.cod_dtip, dtb_doct.cod_anag, dtb_doc_pdf.versione, dtb_doct.peso, gtb_anag.rag_soc, gtb_anag.indirizzo, gtb_anag.cap, gtb_anag.prov, gtb_anag.citta, gtb_anag.nazione " +
" dtb_doct.cod_dtip, dtb_doct.cod_anag, dtb_doc_pdf.versione, dtb_doct.peso, gtb_anag.rag_soc, gtb_anag.indirizzo, gtb_anag.cap, gtb_anag.prov, gtb_anag.citta, gtb_anag.nazione,\n" +
" mtb_depo.indirizzo," +
" mtb_depo.citta," +
" mtb_depo.cap," +
" mtb_depo.prov," +
" mtb_depo.nazione " +
" having sum(case when dtb_docr.cod_mart is not null then 1 else 0 end) > 0 ";
query = UtilityDB.addwhereCond(query, whereCond, true);