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

Merge branch 'master' into feature/RefactoringGestioneColli
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:28:58 +02:00
parent 2b781e795a b0bf6da843
commit 4fca7a604b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ public class ProductionOrderDataHandlerService {
}
String query;
if (flagEvaso.equalsIgnoreCase("E")) {
if ("E".equalsIgnoreCase(flagEvaso)) {
query = (
"WITH colli AS (SELECT mtb_colt.gestione,\n" +
" mtb_colt.data_ord,\n" +
@@ -220,6 +220,8 @@ public class ProductionOrderDataHandlerService {
" ordl.riga_ord_rif riga_ord_prod,\n" +
" ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_prod,\n" +
" colli.data_scad,\n" +
" jtb_comt.cod_jcom,\n" +
" jtb_comt.descrizione as descrizione_commessa,\n" +
" jl.id_lotto\n" +
"FROM dtb_ordt\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" +
" ordl.data_ord = colli.data_ord AND\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" +
" ON steps.cod_jfas = jl.cod_jfas AND\n" +
" ordl.gestione = jl.gestione AND\n" +
@@ -245,12 +248,12 @@ public class ProductionOrderDataHandlerService {
" dtb_ordt.num_ord,\n" +
" ordl.gestione,\n" +
" ordl.data_ord,\n" +
" ordl.num_ord" )
" ordl.num_ord")
.replace("[START_DATE]", UtilityDB.valueToString(startDate))
.replace("[END_DATE]", UtilityDB.valueToString(endDate));
if (linee != null ) {
query = UtilityDB.addwhereCond(query, "ordl.cod_jfas IN (" + UtilityDB.listValueToString(linee) + ")", true);
if (linee != null) {
query = UtilityDB.addwhereCond(query, "steps.cod_jfas IN (" + UtilityDB.listValueToString(linee) + ")", true);
}
} else {
query = "SELECT * FROM MES_GetWorkOrders(" +
@@ -270,7 +273,7 @@ public class ProductionOrderDataHandlerService {
if (ordiniLavorazioneList == null || ordiniLavorazioneList.isEmpty())
return null;
if (flagEvaso.equalsIgnoreCase("E")) return ordiniLavorazioneList;
if ("E".equalsIgnoreCase(flagEvaso)) return ordiniLavorazioneList;
//Filter by codJfas
if (linee != null) {

2
ems-engine/src/main/java/it/integry/ems/logistic/Import/service/MetalSistemImportService.java
View File

@@ -558,6 +558,7 @@ public class MetalSistemImportService {
colT.setNumCollo(0);
colT.setCodMdep(codMdep);
colT.setActivityId(activityID);
colT.setBarcodeUl(null);
colT.setMtbColr(new ArrayList<>());
colT.setMtbCols(new ArrayList<>());
colT.setPosizione(posizioneDefault);
@@ -697,6 +698,7 @@ public class MetalSistemImportService {
colTNew.setMtbColr(new ArrayList<>());
colTNew.setMtbCols(new ArrayList<>());
colTNew.setPosizione(posizioneDefault);
colTNew.setBarcodeUl(null);
colliMagaz.add(colTNew);
colTDelete = (MtbColt) colT.clone();