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

correzione fatture elettroniche

Browse Source
This commit is contained in:
Mina Ruggiero
2025-11-03 13:25:40 +01:00
parent 19e709fc3d
commit 6f198e7d5a
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/document/fatture/base/PassiveInvoiceRecapObject.java
View File

@@ -216,7 +216,7 @@ public class PassiveInvoiceRecapObject {
FattureCollegate collegata = new FattureCollegate(); FattureCollegate collegata = new FattureCollegate();
collegata.setIdDoc(fatturaCollegata.getIdDocumento()); collegata.setIdDoc(fatturaCollegata.getIdDocumento());
if (fatturaCollegata.getData() != null) if (fatturaCollegata.getData() != null)
collegata.setDataDoc(fatturaCollegata.getData().toGregorianCalendar().getTime()); collegata.setDataDoc(UtilityLocalDate.localDateFromXmlGregorian(fatturaCollegata.getData()));
collegata.setCodAnag(fatturaCollegata.getCodiceCommessaConvenzione()); collegata.setCodAnag(fatturaCollegata.getCodiceCommessaConvenzione());
fattureCollegateList.add(collegata); fattureCollegateList.add(collegata);
} }

8
ems-engine/src/main/java/it/integry/ems/document/fatture/dto/FattureCollegate.java
View File

@@ -1,11 +1,12 @@
package it.integry.ems.document.fatture.dto; package it.integry.ems.document.fatture.dto;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
public class FattureCollegate { public class FattureCollegate {
private String idDoc; private String idDoc;
private Date dataDoc; private LocalDate dataDoc;
private String numItem; private String numItem;
private String codAnag; private String codAnag;
@@ -17,12 +18,13 @@ public class FattureCollegate {
this.idDoc = idDoc; this.idDoc = idDoc;
} }
public Date getDataDoc() { public LocalDate getDataDoc() {
return dataDoc; return dataDoc;
} }
public void setDataDoc(Date dataDoc) { public FattureCollegate setDataDoc(LocalDate dataDoc) {
this.dataDoc = dataDoc; this.dataDoc = dataDoc;
return this;
} }
public String getNumItem() { public String getNumItem() {

9
ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java
View File

@@ -49,6 +49,7 @@ import java.math.BigDecimal;
import java.sql.CallableStatement; import java.sql.CallableStatement;
import java.sql.Types; import java.sql.Types;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -373,7 +374,7 @@ public class PassiveInvoiceService {
// Recupero allegato parent // Recupero allegato parent
String codDtip = UtilityHashMap.getValueIfExists(additionalInfo, COD_DTIP_KEY); String codDtip = UtilityHashMap.getValueIfExists(additionalInfo, COD_DTIP_KEY);
Date dataDoc = UtilityHashMap.getValueIfExists(additionalInfo, DATA_DOC_KEY); LocalDate dataDoc = UtilityHashMap.getValueIfExists(additionalInfo, DATA_DOC_KEY);
String numDoc = UtilityHashMap.getValueIfExists(additionalInfo, NUM_DOC_KEY); String numDoc = UtilityHashMap.getValueIfExists(additionalInfo, NUM_DOC_KEY);
if (parentId == null) { if (parentId == null) {
@@ -387,7 +388,7 @@ public class PassiveInvoiceService {
" FROM stb_files_attached INNER JOIN dtb_fatture_passive ON stb_files_attached.parent_id_attach = dtb_fatture_passive.id_attach " + " FROM stb_files_attached INNER JOIN dtb_fatture_passive ON stb_files_attached.parent_id_attach = dtb_fatture_passive.id_attach " +
" WHERE stb_files_attached.file_name LIKE '%" + invoiceName + "%' AND " + " WHERE stb_files_attached.file_name LIKE '%" + invoiceName + "%' AND " +
"dtb_fatture_passive.num_doc = " + UtilityDB.valueToString(numDoc) + " AND " + "dtb_fatture_passive.num_doc = " + UtilityDB.valueToString(numDoc) + " AND " +
"dtb_fatture_passive.data_doc = " + UtilityDB.valueDateToString(dataDoc, CommonConstants.DATE_FORMAT_YMD); "dtb_fatture_passive.data_doc = " + UtilityDB.valueToString(dataDoc);
parentId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sqlParentId); parentId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sqlParentId);
} }
@@ -416,7 +417,7 @@ public class PassiveInvoiceService {
if (UtilityString.isNullOrEmpty(parentId)) { if (UtilityString.isNullOrEmpty(parentId)) {
String numDoc_FP, codDtip_FP, codAnag_FP; String numDoc_FP, codDtip_FP, codAnag_FP;
Date dataDoc_FP; LocalDate dataDoc_FP;
FattureCollegate rifAutofattura = UtilityHashMap.getValueIfExists(additionalInfo, AUTOFATTURA_KEY); FattureCollegate rifAutofattura = UtilityHashMap.getValueIfExists(additionalInfo, AUTOFATTURA_KEY);
if (rifAutofattura == null) { if (rifAutofattura == null) {
dataDoc_FP = dataDoc; dataDoc_FP = dataDoc;
@@ -437,7 +438,7 @@ public class PassiveInvoiceService {
DtbFatturePassive fatturePassive = new DtbFatturePassive() DtbFatturePassive fatturePassive = new DtbFatturePassive()
.setIdAttach(parentActivityId) .setIdAttach(parentActivityId)
.setPartIva(UtilityHashMap.<String>getValueIfExists(additionalInfo, PART_IVA_KEY)) .setPartIva(UtilityHashMap.<String>getValueIfExists(additionalInfo, PART_IVA_KEY))
.setDataDoc(UtilityLocalDate.localDateFromDate(dataDoc_FP)) .setDataDoc(dataDoc_FP)
.setNumDoc(numDoc_FP) .setNumDoc(numDoc_FP)
.setTotDoc(UtilityHashMap.<BigDecimal>getValueIfExists(additionalInfo, TOT_DOC_KEY)) .setTotDoc(UtilityHashMap.<BigDecimal>getValueIfExists(additionalInfo, TOT_DOC_KEY))
.setIban(iban) .setIban(iban)