Alterations to schema (primarily enquiries) to support 'existing' meter requirements due to [wiki:MeetingNotes/MeetingNote3rdMarch Meeting to discuss/spec new variations, 3rd March]

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3837 248e525c-4dfb-0310-94bc-949c084e9493
2008-03-04 15:14:02 +00:00
parent dbcb349c45
commit de1d9d408e
10 changed files with 177 additions and 168 deletions
--- a/Modules/mip_bulk_load.pck
+++ b/Modules/mip_bulk_load.pck
@@ -26,7 +26,7 @@ END mip_bulk_load;
 /
 CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS

-  g_unknown_manufacturer_id parties.id%TYPE;
+  g_other_manufacturer_id parties.id%TYPE;

  PROCEDURE pl(p_in IN VARCHAR2) IS
  BEGIN
@@ -59,9 +59,9 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
  
    BEGIN
      SELECT id
-        INTO g_unknown_manufacturer_id
+        INTO g_other_manufacturer_id
        FROM parties
-       WHERE NAME = 'UNKNOWN'
+       WHERE NAME = 'OTHER'
         AND prty_type = 'MANU';
    EXCEPTION
      WHEN no_data_found THEN
@@ -75,13 +75,13 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
          ,created_by)
        VALUES
          (prty_seq.NEXTVAL
-          ,'UNKNOWN'
-          ,'UNKNOWN'
-          ,'Unknown Manufacturer - inserted for bulk load'
+          ,'OTHER'
+          ,'OTHER'
+          ,'Other Manufacturer'
          ,'MANU'
          ,SYSDATE
          ,USER)
-        RETURNING id INTO g_unknown_manufacturer_id;
+        RETURNING id INTO g_other_manufacturer_id;
    END;
  
    BEGIN
@@ -90,7 +90,43 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Meter Type - inserted for bulk load');
+        ,'Unknown Meter Type');
+    EXCEPTION
+      WHEN dup_val_on_index THEN
+        NULL;
+    END;
+  
+    BEGIN
+      INSERT INTO meter_size_codes
+        (code
+        ,description
+        ,qmax
+        ,valid_for_existing_meter
+        ,valid_for_new_meter)
+      VALUES
+        ('OTHER'
+        ,'Other Meter Size'
+        ,0
+        ,'YES'
+        ,'YES');
+    EXCEPTION
+      WHEN dup_val_on_index THEN
+        NULL;
+    END;
+  
+    BEGIN
+      INSERT INTO meters
+        (code
+        ,mesc_code
+        ,mety_code
+        ,prty_id
+        ,valid_from)
+      VALUES
+        ('OTHER'
+        ,'OTHER'
+        ,'UNKNOWN'
+        ,g_other_manufacturer_id
+        ,SYSDATE);
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -102,7 +138,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Housing Type - inserted for bulk load');
+        ,'Unknown Housing Type');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -114,7 +150,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Regulator Type - inserted for bulk load');
+        ,'Unknown Regulator Type');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -126,7 +162,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Filter Type - inserted for bulk load');
+        ,'Unknown Filter Type');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -138,7 +174,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Relief Valve Type - inserted for bulk load');
+        ,'Unknown Relief Valve Type');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -162,7 +198,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Slamshut Type - inserted for bulk load');
+        ,'Unknown Slamshut Type ');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -186,7 +222,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Service Pressure Type - inserted for bulk load');
+        ,'Unknown Service Pressure Type ');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
@@ -198,25 +234,12 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
        ,description)
      VALUES
        ('UNKNOWN'
-        ,'Unknown Drawing - inserted for bulk load');
+        ,'Unknown Drawing ');
    EXCEPTION
      WHEN dup_val_on_index THEN
        NULL;
    END;
-  
-    /*  BEGIN
-      INSERT INTO meter_size_codes
-        (code
-        ,description
-        ,QMAX,valid_for_existing_meter,valid_for_new_meter)
-      VALUES
-        ('UNKNOWN'
-        ,'Unknown Meter Size - inserted for bulk load'
-        ,0,'NO','NO');
-    EXCEPTION
-      WHEN dup_val_on_index THEN
-        NULL;
-    END;*/
+
  END get_globals;

  PROCEDURE load_meters IS
@@ -471,43 +494,6 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
    pl(to_char(SQL%ROWCOUNT
              ,'FM099G999G999') || ': manufacturers');
  
-    /*-- Meters
-      INSERT INTO meters
-        (code
-        ,mety_code
-        ,prty_id
-        ,dim_a
-        ,dim_b
-        ,dim_c
-        ,centres
-        ,weight
-        ,qmax
-        ,qmin
-        ,qnom
-        ,valid_from
-        ,mesc_code)
-        (SELECT code
-               ,'UNKNOWN'
-               ,g_unknown_manufacturer_id
-               ,999
-               ,999
-               ,999
-               ,999
-               ,999
-               ,.999
-               ,.999
-               ,.999
-               ,trunc(SYSDATE)
-               ,'UNKNOWN'
-           FROM (SELECT DISTINCT nvl(upper(TRIM(metr_code))
-                                    ,'UNKNOWN') AS code
-                   FROM ext_modules)
-          WHERE code NOT IN (SELECT code
-                               FROM meters));
-    
-      pl(to_char(SQL%ROWCOUNT
-                ,'FM099G999G999') || ': meters');
-    */
    -- Relief valves
    INSERT INTO relief_valves
      (code
@@ -613,7 +599,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
      (SELECT code
             ,'UNKNOWN'
             ,'UNKNOWN'
-             ,g_unknown_manufacturer_id
+             ,g_other_manufacturer_id
             ,code
             ,999
             ,999
--- a/Modules/mip_quotation.pck
+++ b/Modules/mip_quotation.pck
@@ -1347,10 +1347,13 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
        INTO l_svcpt_code
        FROM service_pressures
       WHERE code = p_enqu.required_svcp_code;
-      IF l_svcpt_code <> 'MP' THEN
+      IF l_svcpt_code = 'LP' THEN
+        p_manual_or_automatic_quote := gc_automatic_quote;
+      ELSIF l_svcpt_code <> 'MP' THEN
        p_manual_or_automatic_quote := gc_manual_quote;
        add_quote_reason(p_enqu.id
-                        ,'Site Survey is required for exchange of an existing non-MP meter.');
+                        ,'Site Survey is required for exchange of an existing ' ||
+                         l_svcpt_code || ' meter.');
      ELSE
        -- Exchange, MP
        IF p_enqu.existing_mety_code <> 'DIAPHRAGM' THEN