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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2024-11-26 12:16:30 +01:00
parent 90a2a3bcba 14f5bae293
commit 4b0aad2c24
2 changed files with 143 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
ems-core/src/main/java/it/integry/ems/rules/completing/SalesRules.java
View File

@@ -1093,78 +1093,149 @@ public class SalesRules extends QueryRules {
.findFirst().orElse(null);
String sql =
"WITH articoli AS (" +
"SELECT mtb_aart.cod_mart,\n" +
"mtb_aart.id_art_equi,\n " +
"mtb_aart_equi.flag_equi_prezzo\n,\n" +
"mtb_aart.unt_mis,\n" +
"mtb_aart.unt_mis2,\n" +
"mtb_aart.unt_mis3,\n" +
"mtb_aart.cod_tcol_ui,\n" +
"mtb_aart.cod_tcol_ul,\n " +
"mtb_aart.perc_sfrido\n " +
" FROM mtb_aart INNER JOIN mtb_aart_equi ON mtb_aart.id_art_equi = mtb_aart_equi.id_art_equi\n " +
" WHERE mtb_aart_equi.id_art_equi = " + UtilityDB.valueToString(idArtEqui) + " AND \n" +
"mtb_aart.cod_mart NOT IN (" + condArticoli + ") AND \n" +
"mtb_aart_equi.flag_equi_prezzo <> 'N' AND \n" +
"mtb_aart.flag_stato = 'A' AND \n" +
"mtb_aart.cod_mgrp NOT IN (SELECT value_string " +
" FROM dbo.ParseStringIntoArray((\n" +
"SELECT stb_gest_setup_depo.value\n" +
" FROM mtb_depo \n" +
"INNER JOIN stb_gest_setup_depo on mtb_depo.cod_mdep = stb_gest_setup_depo.cod_mdep AND\n" +
" stb_gest_setup_depo.gest_name = 'VTB_LIST' AND\n" +
" stb_gest_setup_depo.section = 'ART_EQUIVALENTI' AND\n" +
" stb_gest_setup_depo.key_section = 'ESCLUDI_GRUPPI_MERC'\n" +
" WHERE mtb_depo.cod_vlis = " + UtilityDB.valueToString(testata.getCodVlis()) + " AND\n" +
"stb_gest_setup_depo.value is not null), '|')))\n" +
"SELECT articoli.cod_mart,\n " +
"isnull(lisv.unt_mis_ven,articoli.unt_mis) as unt_mis_vend,\n" +
"IsNull(lisv.rap_conv, case lisv.unt_mis_ven WHEN articoli.unt_mis2 THEN articoli.unt_mis2 WHEN articoli.unt_mis3 THEN articoli.unt_mis3 ELSE 1 END ) as rap_conv,\n" +
"CASE WHEN articoli.flag_equi_prezzo = 'B' OR articoli.flag_equi_prezzo = 'T' THEN " +
UtilityDB.valueToString(datiListino.getPrzBase()) + " ELSE IsNull(lisv.prz_base,0) END as prz_base,\n" +
"CASE WHEN articoli.flag_equi_prezzo = 'R' OR articoli.flag_equi_prezzo = 'P' OR articoli.flag_equi_prezzo = 'T' THEN " +
UtilityDB.valueToString(datiListino.getRicarica()) + " ELSE IsNull(lisv.ricarico,0) END as ricarica,\n" +
"CASE WHEN articoli.flag_equi_prezzo = 'R' OR articoli.flag_equi_prezzo = 'P' OR articoli.flag_equi_prezzo = 'T' THEN\n" +
UtilityDB.valueToString(datiListino.getMaggPrzVend()) + " ELSE IsNull(lisv.magg_prz_vend,0) END as magg_prz_vend,\n" +
"compute_column.prz_vend as prz_vend,\n" +
"CASE WHEN articoli.flag_equi_prezzo = 'B' OR articoli.flag_equi_prezzo = 'R' THEN \n" +
"dbo.f_calcPrzVendIva(lisv.cod_vlis, lisv.cod_mart, compute_column.prz_vend) \n" +
"ELSE " + UtilityDB.valueToString(datiListino.getPrzVendIva()) + " END as prz_vend_iva,\n" +
"IsNull(lisv.perc_sco1,0) as perc_sco1,\n" +
"IsNull(lisv.perc_sco2,0) as perc_sco2,\n" +
"IsNull(lisv.perc_sco3,0) as perc_sco3,\n" +
"IsNull(lisv.perc_sco4,0) as perc_sco4,\n" +
"IsNull(lisv.perc_prov,0) as perc_prov,\n" +
"IsNull(lisv.fisso_prov,0) as fisso_prov,\n" +
"lisv.posizione, \n" +
"IsNull(lisv.perc_gest,0) as perc_gest,\n" +
"IsNull(lisv.val_gest,0) as val_gest,\n" +
"IsNull(lisv.perc_ispe,0) as perc_ispe,\n" +
"IsNull(lisv.val_ispe, 0) as val_ispe,\n" +
"IsNull(lisv.perc_promo, 0) as perc_promo,\n" +
"IsNull(lisv.val_promo, 0) as val_promo,\n" +
"IsNull(lisv.perc_oneri, 0) as perc_oneri,\n" +
"IsNull(lisv.val_oneri, 0) as val_oneri,\n" +
"lisv.data_agg_prz, \n" +
"CASE lisv.tipo_variazione WHEN 'I' THEN 'U' ELSE isnull(lisv.tipo_variazione,'I') END as tipo_variazione, \n" +
"CAST(" + UtilityDB.valueToString(datiListino.getNote()) + " as varchar) as note,\n" +
"IsNull(" + UtilityDB.valueToString(datiListino.getAggiornatoDa()) + ", 'PROCEDURA AGGIORNAMENTO EQUIVALENTI') as aggiornato_da, \n" +
"0 as giacenza, \n" +
"IsNull(lisv.cod_tcol_ui, articoli.cod_tcol_ui) as cod_tcol_Ui,\n" +
"IsNull(lisv.cod_tcol_ul, articoli.cod_tcol_UL) as cod_tcol_Ul,\n" +
UtilityDB.valueToString(datiListino.getFlagPrzBloccato()) + " as flag_prz_bloccato,\n" +
UtilityDB.valueToString(datiListino.getPrzVendSug()) + " as prz_vend_sug,\n" +
"case when lisv.cod_vlis is null THEN 'INSERT' ELSE 'UPDATE' END AS operation\n" +
" FROM articoli \n" +
"LEFT OUTER JOIN dbo.getListinoVendita(" + UtilityDB.valueToString(testata.getDataIniz()) + "," +
UtilityDB.valueToString(testata.getCodVlis()) + ", null) lisv ON articoli.cod_mart = lisv.cod_mart " +
"WITH articoli AS (\n" +
" SELECT \n" +
" a.cod_mart,\n" +
" a.id_art_equi,\n" +
" ae.flag_equi_prezzo,\n" +
" a.unt_mis,\n" +
" a.unt_mis2,\n" +
" a.rap_conv2,\n" +
" a.unt_mis3,\n" +
" a.rap_conv3,\n" +
" a.cod_tcol_ui,\n" +
" a.cod_tcol_ul,\n" +
" a.perc_sfrido\n" +
" FROM \n" +
" mtb_aart a\n" +
" INNER JOIN \n" +
" mtb_aart_equi ae \n" +
" ON \n" +
" a.id_art_equi = ae.id_art_equi\n" +
" WHERE \n" +
" ae.id_art_equi = :idArtEqui\n" +
" AND a.cod_mart NOT IN (:condArticoli)\n" +
" AND ae.flag_equi_prezzo <> 'N'\n" +
" AND a.flag_stato = 'A'\n" +
" AND a.cod_mgrp NOT IN (\n" +
" SELECT value_string \n" +
" FROM dbo.ParseStringIntoArray((\n" +
" SELECT s.value\n" +
" FROM \n" +
" mtb_depo d\n" +
" INNER JOIN \n" +
" stb_gest_setup_depo s \n" +
" ON \n" +
" d.cod_mdep = s.cod_mdep\n" +
" AND s.gest_name = 'VTB_LIST'\n" +
" AND s.section = 'ART_EQUIVALENTI'\n" +
" AND s.key_section = 'ESCLUDI_GRUPPI_MERC'\n" +
" WHERE \n" +
" d.cod_vlis = :codVlis\n" +
" AND s.value IS NOT NULL\n" +
" ), '|')\n" +
" )\n" +
")\n" +
"SELECT \n" +
" articoli.cod_mart,\n" +
" COALESCE(lisv.unt_mis_ven, :untMisVen, articoli.unt_mis) AS unt_mis_vend,\n" +
" ISNULL(\n" +
" lisv.rap_conv, \n" +
" CASE \n" +
" WHEN IsNull(lisv.unt_mis_ven, :untMisVen) = articoli.unt_mis2 THEN articoli.rap_conv2 \n" +
" WHEN IsNull(lisv.unt_mis_ven, :untMisVen) = articoli.unt_mis3 THEN articoli.rap_conv3 \n" +
" ELSE 1 \n" +
" END\n" +
" ) AS rap_conv,\n" +
" CASE \n" +
" WHEN articoli.flag_equi_prezzo IN ('B', 'T') THEN :przBase\n" +
" ELSE ISNULL(lisv.prz_base, 0) \n" +
" END AS prz_base,\n" +
" CASE \n" +
" WHEN articoli.flag_equi_prezzo IN ('R', 'P', 'T') THEN :ricarica\n" +
" ELSE ISNULL(lisv.ricarico, 0) \n" +
" END AS ricarica,\n" +
" CASE \n" +
" WHEN articoli.flag_equi_prezzo IN ('R', 'P', 'T') THEN :maggPrzVend\n" +
" ELSE ISNULL(lisv.magg_prz_vend, 0)\n" +
" END AS magg_prz_vend,\n" +
" compute_column.prz_vend AS prz_vend,\n" +
" CASE \n" +
" WHEN articoli.flag_equi_prezzo IN ('B', 'R') THEN \n" +
" dbo.f_calcPrzVendIva(lisv.cod_vlis, lisv.cod_mart, compute_column.prz_vend) \n" +
" ELSE :przVendIva \n" +
" END AS prz_vend_iva,\n" +
" ISNULL(lisv.perc_sco1, 0) AS perc_sco1,\n" +
" ISNULL(lisv.perc_sco2, 0) AS perc_sco2,\n" +
" ISNULL(lisv.perc_sco3, 0) AS perc_sco3,\n" +
" ISNULL(lisv.perc_sco4, 0) AS perc_sco4,\n" +
" ISNULL(lisv.perc_prov, 0) AS perc_prov,\n" +
" ISNULL(lisv.fisso_prov, 0) AS fisso_prov,\n" +
" lisv.posizione,\n" +
" ISNULL(lisv.perc_gest, 0) AS perc_gest,\n" +
" ISNULL(lisv.val_gest, 0) AS val_gest,\n" +
" ISNULL(lisv.perc_ispe, 0) AS perc_ispe,\n" +
" ISNULL(lisv.val_ispe, 0) AS val_ispe,\n" +
" ISNULL(lisv.perc_promo, 0) AS perc_promo,\n" +
" ISNULL(lisv.val_promo, 0) AS val_promo,\n" +
" ISNULL(lisv.perc_oneri, 0) AS perc_oneri,\n" +
" ISNULL(lisv.val_oneri, 0) AS val_oneri,\n" +
" lisv.data_agg_prz,\n" +
" CASE lisv.tipo_variazione \n" +
" WHEN 'I' THEN 'U' \n" +
" ELSE ISNULL(lisv.tipo_variazione, 'I') \n" +
" END AS tipo_variazione,\n" +
" CAST(:note AS VARCHAR) AS note,\n" +
" ISNULL(:aggiornatoDa, 'PROCEDURA AGGIORNAMENTO EQUIVALENTI') AS aggiornato_da,\n" +
" 0 AS giacenza,\n" +
" ISNULL(lisv.cod_tcol_ui, articoli.cod_tcol_ui) AS cod_tcol_ui,\n" +
" ISNULL(lisv.cod_tcol_ul, articoli.cod_tcol_ul) AS cod_tcol_ul,\n" +
" :flagPrzBloccato AS flag_prz_bloccato,\n" +
" :przVendSug AS prz_vend_sug,\n" +
" CASE \n" +
" WHEN lisv.cod_vlis IS NULL THEN 'INSERT' \n" +
" ELSE 'UPDATE' \n" +
" END AS operation\n" +
"FROM \n" +
" articoli \n" +
"LEFT OUTER JOIN \n" +
" dbo.getListinoVendita(:dataIniz, :codVlis, NULL) lisv \n" +
"ON \n" +
" articoli.cod_mart = lisv.cod_mart \n" +
"CROSS APPLY (\n" +
"SELECT CASE articoli.flag_equi_prezzo\n" +
"WHEN 'B' THEN dbo.f_calcPrzVend(lisv.cod_vlis, lisv.cod_mart, " + UtilityDB.valueToString(datiListino.getPrzBase()) + ", lisv.ricarico, articoli.perc_sfrido, lisv.magg_prz_vend)\n" +
"WHEN 'R' THEN dbo.f_calcPrzVend(lisv.cod_vlis, lisv.cod_mart, IsNull(lisv.prz_base,0), " + UtilityDB.valueToString(datiListino.getRicarica()) + ", articoli.perc_sfrido, " + UtilityDB.valueToString(datiListino.getMaggPrzVend()) + " )\n" +
"ELSE " + UtilityDB.valueToString(datiListino.getPrzVend()) + " END as prz_vend) compute_column\n" +
" WHERE ( lisv.tipo_variazione is null OR lisv.tipo_variazione <> 'D' ) " + whereCondPrezzoBloccato;
" SELECT \n" +
" CASE articoli.flag_equi_prezzo\n" +
" WHEN 'B' THEN \n" +
" dbo.f_calcPrzVend(\n" +
" lisv.cod_vlis, lisv.cod_mart, :przBase, lisv.ricarico, articoli.perc_sfrido, lisv.magg_prz_vend\n" +
" )\n" +
" WHEN 'R' THEN \n" +
" dbo.f_calcPrzVend(\n" +
" lisv.cod_vlis, lisv.cod_mart, ISNULL(lisv.prz_base, 0), :ricarica, articoli.perc_sfrido, :maggPrzVend\n" +
" )\n" +
" ELSE :przVend \n" +
" END AS prz_vend\n" +
") compute_column\n" +
"WHERE \n" +
" (lisv.tipo_variazione IS NULL OR lisv.tipo_variazione <> 'D')\n" +
" :whereCondPrezzoBloccato";
sql = sql.replace(":idArtEqui", UtilityDB.valueToString(idArtEqui))
.replace(":condArticoli", condArticoli)
.replace(":codVlis", UtilityDB.valueToString(testata.getCodVlis()))
.replace(":untMisVen", UtilityDB.valueToString(datiListino.getUntMisVen()))
.replace(":przBase", UtilityDB.valueToString(datiListino.getPrzBase()))
.replace(":ricarica", UtilityDB.valueToString(datiListino.getRicarica()))
.replace(":maggPrzVend", UtilityDB.valueToString(datiListino.getMaggPrzVend()))
.replace(":przVendIva", UtilityDB.valueToString(datiListino.getPrzVendIva()))
.replace(":note", UtilityDB.valueToString(datiListino.getNote()))
.replace(":aggiornatoDa", UtilityDB.valueToString(datiListino.getAggiornatoDa()))
.replace(":flagPrzBloccato", UtilityDB.valueToString(datiListino.getFlagPrzBloccato()))
.replace(":przVendSug", UtilityDB.valueToString(datiListino.getPrzVendSug()))
.replace(":przVend", UtilityDB.valueToString(datiListino.getPrzVend()))
.replace(":dataIniz", UtilityDB.valueToString(testata.getDataIniz()))
.replace(":whereCondPrezzoBloccato", whereCondPrezzoBloccato);
List<MtbLisvData> articoliDaAggiornare = new ResultSetMapper().mapQuerySetToList(conn, sql, MtbLisvData.class, OperationType.INSERT_OR_UPDATE);
for (MtbLisvData l : articoliDaAggiornare) {

2
ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java
View File

@@ -721,7 +721,7 @@ public class SteUPService {
}
// barcodes = pluRepo.stream().filter(a-> !finalBarcodes.contains(((String) a.get("barcode")))).map(a->(String) a.get("barcode")).collect(Collectors.toList());
} else {
barcodes = pluRepo.stream().map(x -> x.get("barcode").toString()).collect(Collectors.toList());
barcodes = pluRepo.stream().filter(x -> x.get("barcode") != null).map(x -> x.get("barcode").toString()).collect(Collectors.toList());
//barcodes.stream().filter(a -> pluRepo.stream().map(x -> x.get("barcode")).collect(Collectors.toList()).contains(a)).collect(Collectors.toList());
}
}