2021-02-26 20:02:00 +00:00
parent ac238f108e
commit c60ce83994
6 changed files with 76 additions and 54 deletions
--- a/server/AyaNova/DataList/PartRestockDataList.cs
+++ b/server/AyaNova/DataList/PartRestockDataList.cs
@@ -7,89 +7,111 @@ namespace AyaNova.DataList
        //NOTE: this object has NO rowid as it's a synthetic list not primarily based on any particular db table
        public PartRestockDataList()
        {
+            
+            // SELECT apart.id AS partid, apartwarehouse.id AS partwarehouseid, apart.partnumber, apartwarehouse.name AS displaywarehouse, "
+            // + "amanufacturer.id AS manufactureid, amanufacturer.name AS displaymanufacturer, awholesaler.id AS wholesalerid, awholesaler.name AS displaywholesaler,	"
+            // + "aalternativewholesaler.id AS alternativewholesalerid, aalternativewholesaler.name AS displayalternativewholesaler,"
+            // + "apartstocklevel.minimumquantity, vpartinventorynow.balance, COALESCE(vpartsonorder.quantityonorder,0) AS onorderquantity, "
+            // + "apartstocklevel.minimumquantity - (COALESCE(vpartinventorynow.balance, 0) + COALESCE(vpartsonorder.quantityonorder, 0)) AS requiredquantity "
+
            DefaultListObjectType = AyaType.PartInventoryRestock;
            SQLFrom = "FROM vrestockrequired";
            var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
            AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "PartRestockname", "PartRestockPartRestockOverseerID", "PartRestockDateStarted", "PartRestockDateCompleted",
-            "PartRestockAccountNumber", "PartRestockactive", "PartRestocktags" };
+            DefaultColumns = new List<string>() { 
+                "PartPartNumber", "PartWarehouseName", Vendor,manufac,whlsl "PartByWarehouseInventoryMinStockLevel", 
+                "PartInventoryBalance", "PartByWarehouseInventoryQuantityOnOrder",
+                 "PartByWarehouseInventoryReorderQuantity", "PartRestocktags" };
            DefaultSortBy = new Dictionary<string, string>() { { "PartRestockname", "+" } };
            FieldDefinitions = new List<DataListFieldDefinition>();

-                    // SELECT apart.id AS partid, apartwarehouse.id AS partwarehouseid, apart.partnumber, apartwarehouse.name AS displaywarehouse, "
-                    // + "amanufacturer.id AS manufactureid, amanufacturer.name AS displaymanufacturer, awholesaler.id AS wholesalerid, awholesaler.name AS displaywholesaler,	"
-                    // + "aalternativewholesaler.id AS ayalternativewholesalerid, aalternativewholesaler.name AS displayalternativewholesaler,"
-                    // + "apartstocklevel.minimumquantity, vpartinventorynow.balance, COALESCE(vpartsonorder.quantityonorder,0) AS onorderquantity, "
-                    // + "apartstocklevel.minimumquantity - (COALESCE(vpartinventorynow.balance, 0) + COALESCE(vpartsonorder.quantityonorder, 0)) AS requiredquantity "
-                    
+
            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "PartRestockName",
-                FieldKey = "PartRestockname",
-                AyaObjectType = (int)AyaType.PartRestock,
+                TKey = "PartPartNumber",
+                FieldKey = "PartPartNumber",
+                AyaObjectType = (int)AyaType.Part,
                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "aPartRestock.id",
-                SqlValueColumnName = "aPartRestock.name"
+                SqlIdColumnName = "partid",
+                SqlValueColumnName = "partnumber"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "PartRestockNotes",
-                FieldKey = "PartRestocknotes",
+                TKey = "PartWarehouseName",
+                FieldKey = "PartWarehouseName",
+                AyaObjectType = (int)AyaType.PartWarehouse,
                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "aPartRestock.notes"
+                SqlIdColumnName = "partwarehouseid",
+                SqlValueColumnName = "displaywarehouse"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Active",
-                FieldKey = "PartRestockactive",
-                UiFieldDataType = (int)UiFieldDataType.Bool,
-                SqlValueColumnName = "aPartRestock.active"
-            });
-
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "Tags",
-                FieldKey = "PartRestocktags",
-                UiFieldDataType = (int)UiFieldDataType.Tags,
-                SqlValueColumnName = "aPartRestock.tags"
-            });
-
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "PartRestockAccountNumber",
-                FieldKey = "PartRestockAccountNumber",
+                FieldKey = "PartManufacturerID",
+                TKey = "PartManufacturerID",
                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "aPartRestock.accountnumber"
+                AyaObjectType = (int)AyaType.Vendor,
+                SqlIdColumnName = "manufactureid",
+                SqlValueColumnName = "displaymanufacturer"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                FieldKey = "PartRestockPartRestockOverseerID",
-                TKey = "PartRestockPartRestockOverseerID",
+                FieldKey = "PartWholesalerID",
+                TKey = "PartWholesalerID",
                UiFieldDataType = (int)UiFieldDataType.Text,
