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

varie modifiche per chiusura partite contabili e importazione scadenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2024-10-14 19:45:19 +02:00
parent 38d1bee85f
commit b21b7ae7ae
5 changed files with 1241 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241014114737.java → ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241014121636.java
View File

@@ -3,7 +3,7 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20241014114737 extends BaseMigration implements MigrationModelInterface {
public class Migration_20241014121636 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
@@ -11,8 +11,7 @@ public class Migration_20241014114737 extends BaseMigration implements Migration
return;
if (!isTextiles()) return;
createOrUpdateView("tvvw_ordv_linee", "CREATE view tvvw_ordv_linee as \n" +
createOrUpdateView("tvvw_ordv_linee", "CREATE view [dbo].[tvvw_ordv_linee] as \n" +
"select dtb_ordt.gestione, \n" +
"dtb_ordt.data_ord,\n" +
"dtb_ordt.num_ord,\n" +
@@ -24,10 +23,10 @@ public class Migration_20241014114737 extends BaseMigration implements Migration
" WHERE dtb_ordt.gestione = dtb_ordr.gestione \n" +
" and dtb_ordt.data_ord = dtb_ordr.data_ord \n" +
" and dtb_ordt.num_ord = dtb_ordr.num_ord \n" +
" FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS linea\n" +
" FOR XML PATH('')), 1, 2, '' ) AS linea\n" +
"\n" +
"from dtb_ordt\n" +
"where dtb_ordt.gestione = 'V'");
"where dtb_ordt.gestione = 'v'");
}
@Override

