From 3624c318a193f39070eba49d73ff54aec77e44bc Mon Sep 17 00:00:00 2001
From: Suzan Wiegerinck <suzan.wiegerinck@aareon.nl>
Date: Thu, 8 Sep 2016 07:38:19 +0000
Subject: [PATCH] PCHD#34588 Aanpassing notificatie afmelding uithuizing /
 datumvelden voor filters export elektra

svn path=/Customer/trunk/; revision=30626
---
 PCHH/pchh.sql | 63 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/PCHH/pchh.sql b/PCHH/pchh.sql
index 0c0c790a1..54146d648 100644
--- a/PCHH/pchh.sql
+++ b/PCHH/pchh.sql
@@ -14,7 +14,7 @@ set define off
 
 -- Notificatie jobs
 --
--- PCHD#34588: notificatie naar aanvragende werkmaatschappij sturen.
+-- PCHD#34588: notificatie naar aanvragende werkmaatschappij sturen bij nieuwe melding
 
 CREATE OR REPLACE VIEW pchh_v_noti_mldenergie
 (
@@ -34,8 +34,7 @@ AS
           NULL receiver,
           REPLACE (
              REPLACE (n.fac_srtnotificatie_oms, '##KEY##', m.mld_melding_key),
-             ' (##DISC##/##STDMLD##)',
-             ''),
+             '##DISC##/##STDMLD##', SM.MLD_STDMELDING_OMSCHRIJVING  ),
           fac_srtnotificatie_code,
           n.fac_srtnotificatie_key,
           m.mld_melding_key,
@@ -44,14 +43,56 @@ AS
           NULL xmobile
      FROM fac_tracking t,
           mld_melding m,
+          mld_stdmelding sm,
           fac_srtnotificatie n,
           prs_contactpersoon c,
           mld_kenmerkmelding km,
           mld_kenmerk k
-    WHERE T.FAC_TRACKING_REFKEY = M.MLD_MELDING_KEY
-          AND T.FAC_SRTNOTIFICATIE_KEY = N.FAC_SRTNOTIFICATIE_KEY
-          AND (N.FAC_SRTNOTIFICATIE_CODE = 'MLDNEW'
-               OR N.FAC_SRTNOTIFICATIE_CODE = 'MLDAFM')
+    WHERE  T.FAC_TRACKING_REFKEY = M.MLD_MELDING_KEY
+           AND M.MLD_STDMELDING_KEY = SM.MLD_STDMELDING_KEY
+          AND T.FAC_SRTNOTIFICATIE_KEY =40
+          AND N.FAC_SRTNOTIFICATIE_CODE = 'MLDNEW'
+           AND m.mld_stdmelding_key = 821
+          AND KM.MLD_MELDING_KEY = M.MLD_MELDING_KEY
+          AND KM.MLD_KENMERK_KEY = 302
+          AND FAC.SAFE_TO_NUMBER (mld_kenmerkmelding_waarde) =
+                prs_contactpersoon_key
+          AND t.fac_tracking_datum >
+                (SELECT fac_notificatie_job_nextrun
+                        - fac_notificatie_job_interval / 24
+                   FROM fac_notificatie_job
+                  WHERE UPPER (fac_notificatie_job_view) =
+                           'PCHH_V_NOTI_MLDENERGIE')
+          AND t.fac_tracking_datum <
+                (SELECT fac_notificatie_job_nextrun
+                   FROM fac_notificatie_job
+                  WHERE UPPER (fac_notificatie_job_view) =
+                           'PCHH_V_NOTI_MLDENERGIE')
+UNION ALL
+   SELECT DISTINCT
+          NULL sender,
+          NULL receiver,
+          REPLACE (
+             REPLACE (n.fac_srtnotificatie_oms, '##KEY##', m.mld_melding_key),
+             '##DISC##/##STDMLD##', SM.MLD_STDMELDING_OMSCHRIJVING  ),
+          fac_srtnotificatie_code,
+          n.fac_srtnotificatie_key,
+          m.mld_melding_key,
+          NULL xkey,
+          prs_contactpersoon_email xemail,
+          NULL xmobile
+     FROM fac_tracking t,
+          mld_melding m,
+          mld_stdmelding sm,
+          fac_srtnotificatie n,
+          prs_contactpersoon c,
+          mld_kenmerkmelding km,
+          mld_kenmerk k
+    WHERE  T.FAC_TRACKING_REFKEY = M.MLD_MELDING_KEY
+           AND M.MLD_STDMELDING_KEY = SM.MLD_STDMELDING_KEY
+          AND T.FAC_SRTNOTIFICATIE_KEY =36
+          AND N.FAC_SRTNOTIFICATIE_CODE = 'MLDAFM'
+           AND m.mld_stdmelding_key = 821
           AND KM.MLD_MELDING_KEY = M.MLD_MELDING_KEY
           AND KM.MLD_KENMERK_KEY = 302
           AND FAC.SAFE_TO_NUMBER (mld_kenmerkmelding_waarde) =
@@ -67,7 +108,7 @@ AS
                    FROM fac_notificatie_job
                   WHERE UPPER (fac_notificatie_job_view) =
                            'PCHH_V_NOTI_MLDENERGIE');
-
+                           
 SHOW ERRORS
 
 CREATE OR REPLACE VIEW PCHH_V_WERKMAATSCHAPPIJ
@@ -152,11 +193,11 @@ AS
    SELECT O.INS_DEEL_KEY,
           status_pch.fac_usrdata_omschr status,
           TO_CHAR (
-             TO_DATE (ingangsdatum.ins_kenmerkdeel_waarde, 'dd-mm-yyyy'),
+             TO_DATE (statusdatum.ins_kenmerkdeel_waarde, 'dd-mm-yyyy'),
              'iw')
              week,
           TO_CHAR (
-             TO_DATE (ingangsdatum.ins_kenmerkdeel_waarde, 'dd-mm-yyyy'),
+             TO_DATE (statusdatum.ins_kenmerkdeel_waarde, 'dd-mm-yyyy'),
              'iyyy')
              year,
           REPLACE (ingangsdatum.ins_kenmerkdeel_waarde, '-', '') start_date,
@@ -211,7 +252,7 @@ AS
      FROM ins_deel o,
           (SELECT k.*
              FROM ins_kenmerkdeel k
-            WHERE K.INS_KENMERK_KEY = 283) ingangsdatum,
+            WHERE K.INS_KENMERK_KEY = 52) ingangsdatum,
           (SELECT k.*
              FROM ins_kenmerkdeel k
             WHERE K.INS_KENMERK_KEY = 44) straat,