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

Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-12-06 17:04:53 +01:00
parent 6aced9972b d92e18f0cf
commit ab7f4c6d76
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ems-engine/src/main/java/it/integry/ems/system/exchange/controller/ExchangeColliImportController.java
View File

@@ -37,7 +37,7 @@ public class ExchangeColliImportController {
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(profileDb);
MultiDBTransactionManager multiDBTransactionManagerExchange = new MultiDBTransactionManager(profileDbExchange)) {
exchangeColliImportService.retrieveColli(multiDBTransactionManager, multiDBTransactionManagerExchange, requestDataDTO);
exchangeColliImportService.importLavorazione(multiDBTransactionManager, multiDBTransactionManagerExchange, requestDataDTO);
}
@@ -62,6 +62,23 @@ public class ExchangeColliImportController {
}
@RequestMapping(value = "importVendita", method = RequestMethod.GET)
public @ResponseBody
ServiceRestResponse importVendita(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDb,
@RequestParam() String profileDbExchange) throws Exception {
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(profileDb);
MultiDBTransactionManager multiDBTransactionManagerExchange = new MultiDBTransactionManager(profileDbExchange)) {
exchangeColliImportService.importVendita(multiDBTransactionManager, multiDBTransactionManagerExchange, requestDataDTO);
}
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = "getCertificati", method = RequestMethod.GET)
public @ResponseBody
ServiceRestResponse getCertificati(HttpServletRequest request,

16
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
View File

@@ -53,7 +53,7 @@ public class ExchangeColliImportService {
@Autowired
private SetupGest setupGest;
public void retrieveColli(MultiDBTransactionManager internalMultiDb,
public void importLavorazione(MultiDBTransactionManager internalMultiDb,
MultiDBTransactionManager exchangeMultiDb,
RequestDataDTO requestDataDTO) throws Exception {
@@ -68,6 +68,14 @@ public class ExchangeColliImportService {
}
public void importVendita(MultiDBTransactionManager internalMultiDb,
MultiDBTransactionManager exchangeMultiDb,
RequestDataDTO requestDataDTO) throws Exception {
this.internalImport(internalMultiDb, exchangeMultiDb, requestDataDTO, ExchangeImportSchemaManagerService.SchemaType.ColliVendita);
}
public void internalImport(MultiDBTransactionManager internalMultiDb,
MultiDBTransactionManager exchangeMultiDb,
RequestDataDTO requestDataDTO,
@@ -83,6 +91,9 @@ public class ExchangeColliImportService {
case VersamentoGrezzo:
logType = "versamento grezzo";
break;
case ColliVendita:
logType = "vendita";
break;
}
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), colliSchemaType, useTempTable);
@@ -96,6 +107,9 @@ public class ExchangeColliImportService {
} else if (colliSchemaType == ExchangeImportSchemaManagerService.SchemaType.VersamentoGrezzo) {
testataTableName = "mtb_colt_versamento_grezzo";
righeTableName = "mtb_colr_versamento_grezzo";
} else if (colliSchemaType == ExchangeImportSchemaManagerService.SchemaType.ColliVendita) {
testataTableName = "mtb_colt_vend";
righeTableName = "mtb_colr_vend";
} else {
righeTableName = null;
testataTableName = null;

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

@@ -104,7 +104,7 @@ public class ExchangeSystemManagerService {
switch (schemaType) {
case ColliLavorazione:
final ExchangeColliImportService beanColliLavorazione = ContextLoader.getCurrentWebApplicationContext().getBean(ExchangeColliImportService.class);
beanColliLavorazione.retrieveColli(internalDb, exchangeDb, requestDataDTO);
beanColliLavorazione.importLavorazione(internalDb, exchangeDb, requestDataDTO);
break;
case VersamentoGrezzo:

6
ems-engine/src/main/java/it/integry/ems/system/exchange/service/structure/ExchangeImportSchemaManagerService.java
View File

@@ -32,7 +32,8 @@ public class ExchangeImportSchemaManagerService {
Fornitori(12),
PDCAnag(13),
Destinatari(14),
DocumentiAcquisto(15);
DocumentiAcquisto(15),
ColliVendita(16),;
private final int value;
@@ -73,7 +74,7 @@ public class ExchangeImportSchemaManagerService {
put(SchemaType.DocumentiLavorazione, Arrays.asList("dtb_doct_lav", "dtb_docr_lav"));
put(SchemaType.DocumentiVendita, Arrays.asList("dtb_doct_vend", "dtb_docr_vend"));
put(SchemaType.Articoli, Arrays.asList("mtb_aart", "mtb_grup", "mtb_sgrp", "mtb_sfam", "mtb_tipi", "mtb_aart_marchio"));
put(SchemaType.PartiteMagazzinoLavorazione, Arrays.asList("mtb_partita_mag_lav"));
put(SchemaType.PartiteMagazzinoLavorazione, Collections.singletonList("mtb_partita_mag_lav"));
put(SchemaType.VersamentoGrezzo, Arrays.asList("mtb_colt_versamento_grezzo", "mtb_colr_versamento_grezzo"));
put(SchemaType.CampiRaccolta, Collections.singletonList("campi_raccolta"));
put(SchemaType.Banche, Arrays.asList("gtb_banc", "gtb_banc_azi", "gtb_banc_azi_intercode"));
@@ -83,6 +84,7 @@ public class ExchangeImportSchemaManagerService {
put(SchemaType.PDCAnag, Collections.singletonList("ctb_anag"));
put(SchemaType.Destinatari, Collections.singletonList("vtb_dest"));
put(SchemaType.DocumentiAcquisto, Arrays.asList("dtb_doct_acq", "dtb_docr_acq"));
put(SchemaType.ColliVendita, Arrays.asList("mtb_colt_vend", "mtb_colr_vend"));
}};