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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-07-24 11:40:29 +02:00
parent 68ad7af07a fd3b5bcdfd
commit 3a6eb612e0
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-core/src/main/java/it/integry/ems/service/EntityProcessor.java
View File

@@ -434,6 +434,17 @@ public class EntityProcessor {
return processEntityList(entities, username, isSync, singleTransaction, ordinaSuPriorita, mDbTransactManager, true, false);
}
public List<EntityBase> processEntityList(List<? extends EntityBase> entities, String username,
boolean isSync,
boolean singleTransaction,
boolean ordinaSuPriorita,
MultiDBTransactionManager multiDBTransactionManager,
boolean completeEntity, boolean overrideEntityChildCheck) throws Exception {
final RequestDataDTO requestDataDTO = ContextLoader.getCurrentWebApplicationContext().getBean(RequestDataDTO.class);
return processEntityList(entities, username, isSync, singleTransaction, ordinaSuPriorita, multiDBTransactionManager, completeEntity, overrideEntityChildCheck, requestDataDTO);
}
/**
* Entity List Processor
*
@@ -451,10 +462,10 @@ public class EntityProcessor {
boolean singleTransaction,
boolean ordinaSuPriorita,
MultiDBTransactionManager multiDBTransactionManager,
boolean completeEntity, boolean overrideEntityChildCheck) throws Exception {
boolean completeEntity, boolean overrideEntityChildCheck,
RequestDataDTO requestDataDTO) throws Exception {
final RequestDataDTO requestDataDTO = ContextLoader.getCurrentWebApplicationContext().getBean(RequestDataDTO.class);
if (UtilityString.isNullOrEmpty(username) && requestDataDTO != null && requestDataDTO.isValidUsername()) {
username = requestDataDTO.getUsername();

12
ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
View File

@@ -2,6 +2,7 @@ package it.integry.ems.retail.service;
import com.annimon.stream.Stream;
import it.integry.ems.expansion.RunnableThrowable;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.retail.dto.GiacenzaDTO;
import it.integry.ems.retail.pvmRetail.service.PvmService;
import it.integry.ems.service.EntityProcessor;
@@ -127,8 +128,8 @@ public class GiacenzaService {
List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.INSERT);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, false, false, false);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false,
new RequestDataDTO());
UtilityEntity.throwEntitiesException(entityRet);
}
@@ -142,7 +143,8 @@ public class GiacenzaService {
List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.DELETE);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, false, false, false);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false,
new RequestDataDTO());
UtilityEntity.throwEntitiesException(entityRet);
}
@@ -398,7 +400,7 @@ public class GiacenzaService {
.setDataDoc(UtilityLocalDate.localDateToDate(collo.getDataCollo()))
.setDataDistribuzione(new Date());
collo.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, false);
entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, new RequestDataDTO(),false, false);
UtilityEntity.throwEntityException(collo);
}
}
@@ -417,7 +419,7 @@ public class GiacenzaService {
calls.add(() -> {
try {
for (EntityBase entityBase : entityList) {
entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, false);
entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, new RequestDataDTO(), false, false);
}
} catch (Exception ex) {