Integry/PVM
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Visualizzato elenco colli e cambiata la query

Browse Source
This commit is contained in:
Mina Ruggiero
2023-08-24 16:18:08 +02:00
parent 3321306c3a
commit 4b5839c2b3
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public_html/gest-lib/accettazione/include/step1-lista_colli.php
View File

@@ -22,7 +22,7 @@
</div>
<div class="col-xs-10">
<?= $item["num_collo"] . " del " . strftime(Format::strftimeDMY, $item["data_collo"]) ?>
<?= !is_null($item["annotazioni"]) ? "<br/><span class='text-muted'>" . htmlentities($item["annotazioni"]) . "</span>" : "" ?>
<?= !is_null($item["annotazioni"]) ? "<br/><span class='text-muted text-xs'>" . htmlentities($item["annotazioni"]) . "</span>" : "" ?>
</div>
</div>
</a><?

10
public_html/gest-lib/accettazione/include/step1.php
View File

@@ -1,24 +1,24 @@
<div style="max-width: 1280px;" class="margin-left-right-auto">
<div data-page_step="1">
<div class="row">
<div class="col-xs-12 col-sm-8">
<div class="col-xs-12 col-sm-10">
<input id="txt-filter" type="text" class="form-control input-lg" placeholder="Filtra risultati"
autocomplete="off"/>
</div>
<div class="col-xs-12 col-sm-4">
<div class="col-xs-12 col-sm-2">
<button class="bt_confStep1 mb-10 btn btn-lg btn-primary btn-block" type="button">
<i class="fa fa-arrow-circle-right"></i> <span>Avanti</span>
</button>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-5">
<? include "step1-lista_ordini.php"; ?>
</div>
<div class="col-xs-6">
<div class="col-xs-5">
<? include "step1-lista_documenti.php"; ?>
</div>
<div class="col-xs-3 hidden">
<div class="col-xs-2">
<? include "step1-lista_colli.php"; ?>
</div>
</div>

26
public_html/gest-lib/accettazione/sql/get_colli.sql
View File

@@ -3,6 +3,9 @@ SELECT mtb_colt.data_collo,
mtb_colt.ser_collo,
mtb_colt.gestione,
CASE
WHEN mtb_colt.cod_dtip_provv IS NOT NULL THEN
mtb_colt.cod_dtip_provv + ' n. '+ mtb_colt.ser_doc_provv + '/' +
CAst(mtb_colt.num_doc_provv AS VARCHAR) + ' del ' + CONVERT(VARCHAR(10), mtb_colt.data_doc_provv, 103)
WHEN mtb_colt.data_ord IS NOT NULL
THEN 'Ord. n. ' + CAST(mtb_colt.num_ord AS VARCHAR) + ' del ' +
CONVERT(VARCHAR(10), mtb_colt.data_collo, 103)
@@ -10,16 +13,31 @@ SELECT mtb_colt.data_collo,
THEN 'Note: ' + mtb_colt.annotazioni
ELSE NULL
END AS annotazioni,
COUNT(mtb_colr.cod_mart) AS counter
COUNT(mtb_colr.cod_mart) AS counter,
mtb_colt.cod_dtip_provv,
mtb_colt.data_doc_provv,
mtb_colt.cod_anag,
mtb_colt.ser_doc_provv,
mtb_colt.num_doc_provv
FROM mtb_colt
LEFT OUTER JOIN mtb_colr ON mtb_colt.gestione = mtb_colr.gestione AND
INNER JOIN mtb_colr ON mtb_colt.gestione = mtb_colr.gestione AND
mtb_colt.data_collo = mtb_colr.data_collo AND
mtb_colt.num_collo = mtb_colr.num_collo AND
mtb_colt.ser_collo = mtb_colr.ser_collo
INNER JOIN Wdtb_doct on mtb_colt.cod_anag = Wdtb_doct.cod_anag and
mtb_colt.cod_dtip_provv = Wdtb_doct.cod_dtip and
mtb_colt.data_doc_provv = Wdtb_doct.data_doc and
mtb_colt.ser_doc_provv = Wdtb_doct.ser_doc and
mtb_colt.num_doc_provv = Wdtb_doct.num_doc
WHERE mtb_colt.cod_mdep = '[cod_mdep]'
AND mtb_colt.cod_dtip IS NULL
AND mtb_colt.gestione = 'A'
AND mtb_colt.cod_dtip_provv IS NULL
AND wdtb_doct.flag_elaborato = 'I'
GROUP BY mtb_colt.gestione, mtb_colt.data_collo, mtb_colt.num_collo, mtb_colt.ser_collo, mtb_colt.annotazioni,
mtb_colt.data_ord, mtb_colt.num_ord
mtb_colt.data_ord, mtb_colt.num_ord,
mtb_colt.cod_dtip_provv,
mtb_colt.data_doc_provv,
mtb_colt.cod_anag,
mtb_colt.ser_doc_provv,
mtb_colt.num_doc_provv
ORDER BY mtb_colt.data_collo DESC, mtb_colt.ser_collo, mtb_colt.num_collo DESC

17
public_html/gest-lib/accettazione/sql/step2_griglia.sql
View File

@@ -66,20 +66,17 @@ FROM (SELECT dtb_ordr.data_ord,
Wdtb_docr.num_doc,
Wdtb_docr.cod_art_for,
ROW_NUMBER() OVER (PARTITION BY wdtb_docr.cod_mart ORDER BY wdtb_doct.listino, Wdtb_docr.data_doc, Wdtb_docr.ser_doc, Wdtb_docr.num_doc ) as riga_art
FROM Wdtb_doct,
gtb_anag,
Wdtb_docr
FROM Wdtb_doct
INNER JOIN gtb_anag ON Wdtb_doct.cod_anag = gtb_anag.cod_anag
INNER JOIN Wdtb_docr ON Wdtb_doct.cod_anag = Wdtb_docr.cod_anag
AND Wdtb_doct.cod_dtip = Wdtb_docr.cod_dtip
AND Wdtb_doct.data_doc = Wdtb_docr.data_doc
AND Wdtb_doct.ser_doc = Wdtb_docr.ser_doc
AND Wdtb_doct.num_doc = Wdtb_docr.num_doc
LEFT OUTER JOIN mtb_aart ON Wdtb_docr.cod_mart = mtb_aart.cod_mart
WHERE Wdtb_doct.cod_mdep = '[cod_mdep]'
AND Wdtb_doct.flag_elaborato = 'I'
AND Wdtb_doct.cod_anag = gtb_anag.cod_anag
AND Wdtb_doct.cod_anag = Wdtb_docr.cod_anag
AND Wdtb_doct.cod_dtip = Wdtb_docr.cod_dtip
AND Wdtb_doct.data_doc = Wdtb_docr.data_doc
AND Wdtb_doct.ser_doc = Wdtb_docr.ser_doc
AND Wdtb_doct.num_doc = Wdtb_docr.num_doc
AND ([COND_DOC])
GROUP BY Wdtb_docr.cod_art_for, Wdtb_docr.cod_mart, Wdtb_doct.listino, Wdtb_docr.data_doc, Wdtb_docr.ser_doc,
Wdtb_docr.num_doc
) documenti ON ordini.cod_mart = documenti.cod_mart AND ordini.riga_art = documenti.riga_art