1138
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241014170049.java Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -8,6 +8,7 @@ import it.integry.ems.product.export.services.ProdottiLaranciaService;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDirs;
import it.integry.ems.utility.UtilityEntity;
import it.integry.ems.utility.UtilityFile;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.CtbPart;
@@ -26,6 +27,7 @@ import java.math.BigDecimal;
import java.sql.Connection;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -42,7 +44,8 @@ public class ScadenzeImportService {
private ProdottiLaranciaService prodottiLaranciaService;
public List<EntityBase> importDocFinance(String type, String format, ImportRequestDTO requestDTO, List<AnomalieDTO> listAnomalie) throws Exception {
List<EntityBase> entityList;
List<EntityBase> entityList = Collections.emptyList();
List<String> listIntercode = new ArrayList<>();
Connection conn = multiDBTransactionManager.getPrimaryConnection();
if (requestDTO == null || requestDTO.getRawContent() == null)
@@ -74,6 +77,8 @@ public class ScadenzeImportService {
Integer numDoc = UtilityString.isIntNumber(line.substring(185, 197).trim()) ? UtilityInteger.stringToInteger(line.substring(185, 197).trim()) : null;
String intercode = line.substring(197, 223);
listIntercode.add(intercode.trim());
String sql = Query.format(
"SELECT CAST(COUNT(*) AS BIT) AS exist FROM gtb_paga WHERE cod_paga = %s",
codPaga
@@ -99,18 +104,18 @@ public class ScadenzeImportService {
)
.findFirstOrElse(null);
if(ctbPart != null) {
if (ctbPart != null) {
ctbParts.remove(ctbPart);
}
if (ctbPart == null && ( numFromIntercode != null || !UtilityString.isNullOrEmpty(intercodeSubstring))) {
if (ctbPart == null && (numFromIntercode != null || !UtilityString.isNullOrEmpty(intercodeSubstring))) {
sql = Query.format(
"SELECT *\n" +
"FROM ctb_part\n" +
"WHERE cod_anag = %s\n" +
" AND anno_part = %s\n" +
" AND ( num_doc = %s OR num_doc_forn = %s) \n" +
" AND ((tipo_partita = %s\n"+
" AND ((tipo_partita = %s\n" +
" AND dare_part - avere_part <> 0) OR (tipo_partita <> %s AND dare_part - avere_part = %s))"
, codAnag, anno, numFromIntercode, intercodeSubstring,
tipoPartita, tipoPartita, segno + importo
@@ -159,25 +164,70 @@ public class ScadenzeImportService {
}
if (ctbPart == null) {
datiFile.add(codAnag + ";" + diacod + ";" + intercode + ";" + segno + importo);
listAnomalie.add(
AnomalieDTO.warning(
String.format(
"Scadenza non trovata.\nCodAnag: %s (%s)\nIntercode scadenza: %s\nImporto: %s",
codAnag, diacod, intercode.trim(), segno + importo
)
)
);
sql =
Query.format(
"SELECT CAST(COUNT(*) AS BIT) AS as_acconto\n" +
"FROM ctb_movr\n" +
" INNER JOIN ctb_movr_intercode\n" +
" ON ctb_movr.num_cmov = ctb_movr_intercode.num_cmov AND ctb_movr.id_riga = ctb_movr_intercode.id_riga\n" +
"WHERE ctb_movr.cod_anag = %s\n" +
" AND ctb_movr_intercode.intercode = %s",
codAnag, intercode.substring(0, 8));
boolean isAcconto = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
if ( !isAcconto ) {
datiFile.add(codAnag + ";" + diacod + ";" + intercode + ";" + segno + importo);
listAnomalie.add(
AnomalieDTO.warning(
String.format(
"Scadenza non trovata.\nCodAnag: %s (%s)\nIntercode scadenza: %s\nImporto: %s",
codAnag, diacod, intercode.trim(), segno + importo
)
)
);
}
continue;
}
CtbScad ctbScad = new CtbScad();
ctbScad.setDataScad(dataScad)
sql = Query.format(
"SELECT ctb_scad.*\n" +
"FROM ctb_parr\n" +
" INNER JOIN crl_movt_rif_cmov ON ctb_parr.num_cmov = crl_movt_rif_cmov.num_cmov\n" +
" INNER JOIN dbo.ctb_scad\n" +
" ON ctb_parr.tipo_anag = ctb_scad.tipo_anag AND ctb_parr.cod_anag = ctb_scad.cod_anag AND\n" +
" ctb_parr.anno_part = ctb_scad.anno_part AND ctb_parr.ser_doc = ctb_scad.ser_doc AND\n" +
" ctb_parr.num_doc = ctb_scad.num_doc\n" +
"WHERE ctb_parr.tipo_anag = %s\n" +
" AND ctb_parr.cod_anag = %s\n" +
" AND ctb_parr.anno_part = %s\n" +
" AND ctb_parr.ser_doc = %s\n" +
" AND ctb_parr.num_doc = %s\n" +
" AND ctb_scad.data_pag is null \n" +
" AND (ctb_scad.imp_dare = %s OR ctb_scad.imp_avere = %s)",
ctbPart.getTipoAnag(),
ctbPart.getCodAnag(),
ctbPart.getAnnoPart(),
ctbPart.getSerDoc(),
ctbPart.getNumDoc(),
impDare,
impAvere);
CtbScad ctbScad = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, CtbScad.class);
if (ctbScad != null) {
ctbScad.setDataScad(dataScad)
.setIntercode(intercode)
.setOperation(OperationType.UPDATE);
} else {
ctbScad = new CtbScad();
ctbScad.setDataScad(dataScad)
.setImpAvere(impAvere)
.setImpDare(impDare)
.setCodPaga(codPaga)
.setIntercode(intercode)
.setOperation(OperationType.INSERT);
}
ctbPart.getCtbScad().add(ctbScad);
ctbPart.setOperation(OperationType.NO_OP);
@@ -195,6 +245,23 @@ public class ScadenzeImportService {
entityList = entityProcessor.processEntityList(ctbParts, false);
UtilityEntity.throwEntitiesException(entityList);
if ( !listIntercode.isEmpty()) {
String sql =
"SELECT * FROM ctb_scad WHERE intercode is not null and intercode not in (" + UtilityDB.listValueToString(listIntercode) + ")";
List<CtbScad> ctbScads = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, CtbScad.class);
ctbScads.stream().peek(x->x.setOperation(OperationType.DELETE));
entityList = entityProcessor.processEntityList(ctbScads, false);
UtilityEntity.throwEntitiesException(entityList);
}
return entityList;
}
}

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

@@ -101,6 +101,7 @@ 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" +
"UNION ALL\n" +
"SELECT 'RD' AS 'tipo_pagamento',\n" +
" REPLACE(\n" +
@@ -162,7 +163,8 @@ public class ScadenzeExporterService {
" INNER JOIN ctb_caus ON ctb_movt.cod_ccau = ctb_caus.cod_ccau AND ctb_caus.flag_ap_ch = 'N'\n" +
" 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";
"WHERE anno_part IS NULL \n" +
" AND 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>()

19
ems-engine/src/main/java/it/integry/ems/contabil/service/RossoGarganoSyncService.java
View File

@@ -99,13 +99,13 @@ public class RossoGarganoSyncService {
BigDecimal dataFine = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
saveCtbMovt(rgExchange.getConnection(), "(PNOTA.PN_DATA_COMPETENZA = 20210701 AND PN_CAUSALE_MOVIMENTO = '998')", dataIniz, dataFine);
saveCtbMovt(rgExchange.getConnection(), "(PNOTA.PN_DATA_COMPETENZA = 20210701 AND PN_CAUSALE_MOVIMENTO = '998')", dataIniz, dataFine, false);
logger.info("Importazione apertura conti: Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
saveCtbMovt(rgExchange.getConnection(), "(PNOTA.PN_SEZIONALE_IVA <> '' AND PN_CAUSALE_MOVIMENTO <> '998')", dataIniz, dataFine);
saveCtbMovt(rgExchange.getConnection(), "(PNOTA.PN_SEZIONALE_IVA <> '' AND PN_CAUSALE_MOVIMENTO <> '998')", dataIniz, dataFine, false);
logger.info("Importazione fatture attive e passive: Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
saveCtbMovt(rgExchange.getConnection(), "(PN_CAUSALE_MOVIMENTO <> '998')", dataIniz, dataFine);
saveCtbMovt(rgExchange.getConnection(), "(PN_CAUSALE_MOVIMENTO <> '998')", dataIniz, dataFine, true);
logger.info("Importazione altri movimenti contabili: Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
} catch (Exception e ){
if (!UtilityDebug.isDebugExecution()) {
@@ -149,7 +149,7 @@ public class RossoGarganoSyncService {
}
}
private void saveCtbMovt(Connection sourceData, String whereCond, BigDecimal dataIniz, BigDecimal dataFine) throws Exception {
private void saveCtbMovt(Connection sourceData, String whereCond, BigDecimal dataIniz, BigDecimal dataFine, boolean chkPartita) throws Exception {
String sql =
Query.format(
"SELECT DISTINCT PNOTA.PN_DATA_COMPETENZA\n" +
@@ -159,11 +159,20 @@ public class RossoGarganoSyncService {
" LEFT OUTER JOIN " + multiDBTransactionManager.getPrimaryDatasource().getDbName() + ".dbo.rg_crl_movt rg_crl_movt ON \n " +
" rg_crl_movt.PN_DATA_COMPETENZA = PNOTA.PN_DATA_COMPETENZA AND\n " +
" rg_crl_movt.PN_NRO_REG = PNOTA.PN_NRO_REG \n " +
(chkPartita?
" OUTER APPLY (SELECT MAX(IIF(ctb_movr.anno_part IS NULL, 0, 1)) AS has_partita\n" +
" FROM rossogargano.dbo.ctb_movr\n" +
" WHERE ctb_movr.num_cmov = rg_crl_movt.num_cmov) m\n" +
" CROSS APPLY (SELECT MAX(CASE WHEN LEN(pnota2.pn_partita) > 2 THEN 1 ELSE 0 END) AS has_part\n" +
" FROM pnota pnota2\n" +
" WHERE pnota.pn_data_competenza = pnota2.pn_data_competenza\n" +
" AND pnota.pn_nro_reg = pnota2.pn_nro_reg) t \n":"") +
" WHERE PNOTA.PN_DATA_COMPETENZA between %s AND %s AND \n " +
" PN_INDPROV <> 'S' AND \n " +
" (rg_crl_movt.data_ins is null OR pnota.PN_DATA_MODIFICA >= CAST(FORMAT(DATEPART(YEAR, rg_crl_movt.data_ins), '0000') +\n" +
" FORMAT(DATEPART(MONTH, rg_crl_movt.data_ins), '00') +\n" +
" FORMAT(DATEPART(DAY, rg_crl_movt.data_ins), '00') AS NUMERIC) ) \n "
" FORMAT(DATEPART(DAY, rg_crl_movt.data_ins), '00') AS NUMERIC) " +
(chkPartita?"OR t.has_part <> ISNULL(m.has_partita, 0)":"") + ") \n "
+ (UtilityString.isNullOrEmpty(whereCond) ? "" : " AND " + whereCond) +
"ORDER BY PNOTA.PN_DATA_COMPETENZA, PNOTA.PN_NRO_REG",
dataIniz, dataFine);