server/AyaNova/util/AySchema.cs

@@ -19,19 +19,21 @@ namespace AyaNova.Util
         /////////////////////////////////////////////////////////////////
         /////////// CHANGE THIS ON NEW SCHEMA UPDATE ////////////////////
 
-        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
+        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
         private const int DESIRED_SCHEMA_LEVEL = 1;
 
-        internal const long EXPECTED_COLUMN_COUNT = 1226;
+        internal const long EXPECTED_COLUMN_COUNT = 1236;
         internal const long EXPECTED_INDEX_COUNT = 146;
         internal const long EXPECTED_CHECK_CONSTRAINTS = 517;
         internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 191;
         internal const long EXPECTED_VIEWS = 7;
         internal const long EXPECTED_ROUTINES = 2;
 
-        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
+        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
+
+        /////////////////////////////////////////////////////////////////                
+
 
-        /////////////////////////////////////////////////////////////////            (C1226:I146:CC517:FC191:V7:R2)
 
         /*
 
@@ -895,9 +897,22 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                     + "ORDER BY requiredquantity DESC");
 
                 //VPARTINVENTORYLIST
-                await ExecQueryAsync("CREATE VIEW vpartinventorylist AS select vpartinventorynow.*, vpartsonordercommitted.quantityonordercommitted, vpartsonorder.quantityonorder from vpartinventorynow "
+                // await ExecQueryAsync("CREATE VIEW vpartinventorylist AS select vpartinventorynow.*, vpartsonordercommitted.quantityonordercommitted, vpartsonorder.quantityonorder from vpartinventorynow "
-                    + "left join vpartsonordercommitted on (vpartinventorynow.partid = vpartsonordercommitted.partid and vpartinventorynow.partwarehouseid = vpartsonordercommitted.partwarehouseid)"
+                //     + "left join vpartsonordercommitted on (vpartinventorynow.partid = vpartsonordercommitted.partid and vpartinventorynow.partwarehouseid = vpartsonordercommitted.partwarehouseid)"
-                    + "left join vpartsonorder on (vpartinventorynow.partid = vpartsonorder.partid and vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid)");
+                //     + "left join vpartsonorder on (vpartinventorynow.partid = vpartsonorder.partid and vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid)");
+
+
+
+                await ExecQueryAsync("CREATE VIEW vpartinventorylist AS select apart.partnumber,apartwarehouse.name as whsname,vpartinventorynow.*,vpartsonorder.quantityonorder,"
+                +"vpartsonordercommitted.quantityonordercommitted,apart.name as prtname, apart.active, apart.cost, apartstocklevel.minimumquantity,apart.retail, aws.name AS whslrname, aaws.name AS altwhslrname, "
+                +"GREATEST( COALESCE(apartstocklevel.minimumquantity, 0) - (COALESCE(vpartinventorynow.balance, 0) + COALESCE(vpartsonorder.quantityonorder, 0) - "
+                +"COALESCE(vpartsonordercommitted.quantityonordercommitted, 0)) ,0) AS reorderquantity FROM vpartinventorynow LEFT JOIN vpartsonordercommitted ON "
+                +"vpartinventorynow.partid = vpartsonordercommitted.partid AND vpartinventorynow.partwarehouseid = vpartsonordercommitted.partwarehouseid "
+                +"LEFT JOIN vpartsonorder ON vpartinventorynow.partid = vpartsonorder.partid AND vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid "
+                +"LEFT JOIN apart ON (vpartinventorynow.partid = apart.id) LEFT JOIN apartwarehouse ON (vpartinventorynow.partwarehouseid = apartwarehouse.id) "
+                +"left join avendor AS aws on (apart.wholesalerid = aws.id) left join avendor AS aaws on (apart.alternativewholesalerid = aaws.id) "
+                +"left join apartstocklevel on (apartstocklevel.partid = apart.id AND apartstocklevel.partwarehouseid = vpartinventorynow.partwarehouseid);");
+
 
 //TODO: make this a view and *it* should be named vpartinventorylist ideally
 //so either incorporate or rename the existing vpartinventorylist to fit in here

server/AyaNova/util/DbUtil.cs

@@ -347,6 +347,8 @@ namespace AyaNova.Util
 
                 //REMOVE ALL REMAINING DATA
 
+                await EraseTableAsync("aunitmeterreading", conn);
+
                 //--- WorkOrder
                 await EraseTableAsync("aworkorderitemexpense", conn);
                 await EraseTableAsync("aworkorderitemlabor", conn);
@@ -452,6 +454,7 @@ namespace AyaNova.Util
                 await EraseTableAsync("aworkorderitemstatus", conn);
                 await EraseTableAsync("aworkorderitempriority", conn);
                 await EraseTableAsync("ataskgroup", conn);//items cascade
+                
 
 
                 //after cleanup