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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2024-10-18 15:45:45 +02:00
parent 8d055ebf1b 931b463b7d
commit b34b5572b4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ScadenzeImportService.java
View File

@@ -137,6 +137,7 @@ public class ScadenzeImportService {
checkList.put("10216200", "21001276019001");
checkList.put("10407300", "21 004001");
checkList.put("90254600", "21241137001001");
checkList.put("90165100", "20334 005001");
if (checkList.containsKey(diacod) && checkList.get(diacod).equals(intercode.trim())) {
forceIn2021 = true;

16
ems-engine/src/main/java/it/integry/ems/contabil/export/services/ScadenzeExporterService.java
View File

@@ -5,7 +5,9 @@ import it.integry.ems.export.base.EntityExportResponse;
import it.integry.ems.file_formatter.txt.TxtMapper;
import it.integry.ems.response.FileItem;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityString;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -19,17 +21,21 @@ public class ScadenzeExporterService {
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@Autowired
private SetupGest setupGest;
public EntityExportResponse<List<FileItem>> exportDocFinance(String type, String format) throws Exception {
EntityExportResponse<List<FileItem>> entityExportResponse = new EntityExportResponse<>();
entityExportResponse.setResponse(new ArrayList<>());
String codPagaRitAcc = setupGest.getSetup("CTB_SCAD", "COD_PAGA", "RITENUTA");
String sql = "SELECT gtb_tipi_paga_intercode.intercode AS 'tipo_pagamento',\n" +
" REPLACE(\n" +
" CAST(\n" +
" FORMAT(\n" +
" (ctb_scad.imp_dare + ctb_scad.imp_avere),\n" +
" IIF(ctb_part.tipo_partita = 0, '-', '+') + '00000000000.000'\n" +
" IIF(ctb_scad.imp_dare - ctb_scad.imp_avere < 0 , '-', '+') + '00000000000.000'\n" +
" ) AS VARCHAR), '.', ',') AS 'importo',\n" +
" gtb_divi.cod_divi AS 'divisa_scadenza',\n" +
" REPLACE(\n" +
@@ -101,14 +107,15 @@ public class ScadenzeExporterService {
" ORDER BY ctb_parr.data_cmov, ctb_parr.num_cmov) ctb_parr\n" +
" OUTER APPLY (SELECT CASE WHEN (ctb_part.tipo_anag = 'F' AND gtb_tipi_paga.flag_banca_acq = 'A' ) OR (ctb_part.tipo_anag = 'C' AND gtb_tipi_paga.flag_banca_ven = 'A' ) THEN 1 ELSE 0 END as banca_azi ) c\n " +
"WHERE ctb_scad.data_pag IS NULL\n" +
" AND gtb_anag.part_iva not in (SELECT part_iva FROM azienda)\n" +
" AND (gtb_anag.part_iva Is null OR gtb_anag.part_iva not in (SELECT part_iva FROM azienda))\n" +
(UtilityString.isNullOrEmpty(codPagaRitAcc)?"":"AND ctb_scad.cod_paga <> " + UtilityDB.valueToString(codPagaRitAcc)) +
"UNION ALL\n" +
"SELECT 'RD' AS 'tipo_pagamento',\n" +
" REPLACE(\n" +
" CAST(\n" +
" FORMAT(\n" +
" (ctb_movr.imp_dare - ctb_movr.imp_avere),\n" +
" IIF(ctb_movr.imp_dare - ctb_movr.imp_avere > 0, '+', '') + '00000000000.000'\n" +
" IIF(ctb_movr.imp_dare - ctb_movr.imp_avere > 0, '+', '-') + '00000000000.000'\n" +
" ) AS VARCHAR\n" +
" ), '.', ','\n" +
" ) AS 'importo',\n" +
@@ -164,7 +171,8 @@ public class ScadenzeExporterService {
" LEFT OUTER JOIN ctb_movr_intercode ON ctb_movr.num_cmov = ctb_movr_intercode.num_cmov AND\n" +
" ctb_movr.id_riga = ctb_movr_intercode.id_riga\n" +
"WHERE anno_part IS NULL \n" +
" AND gtb_anag.part_iva not in (SELECT part_iva FROM azienda)\n";
" AND (gtb_anag.part_iva Is null OR gtb_anag.part_iva not in (SELECT part_iva FROM azienda))\n";
List<ScadenzeDocFinanceDTO> scadenzeDocFinance = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ScadenzeDocFinanceDTO.class);
TxtMapper<ScadenzeDocFinanceDTO> txtMapper = new TxtMapper<ScadenzeDocFinanceDTO>()