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-02-07 16:55:23 +01:00
parent 1b31a31f50 934c15fa24
commit a131410b91
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,12 +846,12 @@ public class VariazioniPVService {
CodAlisType codAlisType = objectFactory.createCodAlisType();
String query =
"with arts as (\n" +
/*"with arts as (\n" +
"select cod_mart, cod_mart as cod_mart_griglia from mtb_aart\n" +
"union all\n" +
"select cod_mart, cod_comp as cod_mart_griglia from mtb_comp \n"+
"union all\n" +
"select cod_comp, cod_mart as cod_mart_griglia from mtb_comp )\n"+
"select cod_comp, cod_mart as cod_mart_griglia from mtb_comp )\n"+ */
"SELECT TOP 1 griglia.data_validita, " +
" griglia.cod_mdep, " +
" griglia.cod_mart, " +
@@ -862,9 +862,9 @@ public class VariazioniPVService {
" FROM atb_list\n" +
"INNER JOIN dbo.getGrigliaAcquisto(" + UtilityDB.valueDateToString(dataValidita, CommonConstants.DATE_FORMAT_YMD) + ", NULL, " +
UtilityDB.valueToString(codMdep) + ", NULL, NULL) griglia ON atb_list.cod_alis = griglia.cod_alis\n" +
"INNER JOIN arts on griglia.cod_mart = arts.cod_mart_griglia \n" +
//"INNER JOIN arts on griglia.cod_mart = arts.cod_mart_griglia \n" +
" WHERE griglia.tipo_variazione <> 'D' AND " +
" arts.cod_mart = " + UtilityDB.valueToString(codMart) + "\n " +
" griglia.cod_mart = " + UtilityDB.valueToString(codMart) + "\n " +
" ORDER BY griglia.data_validita DESC ";
HashMap<String, Object> datiGriglia = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query);