admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UWVA#88793 Datummogelijkheden verbruiksartikelen catalogus per locatie

Browse Source 
svn path=/Website/branches/v2025.3/; revision=70883
This commit is contained in:
Erik Groener
2025-11-11 09:14:55 +00:00
parent 9800eb7f39
commit bcd2d6d5b7
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/RES/res_show_objcat.asp
View File

@@ -733,8 +733,8 @@ var bulkFields = " distinct "
+ " , rr.res_rsv_ruimte_tot"
+ " , ra.res_rsv_artikel_verwijder ddVerwijder"
+ " , CASE "
+ " WHEN (ra.res_rsv_artikel_levering BETWEEN res_rsv_ruimte_van "
+ " AND res_rsv_ruimte_tot) "
+ " WHEN (ra.res_rsv_artikel_levering BETWEEN rr.res_rsv_ruimte_van "
+ " AND rr.res_rsv_ruimte_tot) "
+ " THEN 1 "
+ " ELSE 0 "
+ " END levbinnentijd"
@@ -742,12 +742,16 @@ var bulkFields = " distinct "
+ " , res_rsv_artikel_approved"
+ " , COALESCE (ks.prs_kostensoort_btw, 0) inclbtw"
+ " , CASE"
+ " WHEN (a.res_artikel_ingangsdatum IS NULL OR a.res_artikel_ingangsdatum <= rr.res_rsv_ruimte_van)"
+ " WHEN ( COALESCE(a.res_artikel_ingangsdatum, sa.res_srtartikel_og_ingangsdatum) IS NULL"
+ " OR COALESCE(a.res_artikel_ingangsdatum, sa.res_srtartikel_og_ingangsdatum) <= rr.res_rsv_ruimte_van"
+ " )"
+ " THEN 1"
+ " ELSE 0"
+ " END ingang"
+ " , CASE"
+ " WHEN (a.res_artikel_vervaldatum IS NULL OR a.res_artikel_vervaldatum > rr.res_rsv_ruimte_van)"
+ " WHEN ( COALESCE(a.res_artikel_vervaldatum, sa.res_srtartikel_og_vervaldatum) IS NULL"
+ " OR COALESCE(a.res_artikel_vervaldatum, sa.res_srtartikel_og_vervaldatum) > rr.res_rsv_ruimte_van"
+ " )"
+ " THEN 1"
+ " ELSE 0"
+ " END verval"
@@ -759,12 +763,19 @@ var bulkFields = " distinct "
+ " , res_discipline d"
+ " , res_disc_params dp"
+ " , prs_kostensoort ks"
+ " , res_srtartikel_onrgoed sa"
+ " , alg_v_allonroerendgoed og"
+ " WHERE ra.res_rsv_ruimte_key = rr.res_rsv_ruimte_key"
+ " AND rr.res_rsv_ruimte_key = " + rsv_ruimte_key
+ " AND ra.res_artikel_key = a.res_artikel_key"
+ " AND ks.prs_kostensoort_key(+) = d.prs_kostensoort_key"
+ " AND a.res_discipline_key = d.ins_discipline_key"
+ " AND d.ins_discipline_key = dp.res_ins_discipline_key"
+ " AND sa.res_discipline_key = a.res_discipline_key"
+ " AND og.alg_ruimte_key = rr.alg_ruimte_key"
+ " AND ( (sa.alg_onrgoed_niveau = og.alg_type AND sa.alg_onrgoed_key = og.alg_onroerendgoed_keys)"
+ " OR (sa.alg_onrgoed_niveau = 'L' AND sa.alg_onrgoed_key = og.alg_locatie_key)"
+ " )"
+ (!resdeleted? " AND ra.res_rsv_artikel_verwijder IS NULL" : "")
+ " ORDER BY res_artikel_volgnummer"
+ " , res_rsv_artikel_levering"