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

This commit is contained in:
2025-05-06 12:01:17 +02:00

View File

@@ -247,7 +247,7 @@ public class GiacenzaService {
" ntb_doct.date_only_doc as data_reg,\n" + " ntb_doct.date_only_doc as data_reg,\n" +
" 0,\n" + " 0,\n" +
" ntb_docr.qta_doc * ntb_docr.qta_cnf,\n" + " ntb_docr.qta_doc * ntb_docr.qta_cnf,\n" +
" ntb_doct.data_import,\n" + " ntb_doct.data_doc as data_import,\n" +
" null as tipo_car\n" + " null as tipo_car\n" +
" FROM ntb_doct\n" + " FROM ntb_doct\n" +
" INNER JOIN ntb_docr ON ntb_doct.cod_mdep = ntb_docr.cod_mdep AND\n" + " INNER JOIN ntb_docr ON ntb_doct.cod_mdep = ntb_docr.cod_mdep AND\n" +
@@ -613,7 +613,7 @@ public class GiacenzaService {
" ntb_doct.date_only_doc AS data_reg,\n" + " ntb_doct.date_only_doc AS data_reg,\n" +
" 0,\n" + " 0,\n" +
" ntb_docr.qta_doc * ntb_docr.qta_cnf,\n" + " ntb_docr.qta_doc * ntb_docr.qta_cnf,\n" +
" ntb_doct.data_import,\n" + " ntb_doct.data_doc as data_import,\n" +
" NULL AS tipo_car\n" + " NULL AS tipo_car\n" +
" FROM ntb_doct\n" + " FROM ntb_doct\n" +
" INNER JOIN ntb_docr\n" + " INNER JOIN ntb_docr\n" +