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
2025-07-29 15:32:41 +02:00
parent c7bd74553e b87f320664
commit aca25727c0
1 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
View File

@@ -5,6 +5,7 @@ import it.integry.ems.document.dto.ArticoloPartitaDTO;
import it.integry.ems.document.dto.CreateULFromDocumentsDTO;
import it.integry.ems.document.dto.ULRowDTO;
import it.integry.ems.document.dto.UlVenditaDTO;
import it.integry.ems.exception.PrimaryDatabaseNotPresentException;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.menu.dto.StbMenuDTO;
import it.integry.ems.retail.wms.accettazione.service.WMSAccettazioneService;
@@ -19,6 +20,7 @@ import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.exception.DataConverterNotFoundException;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.*;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
import java.io.IOException;
import java.math.BigDecimal;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -539,7 +542,7 @@ public class DocumentiDirettiService {
}
List<DtbDocImb> imballi = dtbDoct.getDtbDocImb().stream().filter(x -> x.getOperation() != OperationType.DELETE && x.getTipoReso() != 2).collect(Collectors.toList());
int qtaDoc = 0;
for (DtbDocImb docImb : imballi) {
sql =
Query.format(
@@ -558,9 +561,8 @@ public class DocumentiDirettiService {
String descrizioneArticolo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
String codDtipPed;
if ((fatturaVettore || fatturaPedaneCliente) && docImb.getNumImbCons() != 0) {
codDtipPed = codDtipPedCons;
String descrizione =
String.format("NS. BOLLA DI CONSEGNA %S DEL %S N. %S/%S",
dtbDoct.getCodDtip(),
@@ -569,18 +571,22 @@ public class DocumentiDirettiService {
dtbDoct.getNumDoc());
descrizioneArticolo = descrizioneArticolo + CommonConstants.A_CAPO + descrizione;
qtaDoc = docImb.getNumImbCons();
} else if (!fatturaVettore && docImb.getNumImbResi() != 0) {
codDtipPed = codDtipPedResi;
qtaDoc = docImb.getNumImbResi();
} else {
codDtipPed = null;
getDtbDoctImballi(dtbDoct, entityList, codDtipPedCons, codAnagPed, codMdep, listino, codMart, docImb.getNumImbCons(), descrizioneArticolo, idAttivita);
}
if (!fatturaVettore && docImb.getNumImbResi() != 0) {
getDtbDoctImballi(dtbDoct, entityList, codDtipPedResi, codAnagPed, codMdep, listino, codMart, docImb.getNumImbResi(), descrizioneArticolo, idAttivita);
}
}
}
if (codDtipPed != null) {
List<EntityBase> entityRet = entityProcessor.processEntityList(entityList, multiDBTransactionManager, true);
UtilityEntity.throwEntitiesException(entityRet);
}
private void getDtbDoctImballi(DtbDoct dtbDoct, List<EntityBase> entityList, String codDtipPed, String codAnagPed, String codMdep, String listino, String codMart, int qtaDoc, String descrizioneArticolo, String idAttivita) throws DataConverterNotFoundException, SQLException, InstantiationException, IllegalAccessException, PrimaryDatabaseNotPresentException, IOException {
String sql;
DtbDoct dtbDoctPed = (DtbDoct) entityList
.stream()
.filter(x -> x instanceof DtbDoct && ((DtbDoct) x).getCodDtip().equalsIgnoreCase(codDtipPed)).findFirst().orElse(null);
@@ -632,15 +638,6 @@ public class DocumentiDirettiService {
.setActivityIdRow(idAttivita);
dtbDocr.setOperation(OperationType.INSERT);
dtbDoctPed.getDtbDocr().add(dtbDocr);
}
}
}
List<EntityBase> entityRet = entityProcessor.processEntityList(entityList, multiDBTransactionManager, true);
UtilityEntity.throwEntitiesException(entityRet);
}