Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Valerio Castellana
2025-07-03 17:04:02 +02:00
parent 80483d105b dae4d06c69
commit 25355ad223
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java
View File

@@ -220,6 +220,8 @@ public class ProductionOrderDataHandlerService {
" ordl.riga_ord_rif riga_ord_prod,\n" + " ordl.riga_ord_rif riga_ord_prod,\n" +
" ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_prod,\n" + " ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_prod,\n" +
" colli.data_scad,\n" + " colli.data_scad,\n" +
" jtb_comt.cod_jcom,\n" +
" jtb_comt.descrizione as descrizione_commessa,\n" +
" jl.id_lotto\n" + " jl.id_lotto\n" +
"FROM dtb_ordt\n" + "FROM dtb_ordt\n" +
" INNER JOIN dtb_ordt ordl ON dtb_ordt.gestione = ordl.gestione_rif\n" + " INNER JOIN dtb_ordt ordl ON dtb_ordt.gestione = ordl.gestione_rif\n" +
@@ -232,6 +234,7 @@ public class ProductionOrderDataHandlerService {
" INNER JOIN colli ON colli.gestione = ordl.gestione AND\n" + " INNER JOIN colli ON colli.gestione = ordl.gestione AND\n" +
" ordl.data_ord = colli.data_ord AND\n" + " ordl.data_ord = colli.data_ord AND\n" +
" ordl.num_ord = colli.num_ord \n" + " ordl.num_ord = colli.num_ord \n" +
" LEFT OUTER JOIN jtb_comt ON ordl.cod_jcom = jtb_comt.cod_jcom\n" +
" LEFT OUTER JOIN jtb_lotr jl\n" + " LEFT OUTER JOIN jtb_lotr jl\n" +
" ON steps.cod_jfas = jl.cod_jfas AND\n" + " ON steps.cod_jfas = jl.cod_jfas AND\n" +
" ordl.gestione = jl.gestione AND\n" + " ordl.gestione = jl.gestione AND\n" +
@@ -245,11 +248,11 @@ public class ProductionOrderDataHandlerService {
" dtb_ordt.num_ord,\n" + " dtb_ordt.num_ord,\n" +
" ordl.gestione,\n" + " ordl.gestione,\n" +
" ordl.data_ord,\n" + " ordl.data_ord,\n" +
" ordl.num_ord" ) " ordl.num_ord")
.replace("[START_DATE]", UtilityDB.valueToString(startDate)) .replace("[START_DATE]", UtilityDB.valueToString(startDate))
.replace("[END_DATE]", UtilityDB.valueToString(endDate)); .replace("[END_DATE]", UtilityDB.valueToString(endDate));
if (linee != null ) { if (linee != null) {
query = UtilityDB.addwhereCond(query, "steps.cod_jfas IN (" + UtilityDB.listValueToString(linee) + ")", true); query = UtilityDB.addwhereCond(query, "steps.cod_jfas IN (" + UtilityDB.listValueToString(linee) + ")", true);
} }
} else { } else {