-                AyaObjectType = (int)AyaType.User,
-                SqlIdColumnName = "auser.id",
-                SqlValueColumnName = "auser.name"
+                AyaObjectType = (int)AyaType.Vendor,
+                SqlIdColumnName = "wholesalerid",
+                SqlValueColumnName = "displaywholesaler"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "PartRestockDateStarted",
-                FieldKey = "PartRestockDateStarted",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "aPartRestock.datestarted"
+                FieldKey = "PartAlternativeWholesalerID",
+                TKey = "PartAlternativeWholesalerID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AyaObjectType = (int)AyaType.Vendor,
+                SqlIdColumnName = "alternativewholesalerid",
+                SqlValueColumnName = "displayalternativewholesaler"
+            });
+
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "PartByWarehouseInventoryMinStockLevel",
+                FieldKey = "PartByWarehouseInventoryMinStockLevel",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "apartstocklevel.minimumquantity"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "PartRestockDateCompleted",
-                FieldKey = "PartRestockDateCompleted",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "aPartRestock.datecompleted"
+                TKey = "PartInventoryBalance",
+                FieldKey = "PartInventoryBalance",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "vpartinventorynow.balance"
            });

-                 }
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "PartByWarehouseInventoryQuantityOnOrder",
+                FieldKey = "PartByWarehouseInventoryQuantityOnOrder",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "onorderquantity"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "PartByWarehouseInventoryReorderQuantity",
+                FieldKey = "PartByWarehouseInventoryReorderQuantity",
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlValueColumnName = "onorderquantity"
+            });
+
+
+
+
+        }
    }//eoc
 }//eons
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -618,7 +618,7 @@
  "PartAssemblyCustom15": "Angepasstes Feld 15",
  "PartAssemblyCustom16": "Angepasstes Feld 16",
  "PartByWarehouseInventoryList": "Teilebestand",
-  "PartByWarehouseInventoryMinStockLevel": "Aufstockungsebene",
+  "PartByWarehouseInventoryMinStockLevel": "Mindestniveau",
  "PartByWarehouseInventoryQtyOnOrderCommitted": "Zugesagte bestellte Menge",
  "PartByWarehouseInventoryQuantityOnHand": "Vorrätig",
  "PartByWarehouseInventoryQuantityOnOrder": "Bestellt",
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -618,7 +618,7 @@
  "PartAssemblyCustom15": "Custom15",
  "PartAssemblyCustom16": "Custom16",
  "PartByWarehouseInventoryList": "Part Inventory",
-  "PartByWarehouseInventoryMinStockLevel": "Restock level",
+  "PartByWarehouseInventoryMinStockLevel": "Minimum quantity",
  "PartByWarehouseInventoryQtyOnOrderCommitted": "Quantity on order committed",
  "PartByWarehouseInventoryQuantityOnHand": "On Hand",
  "PartByWarehouseInventoryQuantityOnOrder": "On Order",
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -617,7 +617,7 @@
  "PartAssemblyCustom15": "Campo personalizado 15",
  "PartAssemblyCustom16": "Campo personalizado 16",
  "PartByWarehouseInventoryList": "Inventario de piezas",
-  "PartByWarehouseInventoryMinStockLevel": "Nivel de reposición",
+  "PartByWarehouseInventoryMinStockLevel": "Cantidad mínima",
  "PartByWarehouseInventoryQtyOnOrderCommitted": "Cantidad en pedido comprometida",
  "PartByWarehouseInventoryQuantityOnHand": "Disponible",
  "PartByWarehouseInventoryQuantityOnOrder": "En pedido",
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -618,7 +618,7 @@
  "PartAssemblyCustom15": "Champ personnalisé 15",
  "PartAssemblyCustom16": "Champ personnalisé 16",
  "PartByWarehouseInventoryList": "Stock de pièces",
-  "PartByWarehouseInventoryMinStockLevel": "Niveau de réassortiment",
+  "PartByWarehouseInventoryMinStockLevel": "Quantité minimum",
  "PartByWarehouseInventoryQtyOnOrderCommitted": "Quantité en commande validée",
  "PartByWarehouseInventoryQuantityOnHand": "Disponible",
  "PartByWarehouseInventoryQuantityOnOrder": "En commande",
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -755,7 +755,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                //VRESTOCKREQUIRED
                await ExecQueryAsync("CREATE VIEW vrestockrequired AS SELECT apart.id AS partid, apartwarehouse.id AS partwarehouseid, apart.partnumber, apartwarehouse.name AS displaywarehouse, "
                    + "amanufacturer.id AS manufactureid, amanufacturer.name AS displaymanufacturer, awholesaler.id AS wholesalerid, awholesaler.name AS displaywholesaler,	"
-                    + "aalternativewholesaler.id AS ayalternativewholesalerid, aalternativewholesaler.name AS displayalternativewholesaler,"
+                    + "aalternativewholesaler.id AS alternativewholesalerid, aalternativewholesaler.name AS displayalternativewholesaler,"
                    + "apartstocklevel.minimumquantity, vpartinventorynow.balance, COALESCE(vpartsonorder.quantityonorder,0) AS onorderquantity, "
                    + "apartstocklevel.minimumquantity - (COALESCE(vpartinventorynow.balance, 0) + COALESCE(vpartsonorder.quantityonorder, 0)) AS requiredquantity "
                    + "FROM vpartinventorynow "