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

Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
jenkins
2025-07-08 17:49:25 +02:00
parent 41bf822234 3827fd1fa6
commit 489603300d
3 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250708161926.java Normal file
View File

@@ -0,0 +1,60 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250708161926 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if ( isCustomer(IntegryCustomer.RossoGargano)){
executeStatement("UPDATE dtb_doct\n" +
"SET id_viaggio = t.id_viaggio_ord\n" +
"FROM dtb_doct\n" +
" INNER JOIN (SELECT dtb_doct.cod_anag,\n" +
" dtb_doct.cod_dtip,\n" +
" dtb_doct.ser_doc,\n" +
" dtb_doct.num_doc,\n" +
" dtb_doct.data_doc,\n" +
" MAX(dtb_ordr.id_viaggio) id_viaggio_ord\n" +
" FROM dtb_doct\n" +
" INNER JOIN dtb_docr ON dtb_doct.cod_anag = dtb_docr.cod_anag AND\n" +
" dtb_doct.cod_dtip = dtb_docr.cod_dtip AND\n" +
" dtb_doct.data_doc = dtb_docr.data_doc AND\n" +
" dtb_doct.ser_doc = dtb_docr.ser_doc AND\n" +
" dtb_doct.num_doc = dtb_docr.num_doc\n" +
" INNER JOIN dtb_ordr ON dtb_doct.gestione = dtb_ordr.gestione AND\n" +
" dtb_docr.data_ord = dtb_ordr.data_ord AND\n" +
" dtb_docr.num_ord = dtb_ordr.num_ord AND\n" +
" dtb_docr.riga_ord = dtb_ordr.riga_ord\n" +
" INNER JOIN dtb_tipi ON dtb_doct.cod_dtip = dtb_tipi.cod_dtip AND\n" +
" dtb_tipi.tipo_emissione = 'DIRETTA'\n" +
" INNER JOIN gtb_porto ON gtb_porto.porto = dtb_doct.incoterms AND gtb_porto.costo = 2\n" +
" INNER JOIN vtb_vett ON dtb_doct.cod_vvet = vtb_vett.cod_vvet\n" +
" INNER JOIN vtb_viaggi ON dtb_ordr.id_viaggio = vtb_viaggi.id_viaggio\n" +
" WHERE dtb_doct.data_doc >= '2025/07/01'\n" +
" AND dtb_doct.gestione = 'V'\n" +
" AND dtb_doct.id_viaggio IS NULL\n" +
" AND dtb_ordr.id_viaggio IS NOT NULL\n" +
" AND EXISTS (SELECT * FROM mtb_tcol WHERE mtb_tcol.cod_mart = dtb_docr.cod_mart)\n" +
" GROUP BY dtb_doct.cod_anag, dtb_doct.cod_dtip, dtb_doct.ser_doc, dtb_doct.num_doc,\n" +
" dtb_doct.data_doc) t ON\n" +
" dtb_doct.cod_anag = t.cod_anag AND dtb_doct.cod_dtip = t.cod_dtip AND\n" +
" dtb_doct.data_doc = t.data_doc AND dtb_doct.ser_doc = t.ser_doc AND\n" +
" dtb_doct.num_doc = t.num_doc " ,
"update dtb_doct set dtb_doct.cod_vvet = vtb_viaggi.cod_vvet\n" +
"from dtb_doct inner join vtb_viaggi on dtb_doct.id_viaggio = vtb_viaggi.id_viaggio\n" +
"where dtb_doct.cod_dtip = 'DDTP-'\n" +
"and dtb_doct.data_doc>='2025/07/01'\n" +
"and dtb_doct.cod_vvet is null");
}
}
@Override
public void down() throws Exception {
}
}

10
ems-engine/src/main/java/it/integry/ems/document/dto/ULRowDTO.java
View File

@@ -11,6 +11,7 @@ public class ULRowDTO {
private String partitaMag;
private LocalDate dataScad;
private BigDecimal qtaCol;
private BigDecimal numCnf;
private LocalDate dataOrd;
private Integer numOrd;
private Integer rigaOrd;
@@ -61,6 +62,15 @@ public class ULRowDTO {
return this;
}
public BigDecimal getNumCnf() {
return numCnf;
}
public ULRowDTO setNumCnf(BigDecimal numCnf) {
this.numCnf = numCnf;
return this;
}
public LocalDate getDataOrd() {
return dataOrd;
}

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

@@ -105,6 +105,8 @@ public class ViaggiService {
.setCodMdep(creaViaggioDTO.getCodMdep())
.setCodAnag(datiClienteFornTrasp.getCodAnag())
.setIdViaggio(viaggio.getIdViaggio())
.setCodVvet(viaggio.getCodVvet())
.setCodFornTrasp(viaggio.getCodFornTrasp())
.setListino(listino)
.setDtbDocr(new ArrayList<>());