KFNS#35137 Voorraadrap/Vervallen artikelen (einddatum < SYSDATE) niet tonen
svn path=/Customer/trunk/; revision=27777
This commit is contained in:
Maarten van der Heide
246
KFNS/kfns.sql
246
KFNS/kfns.sql
@@ -2203,7 +2203,7 @@ AS
|
||||
-- toont.
|
||||
-- Dat de data per artikelgroep(/eigenaar) wordt genotificeerd (via extra_key-
|
||||
-- principe).
|
||||
/* Formatted on 2-10-2015 17:42:24 (QP5 v5.136.908.31019) */
|
||||
/* Formatted on 15-1-2016 13:58:02 (QP5 v5.136.908.31019) */
|
||||
CREATE OR REPLACE VIEW kfns_v_mag_voorraad
|
||||
(
|
||||
extra_key, -- fac_usrdata_key in ET-Artikeleigenaren (per Artikelgroep)
|
||||
@@ -2220,123 +2220,131 @@ CREATE OR REPLACE VIEW kfns_v_mag_voorraad
|
||||
voorraadincl
|
||||
)
|
||||
AS
|
||||
SELECT ud.fac_usrdata_key,
|
||||
--TRIM (ud.fac_usrdata_code),
|
||||
sg.bes_srtgroep_omschrijving,
|
||||
--TRIM (ud.fac_usrdata_omschr),
|
||||
sd.bes_srtdeel_opmerking,
|
||||
--'DD-Daalsedijk 14',
|
||||
sd.bes_srtdeel_nr,
|
||||
sd.bes_srtdeel_omschrijving,
|
||||
--x.extern_geleverd
|
||||
--- COALESCE (
|
||||
-- CEIL (x.intern_besteld / sd.bes_srtdeel_voorraadfactor),
|
||||
-- 0),
|
||||
x.extern_geleverd
|
||||
- CEIL (x.intern_besteld / DECODE (sd.bes_srtdeel_voorraadfactor, NULL, 1, 0, 1, sd.bes_srtdeel_voorraadfactor)),
|
||||
sd.bes_srtdeel_eenheid,
|
||||
sd.bes_srtdeel_voorraadmin,
|
||||
bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL),
|
||||
(x.extern_geleverd
|
||||
- CEIL (x.intern_besteld / DECODE (sd.bes_srtdeel_voorraadfactor, NULL, 1, 0, 1, sd.bes_srtdeel_voorraadfactor)))
|
||||
* bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL),
|
||||
(x.extern_geleverd
|
||||
- CEIL (x.intern_besteld / DECODE (sd.bes_srtdeel_voorraadfactor, NULL, 1, 0, 1, sd.bes_srtdeel_voorraadfactor)))
|
||||
* bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL)
|
||||
* ( (100 + sd.bes_srtdeel_btw) / 100) -- Afronding?
|
||||
FROM ( SELECT inkoop_disc_key,
|
||||
bes_srtdeel_nr,
|
||||
SUM (intern_besteld) intern_besteld,
|
||||
SUM (extern_besteld) extern_besteld,
|
||||
SUM (extern_geleverd) extern_geleverd
|
||||
FROM ( -- Intern besteld
|
||||
SELECT dp.bes_ins_discipline_key_inkoop inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
SUM (bi.bes_bestelling_item_aantal) intern_besteld,
|
||||
0 extern_besteld,
|
||||
0 extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key =
|
||||
dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NOT NULL
|
||||
GROUP BY sd.bes_srtdeel_nr,
|
||||
dp.bes_ins_discipline_key_inkoop
|
||||
UNION ALL -- Extern besteld
|
||||
SELECT bd.ins_discipline_key inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
0 intern_besteld,
|
||||
SUM (bi.bes_bestelling_item_aantal) extern_besteld,
|
||||
0 extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_status IN (2, 3, 4, 5)
|
||||
AND b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key =
|
||||
dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NULL
|
||||
AND dp.bes_ins_discipline_key IN
|
||||
(SELECT bes_ins_discipline_key_inkoop
|
||||
FROM bes_disc_params
|
||||
WHERE bes_ins_discipline_key_inkoop IS NOT NULL)
|
||||
GROUP BY bes_srtdeel_nr, bd.ins_discipline_key
|
||||
UNION ALL -- Extern geleverd
|
||||
SELECT bd.ins_discipline_key inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
0 intern_besteld,
|
||||
0 extern_besteld,
|
||||
SUM (bi.bes_bestelling_item_aantal) extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_status IN (6, 7)
|
||||
AND b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key =
|
||||
dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NULL
|
||||
AND dp.bes_ins_discipline_key IN
|
||||
(SELECT bes_ins_discipline_key_inkoop
|
||||
FROM bes_disc_params
|
||||
WHERE bes_ins_discipline_key_inkoop IS NOT NULL)
|
||||
GROUP BY bes_srtdeel_nr, bd.ins_discipline_key)
|
||||
GROUP BY inkoop_disc_key, bes_srtdeel_nr) x,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
( SELECT TRIM (fac_usrdata_upper) fac_usrdata_upper,
|
||||
MIN (fac_usrdata_key) fac_usrdata_key
|
||||
FROM fac_v_aanwezigusrdata
|
||||
WHERE fac_usrtab_key = 42
|
||||
GROUP BY TRIM (fac_usrdata_upper)) ud -- Artikeleigenaren
|
||||
WHERE 1=1
|
||||
AND sg.ins_discipline_key = 402 -- Beperken tot Magazijn-Ontvangst?
|
||||
AND sg.bes_srtgroep_key = sd.bes_srtgroep_key
|
||||
AND sd.bes_srtdeel_nr = x.bes_srtdeel_nr(+)
|
||||
--AND sg.ins_discipline_key = x.inkoop_disc_key
|
||||
AND UPPER (TRIM (sg.bes_srtgroep_omschrijving)) = ud.fac_usrdata_upper(+);
|
||||
SELECT ud.fac_usrdata_key,
|
||||
--TRIM (ud.fac_usrdata_code),
|
||||
sg.bes_srtgroep_omschrijving,
|
||||
--TRIM (ud.fac_usrdata_omschr),
|
||||
sd.bes_srtdeel_opmerking,
|
||||
--'DD-Daalsedijk 14',
|
||||
sd.bes_srtdeel_nr,
|
||||
sd.bes_srtdeel_omschrijving,
|
||||
--x.extern_geleverd
|
||||
--- COALESCE (
|
||||
-- CEIL (x.intern_besteld / sd.bes_srtdeel_voorraadfactor),
|
||||
-- 0),
|
||||
x.extern_geleverd
|
||||
- CEIL(x.intern_besteld
|
||||
/ DECODE (sd.bes_srtdeel_voorraadfactor,
|
||||
NULL, 1,
|
||||
0, 1,
|
||||
sd.bes_srtdeel_voorraadfactor)),
|
||||
sd.bes_srtdeel_eenheid,
|
||||
sd.bes_srtdeel_voorraadmin,
|
||||
bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL),
|
||||
(x.extern_geleverd
|
||||
- CEIL(x.intern_besteld
|
||||
/ DECODE (sd.bes_srtdeel_voorraadfactor,
|
||||
NULL, 1,
|
||||
0, 1,
|
||||
sd.bes_srtdeel_voorraadfactor)))
|
||||
* bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL),
|
||||
(x.extern_geleverd
|
||||
- CEIL(x.intern_besteld
|
||||
/ DECODE (sd.bes_srtdeel_voorraadfactor,
|
||||
NULL, 1,
|
||||
0, 1,
|
||||
sd.bes_srtdeel_voorraadfactor)))
|
||||
* bes.getsrtdeelprijs (sd.bes_srtdeel_key, NULL)
|
||||
* ( (100 + sd.bes_srtdeel_btw) / 100) -- Afronding?
|
||||
FROM bes_srtgroep sg,
|
||||
bes_srtdeel sd,
|
||||
( SELECT inkoop_disc_key,
|
||||
bes_srtdeel_nr,
|
||||
SUM (intern_besteld) intern_besteld,
|
||||
SUM (extern_besteld) extern_besteld,
|
||||
SUM (extern_geleverd) extern_geleverd
|
||||
FROM ( -- Intern besteld
|
||||
SELECT dp.bes_ins_discipline_key_inkoop inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
SUM (bi.bes_bestelling_item_aantal) intern_besteld,
|
||||
0 extern_besteld,
|
||||
0 extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key = dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NOT NULL
|
||||
GROUP BY sd.bes_srtdeel_nr,
|
||||
dp.bes_ins_discipline_key_inkoop
|
||||
UNION ALL -- Extern besteld
|
||||
SELECT bd.ins_discipline_key inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
0 intern_besteld,
|
||||
SUM (bi.bes_bestelling_item_aantal) extern_besteld,
|
||||
0 extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_status IN (2, 3, 4, 5)
|
||||
AND b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key = dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NULL
|
||||
AND dp.bes_ins_discipline_key IN
|
||||
(SELECT bes_ins_discipline_key_inkoop
|
||||
FROM bes_disc_params
|
||||
WHERE bes_ins_discipline_key_inkoop IS NOT NULL)
|
||||
GROUP BY bes_srtdeel_nr, bd.ins_discipline_key
|
||||
UNION ALL -- Extern geleverd
|
||||
SELECT bd.ins_discipline_key inkoop_disc_key,
|
||||
sd.bes_srtdeel_nr,
|
||||
0 intern_besteld,
|
||||
0 extern_besteld,
|
||||
SUM (bi.bes_bestelling_item_aantal) extern_geleverd
|
||||
FROM bes_bestelling b,
|
||||
bes_bestelling_item bi,
|
||||
bes_srtdeel sd,
|
||||
bes_srtgroep sg,
|
||||
bes_discipline bd,
|
||||
bes_disc_params dp
|
||||
WHERE b.bes_bestelling_status IN (6, 7)
|
||||
AND b.bes_bestelling_key = bi.bes_bestelling_key
|
||||
AND bi.bes_srtdeel_key = sd.bes_srtdeel_key
|
||||
AND sd.bes_srtdeel_verwijder IS NULL
|
||||
AND sd.bes_srtgroep_key = sg.bes_srtgroep_key
|
||||
AND sg.ins_discipline_key = bd.ins_discipline_key
|
||||
AND bd.ins_discipline_key = dp.bes_ins_discipline_key
|
||||
AND dp.bes_ins_discipline_key_inkoop IS NULL
|
||||
AND dp.bes_ins_discipline_key IN
|
||||
(SELECT bes_ins_discipline_key_inkoop
|
||||
FROM bes_disc_params
|
||||
WHERE bes_ins_discipline_key_inkoop IS NOT NULL)
|
||||
GROUP BY bes_srtdeel_nr, bd.ins_discipline_key)
|
||||
GROUP BY inkoop_disc_key, bes_srtdeel_nr) x,
|
||||
( SELECT TRIM (fac_usrdata_upper) fac_usrdata_upper,
|
||||
MIN (fac_usrdata_key) fac_usrdata_key
|
||||
FROM fac_v_aanwezigusrdata
|
||||
WHERE fac_usrtab_key = 42
|
||||
GROUP BY TRIM (fac_usrdata_upper)) ud -- Artikeleigenaren
|
||||
WHERE sg.ins_discipline_key = 402 -- Beperken tot Magazijn-Ontvangst?
|
||||
AND sg.bes_srtgroep_key = sd.bes_srtgroep_key
|
||||
AND COALESCE (sd.bes_srtdeel_vervaldatum, SYSDATE) > TRUNC(SYSDATE)
|
||||
AND sd.bes_srtdeel_nr = x.bes_srtdeel_nr(+)
|
||||
AND UPPER (TRIM (sg.bes_srtgroep_omschrijving)) = ud.fac_usrdata_upper(+);
|
||||
|
||||
CREATE OR REPLACE VIEW kfns_v_rap_mag_voorraad
|
||||
(
|
||||
@@ -2789,7 +2797,7 @@ AS
|
||||
|
||||
BEGIN adm.systrackscriptId('$Id$', 0); END;
|
||||
/
|
||||
BEGIN fac.registercustversion('KFNS', 10); END;
|
||||
BEGIN fac.registercustversion('KFNS', 11); END;
|
||||
/
|
||||
commit;
|
||||
spool off
|
||||
|
||||
Reference in New Issue
Block a user