Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java

@@ -1148,13 +1148,11 @@ public class ProductionService {
 
     public List<EntityBase> distribuzioneMateriali() throws Exception {
         String sql =
-                "SELECT *\n" +
-                        "FROM dtb_doct\n" +
-                        "WHERE cod_dtip IN (SELECT value\n" +
-                        "                   FROM stb_gest_setup\n" +
-                        "                   WHERE gest_name = 'W_PORDI_RC'\n" +
-                        "                     AND section = 'SETUP_DOCUMENTI'\n" +
-                        "                     AND key_section = 'COD_DTIP_SCAR')\n" +
+                "SELECT dtb_doct.*\n" +
+                        "FROM dtb_doct INNER JOIN dtb_tipi ON dtb_doct.cod_dtip = dtb_tipi.cod_dtip\n" +
+                        "WHERE dtb_tipi.gestione = 'L' \n" +
+                        "  AND dtb_doct.id_lotto is not null \n" +
+                        "  AND (dtb_tipi.segno_qta_car < 0 OR segno_qta_scar > 0 ) \n" +
                         "  AND data_doc BETWEEN DATEADD(MONTH, -1, CAST(GETDATE() AS DATE)) AND CAST(GETDATE() AS DATE)";
 
         List<DtbDoct> dtbDocts = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbDoct.class);