Merge branch 'master' into develop
This commit is contained in:
@@ -46,9 +46,6 @@ public class ExchangeColliImportService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ExchangePartiteMagazzinoImportService exchangePartiteMagazzinoImportService;
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SetupGest setupGest;
|
private SetupGest setupGest;
|
||||||
|
|
||||||
@@ -76,7 +73,6 @@ public class ExchangeColliImportService {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), colliSchemaType, useTempTable);
|
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), colliSchemaType, useTempTable);
|
||||||
exchangePartiteMagazzinoImportService.importPartiteMagazzinoLavorazione(internalMultiDb, exchangeMultiDb, requestDataDTO);
|
|
||||||
|
|
||||||
String testataTableName = null;
|
String testataTableName = null;
|
||||||
String righeTableName = null;
|
String righeTableName = null;
|
||||||
|
|||||||
@@ -40,9 +40,6 @@ public class ExchangeDocumentImportService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ExchangePartiteMagazzinoImportService exchangePartiteMagazzinoImportService;
|
|
||||||
|
|
||||||
private final Logger logger = LogManager.getLogger();
|
private final Logger logger = LogManager.getLogger();
|
||||||
|
|
||||||
public void importTestateDocumentiLavorazione(MultiDBTransactionManager internalMultiDb, MultiDBTransactionManager exchangeMultiDb, RequestDataDTO requestDataDTO) throws Exception {
|
public void importTestateDocumentiLavorazione(MultiDBTransactionManager internalMultiDb, MultiDBTransactionManager exchangeMultiDb, RequestDataDTO requestDataDTO) throws Exception {
|
||||||
@@ -52,8 +49,6 @@ public class ExchangeDocumentImportService {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), ExchangeImportSchemaManagerService.SchemaType.DocumentiLavorazione, useTempTable);
|
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), ExchangeImportSchemaManagerService.SchemaType.DocumentiLavorazione, useTempTable);
|
||||||
exchangePartiteMagazzinoImportService.importPartiteMagazzinoLavorazione(internalMultiDb, exchangeMultiDb, requestDataDTO);
|
|
||||||
|
|
||||||
|
|
||||||
final List<DtbDoct> exchangeImportedTestateData = importTestateDocumentiLavorazione(
|
final List<DtbDoct> exchangeImportedTestateData = importTestateDocumentiLavorazione(
|
||||||
exchangeMultiDb.getPrimaryConnection(),
|
exchangeMultiDb.getPrimaryConnection(),
|
||||||
|
|||||||
@@ -48,9 +48,6 @@ public class ExchangeOrdiniImportService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
private ExchangeImportDataManagerService exchangeImportDataManagerService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ExchangePartiteMagazzinoImportService exchangePartiteMagazzinoImportService;
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private AgribookFieldService agribookFieldService;
|
private AgribookFieldService agribookFieldService;
|
||||||
|
|
||||||
@@ -61,7 +58,6 @@ public class ExchangeOrdiniImportService {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), ExchangeImportSchemaManagerService.SchemaType.OrdiniLavorazione, useTempTable);
|
exchangeImportSchemaManagerService.syncSchema(exchangeMultiDb.getPrimaryConnection(), ExchangeImportSchemaManagerService.SchemaType.OrdiniLavorazione, useTempTable);
|
||||||
exchangePartiteMagazzinoImportService.importPartiteMagazzinoLavorazione(internalMultiDb, exchangeMultiDb, requestDataDTO);
|
|
||||||
|
|
||||||
final List<DtbOrdt> exchangeImportedMtbColts = importOrdiniLavorazione(
|
final List<DtbOrdt> exchangeImportedMtbColts = importOrdiniLavorazione(
|
||||||
exchangeMultiDb.getPrimaryConnection(),
|
exchangeMultiDb.getPrimaryConnection(),
|
||||||
|
|||||||
Reference in New Issue
Block a user