aggiunto tipo raggruppamento nei listini ed esclusi i listini con listino di riferimento

This commit is contained in:
2023-07-27 15:04:29 +02:00
parent 9680eff200
commit aba5108274
3 changed files with 24 additions and 10 deletions

View File

@@ -43,10 +43,14 @@ class ContoEconomicoProdotto {
public static function isUsaCostoMercato() {
$gestSetup = new GestSetup();
return $gestSetup->section("VERIFICA_AGGIORNAMENTO_PREZZI")->keySection("USA_COSTO_MERC")->asBoolean()->defaultValue(false)->get();
}
private static function getTipoRagguppamento() {
$GestSetup = new \GestSetup;
return $GestSetup->keySection("TIPO_RAGGRUPPAMENTO")->defaultValue("T")->get();
}
public static function get_contattiListino($codVlis) {
$Query = new Query;
return $Query->importSqlFile("list-contatti-listino")->setVar("cod_vlis", $codVlis)->toRet()->execute();
@@ -109,7 +113,8 @@ class ContoEconomicoProdotto {
$QueryInterna = new Query;
$QueryInterna->importSqlFile("list-articoli-listino_interna")
->setVar("cod_vlis", $data["cod_vlis"])
->setDateVar("data_validita", $dataValidita);
->setDateVar("data_validita", $dataValidita)
->setVar("tipo_ragg", ContoEconomicoProdotto::getTipoRagguppamento());
if (isset($data["cod_mart"])) {
$QueryInterna->setVar("cod_mart", $data["cod_mart"])

View File

@@ -1,7 +1,15 @@
SELECT ISNULL(mtb_aart.cod_mtip, '') AS cod_mtip,
ISNULL(mtb_tipi.descrizione, 'ALTRO') AS descr_tipi,
ISNULL(mtb_aart.cod_mstp, '') AS cod_mstp,
ISNULL(mtb_stip.descrizione, '') AS descr_stipi,
SELECT case '[tipo_ragg]'
when 'T' THEN ISNULL(mtb_aart.cod_mtip, '')
when 'G' THEN mtb_aart.cod_mgrp ELSE '' END AS cod_mtip,
case '[tipo_ragg]'
when 'T' THEN ISNULL(mtb_tipi.descrizione, '')
when 'G' THEN mtb_grup.descrizione ELSE '' END AS descr_tipi,
case '[tipo_ragg]'
when 'T' THEN ISNULL(mtb_aart.cod_mstp, '')
when 'G' THEN mtb_aart.cod_mgrp ELSE '' END AS cod_mstp,
case '[tipo_ragg]'
when 'T' THEN ISNULL(mtb_stip.descrizione, '')
when 'G' THEN mtb_sgrp.descrizione ELSE '' END AS descr_stipi,
data_iniz,
listino.descrizione AS descr_listino,
listino.cod_mart,
@@ -38,6 +46,7 @@ SELECT ISNULL(mtb_aart.cod_mtip, '')
listino.note,
CASE WHEN listino.system_note IS NULL THEN 'N' ELSE 'S' END AS has_storico
FROM dbo.getListinoVendita('[data_validita]', '[cod_vlis]', '[cod_mart]') listino
INNER JOIN mtb_aart ON listino.cod_mart = mtb_aart.cod_mart
LEFT OUTER JOIN mtb_tcol ON listino.cod_tcol_UL = mtb_tcol.cod_tcol
LEFT OUTER JOIN (SELECT cod_vlis,
MAX(sconto1) AS sconto1,
@@ -47,11 +56,11 @@ FROM dbo.getListinoVendita('[data_validita]', '[cod_vlis]', '[cod_mart]') listin
WHERE cod_vlis IS NOT NULL
AND vtb_clie.flag_stato = 'A'
AND (sconto1 <> 0 OR sconto2 <> 0)
GROUP BY cod_vlis) vtb_clie ON vtb_clie.cod_vlis = listino.cod_vlis,
mtb_aart
GROUP BY cod_vlis) vtb_clie ON vtb_clie.cod_vlis = listino.cod_vlis
INNER JOIN mtb_grup ON mtb_aart.cod_mgrp = mtb_grup.cod_mgrp
INNER JOIN mtb_sgrp ON mtb_aart.cod_mgrp = mtb_sgrp.cod_mgrp AND mtb_aart.cod_msgr = mtb_sgrp.cod_msgr
LEFT OUTER JOIN mtb_tipi ON mtb_aart.cod_mtip = mtb_tipi.cod_mtip
LEFT OUTER JOIN mtb_stip ON mtb_aart.cod_mtip = mtb_stip.cod_mtip AND
mtb_aart.cod_mstp = mtb_stip.cod_mstp
WHERE listino.tipo_variazione <> 'D'
AND listino.cod_mart = mtb_aart.cod_mart
AND listino.flag_attivo = 'S'

View File

@@ -1,4 +1,4 @@
SELECT cod_vlis, descrizione
FROM vtb_list
WHERE flag_attivo = 'S'
WHERE flag_attivo = 'S' and cod_vlis_rif is null
ORDER BY descrizione