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

Merge branch 'develop' into feature/Rossogargano_ricambi

Browse Source
This commit is contained in:
Anthony Santoro
2024-11-20 10:09:20 +01:00
parent ff48588328 c89eb28c64
commit 1b47d866fa
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,35 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20241120093059 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createOrUpdateView("cvw_mov_black_list", "CREATE VIEW [dbo].[cvw_mov_black_list] AS\n" +
"SELECT crl_movt_rif_cmov.num_cmov, \n" +
" ctb_movt.num_cmov as num_cmov_rif,\n" +
" ctb_movt.data_cmov, \n" +
" ctb_movt.cod_ccau, \n" +
" ctb_movt.cod_anag, \n" +
" ctb_movt.cod_ireg, \n" +
" gtb_anag.rag_soc,\n" +
" ctb_movt.data_doc, \n" +
" ctb_movt.ser_doc, \n" +
" ctb_movt.num_doc,\n" +
" ctb_movt.importo\n" +
"FROM crl_movt_rif_cmov INNER JOIN ctb_movt ON crl_movt_rif_cmov.num_cmov_rif = ctb_movt.num_cmov\n" +
"LEFT OUTER JOIN gtb_anag on ctb_movt.cod_anag = gtb_anag.cod_anag");
}
@Override
public void down() throws Exception {
}
}

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

@@ -1500,7 +1500,7 @@ public class ProductionService {
" NULL,\n" +
" IIF(dtb_ordt.qta_evasa_prod = 0, dtb_ordt.qta_prod, dtb_ordt.qta_evasa_prod) AS qta_doc,\n" +
" IIF(dtb_ordt.qta_evasa_prod = 0, dtb_ordt.qta_prod, dtb_ordt.qta_evasa_prod) * dtb_ords.val_unt AS val_doc,\n" +
" dtb_ordt.Od,\n" +
" dtb_ordt.data_ord,\n" +
" dtb_ordt.num_ord\n" +
"FROM dtb_ordt\n" +
" INNER JOIN dtb_ords ON dtb_ordt.data_ord = dtb_ords.data_ord AND dtb_ordt.num_ord = dtb_ords.num_ord AND\n" +

5
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java
View File

@@ -166,6 +166,11 @@ public class ExchangeSystemManagerService {
final ExchangeDestinatariImportService beanDestinatari = ContextLoader.getCurrentWebApplicationContext().getBean(ExchangeDestinatariImportService.class);
beanDestinatari.importDestinatari(internalDb, exchangeDb, requestDataDTO);
break;
case DocumentiAcquisto:
final ExchangeDocumentImportService beanDocumentiAcquisto = ContextLoader.getCurrentWebApplicationContext().getBean(ExchangeDocumentImportService.class);
beanDocumentiAcquisto.importAcquisto(internalDb, exchangeDb, requestDataDTO);
break;
}
}