From 006813106cf128edd4cf2fa7186e538997300d85 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 18 Mar 2021 14:29:14 +0000
Subject: [PATCH]

---
 .vscode/launch.json                           |  2 +-
 .../AyaNova/DataList/PartInventoryDataList.cs | 35 ++++++++++++++-----
 server/AyaNova/util/AySchema.cs               |  5 +--
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8fd97968..0e2049e9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/DataList/PartInventoryDataList.cs b/server/AyaNova/DataList/PartInventoryDataList.cs
index 474c4e04..e5e4f0fd 100644
--- a/server/AyaNova/DataList/PartInventoryDataList.cs
+++ b/server/AyaNova/DataList/PartInventoryDataList.cs
@@ -10,13 +10,14 @@ namespace AyaNova.DataList
         public PartInventoryDataList()
         {
             DefaultListObjectType = AyaType.PartInventory;
-            now vpartinventorylist
-            SQLFrom = "from vpartinventorynow "
-                      + "left join apart on (vpartinventorynow.partid=apart.id) "
-                      + "left join apartwarehouse on (vpartinventorynow.partwarehouseid=apartwarehouse.id) ";
+
+            SQLFrom = "from vpartinventorylist "
+                      + "LEFT JOIN apart ON (vpartinventorylist.partid = apart.id) "
+                      + "LEFT JOIN apartwarehouse ON (vpartinventorylist.partwarehouseid = apartwarehouse.id) ";
+
             var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "PartPartNumber", "PartWarehouseName", "PartInventoryBalance" };
+            DefaultColumns = new List<string>() { "PartPartNumber", "PartWarehouseName", "PartInventoryBalance", "PartByWarehouseInventoryQuantityOnOrder", "PartByWarehouseInventoryQtyOnOrderCommitted" };
             DefaultSortBy = new Dictionary<string, string>() { { "PartPartNumber", "+" }, { "PartWarehouseName", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
 
@@ -46,8 +47,8 @@ namespace AyaNova.DataList
                 FieldKey = "PartInventoryTransactionDescription",
                 AyaObjectType = (int)AyaType.PartInventory,
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "vpartinventorynow.id",
-                SqlValueColumnName = "vpartinventorynow.description",
+                SqlIdColumnName = "vpartinventorylist.id",
+                SqlValueColumnName = "vpartinventorylist.description",
                 IsMeta = true,//only so it doesn't show in the UI but is required for report
                 IsRowId = true
             });
@@ -57,9 +58,27 @@ namespace AyaNova.DataList
                 TKey = "PartInventoryBalance",
                 FieldKey = "PartInventoryBalance",
                 UiFieldDataType = (int)UiFieldDataType.Decimal,
-                SqlValueColumnName = "vpartinventorynow.balance"
+                SqlValueColumnName = "vpartinventorylist.balance"
             });
 
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "PartByWarehouseInventoryQuantityOnOrder",
+                FieldKey = "PartByWarehouseInventoryQuantityOnOrder",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "vpartinventorylist.quantityonorder"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "PartByWarehouseInventoryQtyOnOrderCommitted",
+                FieldKey = "PartByWarehouseInventoryQtyOnOrderCommitted",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "vpartinventorylist.quantityonordercommitted"
+            });
+
+
             //META
             FieldDefinitions.Add(new DataListFieldDefinition
             {
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index c78e0fd4..564dd2e2 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -882,8 +882,9 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 await ExecQueryAsync("CREATE VIEW vpartinventorylist AS select vpartinventorynow.*, vpartsonordercommitted.quantityonordercommitted, vpartsonorder.quantityonorder from vpartinventorynow "
                     + "left outer join vpartsonordercommitted on (vpartinventorynow.partid = vpartsonordercommitted.partid and vpartinventorynow.partwarehouseid = vpartsonordercommitted.partwarehouseid)"
                     + "left outer join vpartsonorder on (vpartinventorynow.partid = vpartsonorder.partid and vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid)"
-                    + "left outer join apart on (vpartinventorynow.partid=apart.id)"
-                    + "left outer join apartwarehouse on (vpartinventorynow.partwarehouseid=apartwarehouse.id)");
+                    // + "left outer join apart on (vpartinventorynow.partid=apart.id)"
+                    // + "left outer join apartwarehouse on (vpartinventorynow.partwarehouseid=apartwarehouse.id)"
+                    );