From 2c0bfd459652144679552db76e16e3a94e38be2d Mon Sep 17 00:00:00 2001 From: Suzan Wiegerinck Date: Mon, 4 Nov 2024 16:16:27 +0000 Subject: [PATCH] BLCC#83852 Bepalen laatste sync obv externsyncdate ipv op notificatie svn path=/Customer/trunk/; revision=66884 --- BLCC/blcc.sql | 72 ++++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/BLCC/blcc.sql b/BLCC/blcc.sql index c433eb731..ffa1184dc 100644 --- a/BLCC/blcc.sql +++ b/BLCC/blcc.sql @@ -13989,7 +13989,7 @@ AS AND COALESCE (v.crf, 0) = 0 AND v.prs_bedrijf_key = kl.prs_link_key(+) --AND v.maand >= TO_CHAR (ADD_MONTHS (SYSDATE, -12), 'yyyy') || '01' - AND v.maand > '202411' + AND v.maand >= '202411' GROUP BY v.fin_verkoopfactuur_id || v.debiteur_nr || v.grtboekrek, --'VRK', --'EUR', @@ -14039,7 +14039,7 @@ AS WHERE mld_melding_key IS NULL -- Handling fee alleen bij reguliere facturatie! --AND COALESCE (crf, 0) = 0 --AND maand >= TO_CHAR (ADD_MONTHS (SYSDATE, -12), 'yyyy') || '01' - AND maand > '202411' + AND maand >= '202411' GROUP BY fin_verkoopfactuur_id, debiteur_nr, factuurdatum, maand, vervaldatum, DECODE (prs_kostenplaats_nr, '50902', '50902', '50900')) UNION ALL SELECT v.fin_verkoopfactuur_id || COALESCE (v.grtboekrek, '???') sortering, @@ -14172,7 +14172,7 @@ AS OR v.crf = 1) AND v.prs_bedrijf_key = kl.prs_link_key(+) --AND maand >= TO_CHAR (ADD_MONTHS (SYSDATE, -12), 'yyyy') || '01' - AND v.maand > '202411' + AND v.maand >= '202411' GROUP BY v.fin_verkoopfactuur_id || v.debiteur_nr || DECODE (v.grtboekrek, '812x', DECODE (v.fin_btwtabelwaarde_code, 'H', '8120', '8121'), v.grtboekrek), --'VRK', --'EUR', @@ -30813,13 +30813,7 @@ AS AND m.mld_melding_key = o.mld_melding_key AND o.mld_typeopdr_key IN (101, 2741) --- WO tot 1000 en WO na offerte AND ordnew.fac_tracking_datum > SYSDATE - 1 -- alleen recente opdrachten, specifieke startdatum nog te bepalen - AND NOT EXISTS - ( SELECT tr.fac_tracking_key - FROM fac_srtnotificatie sn, fac_tracking tr - WHERE sn.fac_srtnotificatie_code = 'CUST21' - AND tr.fac_srtnotificatie_key = sn.fac_srtnotificatie_key - AND tr.fac_tracking_refkey = o.mld_opdr_key - GROUP BY tr.fac_tracking_refkey) + AND o.mld_opdr_externsyncdate IS NULL -- de opdracht is nog niet eerder verzonden naar Dynamics UNION ALL SELECT 'ordupd' actie, ordupd.fac_tracking_datum, @@ -30835,19 +30829,14 @@ AS t.fac_tracking_oms FROM fac_tracking t WHERE t.fac_srtnotificatie_key = 60 - AND t.fac_tracking_oms LIKE '%Totaal €:%') ordupd, - ( SELECT MAX (tr.fac_tracking_datum) last_send, - tr.fac_tracking_refkey mld_opdr_key - FROM fac_srtnotificatie sn, fac_tracking tr - WHERE sn.fac_srtnotificatie_code = 'CUST21' - AND tr.fac_srtnotificatie_key = sn.fac_srtnotificatie_key - GROUP BY tr.fac_tracking_refkey) os + AND t.fac_tracking_oms LIKE '%Totaal €:%') ordupd + WHERE o.mld_opdr_key = ordupd.mld_opdr_key AND o.mld_typeopdr_key IN (101, 2741) --- WO tot 1000 en WO na offerte - AND m.mld_melding_key = o.mld_melding_key - AND os.mld_opdr_key = o.mld_opdr_key + AND m.mld_melding_key = o.mld_melding_key AND o.mld_statusopdr_key NOT IN (1) -- WO is niet afgewezen / geannuleerd - AND ordupd.fac_tracking_datum > os.last_send + AND o.mld_opdr_externsyncdate IS NOT NULL + AND ordupd.fac_tracking_datum > o.mld_opdr_externsyncdate UNION ALL SELECT 'ordver' actie, ordver.fac_tracking_datum, @@ -30860,18 +30849,13 @@ AS mld_melding m, (SELECT t.fac_tracking_datum, t.fac_tracking_refkey mld_opdr_key FROM fac_tracking t - WHERE t.fac_srtnotificatie_key = 66) ordver, - ( SELECT MAX (tr.fac_tracking_datum) last_send, - tr.fac_tracking_refkey mld_opdr_key - FROM fac_srtnotificatie sn, fac_tracking tr - WHERE sn.fac_srtnotificatie_code = 'CUST21' - AND tr.fac_srtnotificatie_key = sn.fac_srtnotificatie_key - GROUP BY tr.fac_tracking_refkey) os - WHERE o.mld_opdr_key = ordver.mld_opdr_key - AND os.mld_opdr_key = o.mld_opdr_key + WHERE t.fac_srtnotificatie_key = 66) ordver + + WHERE o.mld_opdr_key = ordver.mld_opdr_key AND m.mld_melding_key = o.mld_melding_key AND o.mld_typeopdr_key IN (101, 2741) --- WO tot 1000 en WO na offerte - AND ordver.fac_tracking_datum > os.last_send + AND o.mld_opdr_externsyncdate IS NOT NULL + AND ordver.fac_tracking_datum > o.mld_opdr_externsyncdate UNION ALL SELECT 'ordrej' actie, ordrej.fac_tracking_datum, @@ -30884,18 +30868,13 @@ AS mld_melding m, (SELECT t.fac_tracking_datum, t.fac_tracking_refkey mld_opdr_key FROM fac_tracking t - WHERE t.fac_srtnotificatie_key = 64) ordrej, - ( SELECT MAX (tr.fac_tracking_datum) last_send, - tr.fac_tracking_refkey mld_opdr_key - FROM fac_srtnotificatie sn, fac_tracking tr - WHERE sn.fac_srtnotificatie_code = 'CUST21' - AND tr.fac_srtnotificatie_key = sn.fac_srtnotificatie_key - GROUP BY tr.fac_tracking_refkey) os - WHERE o.mld_opdr_key = ordrej.mld_opdr_key - AND os.mld_opdr_key = o.mld_opdr_key + WHERE t.fac_srtnotificatie_key = 64) ordrej + + WHERE o.mld_opdr_key = ordrej.mld_opdr_key AND m.mld_melding_key = o.mld_melding_key AND o.mld_typeopdr_key IN (101, 2741) --- WO tot 1000 en WO na offerte - AND ordrej.fac_tracking_datum > os.last_send + AND o.mld_opdr_externsyncdate IS NOT NULL + AND ordrej.fac_tracking_datum > o.mld_opdr_externsyncdate UNION ALL SELECT 'ordcan' actie, ordcan.fac_tracking_datum, @@ -30908,18 +30887,13 @@ AS mld_melding m, (SELECT t.fac_tracking_datum, t.fac_tracking_refkey mld_opdr_key FROM fac_tracking t - WHERE t.fac_srtnotificatie_key = 69) ordcan, - ( SELECT MAX (tr.fac_tracking_datum) last_send, - tr.fac_tracking_refkey mld_opdr_key - FROM fac_srtnotificatie sn, fac_tracking tr - WHERE sn.fac_srtnotificatie_code = 'CUST21' - AND tr.fac_srtnotificatie_key = sn.fac_srtnotificatie_key - GROUP BY tr.fac_tracking_refkey) os + WHERE t.fac_srtnotificatie_key = 69) ordcan WHERE o.mld_opdr_key = ordcan.mld_opdr_key - AND os.mld_opdr_key = o.mld_opdr_key + AND m.mld_melding_key = o.mld_melding_key AND o.mld_typeopdr_key IN (101, 2741) --- WO tot 1000 en WO na offerte - AND ordcan.fac_tracking_datum > os.last_send) updates + AND o.mld_opdr_externsyncdate IS NOT NULL + AND ordcan.fac_tracking_datum > o.mld_opdr_externsyncdate) updates WHERE fac_tracking_datum > TRUNC (SYSDATE - 10) -- oude tracking gaan we niet alsnog versturen, op prod nader te bepalen GROUP BY mld_melding_key, actie,