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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-02-05 11:11:19 +01:00
parent 46c8a0f475 3d00d49a08
commit afea11e683
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ems-core/src/main/java/it/integry/ems/service/PrinterService.java
View File

@@ -3,6 +3,7 @@ package it.integry.ems.service;
import it.integry.ems.properties.EmsProperties; import it.integry.ems.properties.EmsProperties;
import it.integry.ems.report.dto.ReportTypeDTO; import it.integry.ems.report.dto.ReportTypeDTO;
import it.integry.ems.service.exception.EmptyReportException; import it.integry.ems.service.exception.EmptyReportException;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.entity.WtbJreptSetup; import it.integry.ems_model.entity.WtbJreptSetup;
import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.utility.UtilityString; import it.integry.ems_model.utility.UtilityString;
@@ -32,8 +33,6 @@ import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import it.integry.ems.sync.MultiDBTransaction.Connection;
@Service @Service
@Scope("request") @Scope("request")
public class PrinterService { public class PrinterService {
@@ -239,10 +238,11 @@ public class PrinterService {
return reportProcessor.getReportForReportType(reportTypeDTO); return reportProcessor.getReportForReportType(reportTypeDTO);
} }
public String printReportType(ReportTypeDTO reportTypeDTO) throws Exception { public void printReportType(ReportTypeDTO reportTypeDTO) throws Exception {
WtbJreptSetup impostazioniStampa = reportProcessor.getReportForReportType(reportTypeDTO); WtbJreptSetup impostazioniStampa = reportProcessor.getReportForReportType(reportTypeDTO);
if (impostazioniStampa == null) { if (impostazioniStampa == null) {
throw new Exception("Nessuna configurazione trovata per il tipo report " + reportTypeDTO.getReportType().toString()); logger.warn("Nessuna configurazione trovata per il tipo report " + reportTypeDTO.getReportType().toString());
return;
} }
String printerName = impostazioniStampa.getPrinterName(); String printerName = impostazioniStampa.getPrinterName();
Integer numberOfCopies = impostazioniStampa.getPrintQuantity(); Integer numberOfCopies = impostazioniStampa.getPrintQuantity();
@@ -256,16 +256,15 @@ public class PrinterService {
switch (impostazioniStampa.getOrientation()) { switch (impostazioniStampa.getOrientation()) {
case PORTRAIT: case PORTRAIT:
orientation = Orientation.PORTRAIT; orientation = Orientation.PORTRAIT;
break; break;
case LANDSCAPE: case LANDSCAPE:
orientation = Orientation.LANDSCAPE; orientation = Orientation.LANDSCAPE;
break; break;
default:
case AUTO:
orientation = Orientation.AUTO;
case AUTO:
default:
orientation = Orientation.AUTO;
break; break;
} }
numberOfCopies = numberOfCopies == null ? 1 : numberOfCopies; numberOfCopies = numberOfCopies == null ? 1 : numberOfCopies;
@@ -273,8 +272,6 @@ public class PrinterService {
print(printerName, new ByteArrayInputStream(bytes), "application/pdf", orientation); print(printerName, new ByteArrayInputStream(bytes), "application/pdf", orientation);
} }
return printerName;
} else { } else {
throw new EmptyReportException(); throw new EmptyReportException();
} }

3
ems-engine/src/main/java/it/integry/core/controller/EmsEngineController.java
View File

@@ -120,7 +120,8 @@ public class EmsEngineController {
@RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody ReportTypeDTO reportTypeDTO) { @RequestBody ReportTypeDTO reportTypeDTO) {
try { try {
return ServiceRestResponse.createPositiveResponse(printerService.printReportType(reportTypeDTO)); printerService.printReportType(reportTypeDTO);
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) { } catch (Exception e) {
logger.error(request.getRequestURI(), e); logger.error(request.getRequestURI(), e);
return ServiceRestResponse.createNegativeResponse(configuration, e); return ServiceRestResponse.createNegativeResponse(configuration, e);

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

@@ -151,7 +151,7 @@ public class GiacenzaService {
List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.INSERT); List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.INSERT);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false, List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false,
new RequestDataDTO()); RequestDataDTO.systemMockupData());
UtilityEntity.throwEntitiesException(entityRet); UtilityEntity.throwEntitiesException(entityRet);
} }
@@ -166,7 +166,7 @@ public class GiacenzaService {
List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.DELETE); List<CarelliGiacenzaProg> carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.DELETE);
List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false, List<EntityBase> entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false,
new RequestDataDTO()); RequestDataDTO.systemMockupData());
UtilityEntity.throwEntitiesException(entityRet); UtilityEntity.throwEntitiesException(entityRet);
} }
@@ -429,7 +429,7 @@ public class GiacenzaService {
.setDataDoc(UtilityLocalDate.localDateToDate(collo.getDataCollo())) .setDataDoc(UtilityLocalDate.localDateToDate(collo.getDataCollo()))
.setDataDistribuzione(new Date()); .setDataDistribuzione(new Date());
collo.setOperation(OperationType.UPDATE); collo.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, new RequestDataDTO(),false, false); entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, RequestDataDTO.systemMockupData(),false, false);
UtilityEntity.throwEntityException(collo); UtilityEntity.throwEntityException(collo);
} }
} }
@@ -448,7 +448,7 @@ public class GiacenzaService {
calls.add(() -> { calls.add(() -> {
try { try {
for (EntityBase entityBase : entityList) { for (EntityBase entityBase : entityList) {
entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, new RequestDataDTO(), false, false); entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, RequestDataDTO.systemMockupData(), false, false);
} }
} catch (Exception ex) { } catch (Exception ex) {

2
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java
View File

@@ -309,7 +309,7 @@ public class ExchangeOrdiniImportService {
.setDataInizProd(field.getDataInizProd()) .setDataInizProd(field.getDataInizProd())
.setCodVzon(field.getCodVzon()) .setCodVzon(field.getCodVzon())
.setDataOrd(field.getDataInizProd()); .setDataOrd(field.getDataInizProd());
agribookFieldService.createField(multiDb, dto, EXCHANGE_USER, new RequestDataDTO()); agribookFieldService.createField(multiDb, dto, EXCHANGE_USER, RequestDataDTO.systemMockupData());
break; break;
case UPDATE: case UPDATE: