Merge branch 'master' into develop
This commit is contained in:
@@ -343,7 +343,7 @@ public class GiacenzaService {
|
|||||||
" AND mtb_colt.data_collo >= %s\n" +
|
" AND mtb_colt.data_collo >= %s\n" +
|
||||||
" AND mtb_colt.data_distribuzione is null \n" +
|
" AND mtb_colt.data_distribuzione is null \n" +
|
||||||
" AND mtb_colt.cod_mdep = %s\n" +
|
" AND mtb_colt.cod_mdep = %s\n" +
|
||||||
" AND exists (select * from carelli_giacenza_prog c where c.cod_mdep = mtb_colt.cod_mdep and c.cod_mart = mtb_colr.cod_mart and (c.data_reg < mtb_colt.data_collo or IsNull(tipo_car, 'G') = 'G' ))\n " +
|
" AND exists (select * from carelli_giacenza_prog c where c.cod_mdep = mtb_colt.cod_mdep and c.cod_mart = art.cod_mart_mov and (c.data_reg < mtb_colt.data_collo or IsNull(tipo_car, 'G') = 'G' ))\n " +
|
||||||
"GROUP BY art.cod_mart_mov, mtb_colt.data_ins",
|
"GROUP BY art.cod_mart_mov, mtb_colt.data_ins",
|
||||||
codDtipRett, dataIniz, codMdep);
|
codDtipRett, dataIniz, codMdep);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user