diff --git a/.idea/runConfigurations/Tomcat_9__RistoCash_.xml b/.idea/runConfigurations/Tomcat_9__RistoCash_.xml new file mode 100644 index 0000000000..0036214a56 --- /dev/null +++ b/.idea/runConfigurations/Tomcat_9__RistoCash_.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java index 7c5a264739..64a50fc7e9 100644 --- a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java +++ b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java @@ -67,7 +67,7 @@ public class ImportListiniAcquistoApuliaCarrefourService { } if (UtilityDebug.isDebugExecution() && !UtilityDebug.isIntegryServer()){ - pathFile = "\\\\serverdb\\BulkFile\\Apulia\\carelli"; + pathFile = "\\\\serverdb\\BulkFile\\Apulia\\" + multiDBTransactionManager.getPrimaryDatasource().getProfile(); } //INSERIMENTO DATI DA FILE @@ -312,17 +312,15 @@ public class ImportListiniAcquistoApuliaCarrefourService { " CASE WHEN data_iniz < '2020/01/01' THEN '2020/01/01' ELSE data_iniz END AS data_iniz,\n" + " tipo_variazione\n" + " FROM dbo.getlistinoacquisto([DATA_IMPORT], NULL, NULL, NULL, 'N', NULL) lisa\n" + - " LEFT OUTER JOIN (SELECT value_string AS cod_alis\n" + + " WHERE lisa.cod_alis LIKE 'AP%'\n" + + " AND lisa.tipo_variazione <> 'D'\n" + + " AND lisa.tipo_variazione IS NOT NULL\n" + + " AND NOT EXISTS (SELECT value_string AS cod_alis\n" + " FROM dbo.parsestringintoarray(\n" + " (SELECT dbo.getgestsetup('IMPORT_[TYPE]',\n" + " '[FORMAT]',\n" + " 'LISTINI_DA_ESCLUDERE')),\n" + - " '|')) listini_esclusi\n" + - " ON lisa.cod_alis = listini_esclusi.cod_alis\n" + - " WHERE lisa.cod_alis LIKE 'AP%'\n" + - " AND lisa.tipo_variazione <> 'D'\n" + - " AND lisa.tipo_variazione IS NOT NULL\n" + - " AND listini_esclusi.cod_alis IS NULL) lisa\n" + + " '|') listini_esclusi WHERE lisa.cod_alis = listini_esclusi.value_string)) lisa\n" + " ON apulia.cod_alis = lisa.cod_alis AND apulia.cod_art_for = lisa.cod_art_for\n" + " LEFT OUTER JOIN mtb_lisa ON apulia.cod_alis = mtb_lisa.cod_alis AND apulia.cod_art_for = mtb_lisa.cod_art_for\n" + " LEFT OUTER JOIN mtb_aart ON mtb_lisa.cod_mart = mtb_aart.cod_mart\n" +