From d4e9fa51fbc13e5a83b4a5e0c922b2873abd0966 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 1 Sep 2021 23:04:21 +0000
Subject: [PATCH]

---
 .../AyaNova/DataList/PurchaseOrderDataList.cs |  2 +-
 .../WorkOrderItemPartRequestDataList.cs       | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/server/AyaNova/DataList/PurchaseOrderDataList.cs b/server/AyaNova/DataList/PurchaseOrderDataList.cs
index c0f16992..fe31a5c0 100644
--- a/server/AyaNova/DataList/PurchaseOrderDataList.cs
+++ b/server/AyaNova/DataList/PurchaseOrderDataList.cs
@@ -59,7 +59,7 @@ namespace AyaNova.DataList
                 FieldKey = "PurchaseOrderDropShipToCustomerID",
                 TKey = "PurchaseOrderDropShipToCustomerID",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                AType = (int)AyaType.User,
+                AType = (int)AyaType.Customer,
                 SqlIdColumnName = "acustomer.id",
                 SqlValueColumnName = "acustomer.name"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
index 80c11743..50d9e5cc 100644
--- a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
@@ -25,6 +25,9 @@ namespace AyaNova.DataList
             + "left join apartwarehouse on (aworkorderitempartrequest.partwarehouseid=apartwarehouse.id) "
             + "left join apurchaseorderitem on (aworkorderitempartrequest.purchaseorderitemid=apurchaseorderitem.id) "
             + "left join apurchaseorder on (apurchaseorderitem.purchaseorderid=apurchaseorder.id) "
+            // + "left join vendor as apovendor on apurchaseorder.vendorid = apovendor.id "
+            // + "left join vendor as apartwholesaler on apart.wholesalerid = apartwholesaler.id "
+            // + "left join vendor as apartaltwholesaler on apart.alternativewholesalerid = apartaltwholesaler.id "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -107,7 +110,6 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apurchaseorder.serial"
             });
 
-
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PurchaseOrderExpectedReceiveDate",
@@ -136,6 +138,36 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitempartrequest.received"
             });
 
+            //  FieldDefinitions.Add(new DataListFieldDefinition
+            // {
+            //     TKey = "Vendor",
+            //     FieldKey = "POVENDOR",
+            //     UiFieldDataType = (int)UiFieldDataType.Text,
+            //     AType = (int)AyaType.Vendor,
+            //     SqlIdColumnName = "apurchaseorder.vendoridid",
+            //     SqlValueColumnName = "apovendor.name"
+            // });
+
+            //  FieldDefinitions.Add(new DataListFieldDefinition
+            // {
+            //     TKey = "PartWholesalerID",
+            //     FieldKey = "PartWholesalerID",
+            //     UiFieldDataType = (int)UiFieldDataType.Text,
+            //     AType = (int)AyaType.Vendor,
+            //     SqlIdColumnName = "apart.wholesalerid",
+            //     SqlValueColumnName = "apartwholesaler.name"
+            // });
+
+            //  FieldDefinitions.Add(new DataListFieldDefinition
+            // {
+            //     TKey = "PartAlternativeWholesalerID",
+            //     FieldKey = "PartAlternativeWholesalerID",
+            //     UiFieldDataType = (int)UiFieldDataType.Text,
+            //     AType = (int)AyaType.Vendor,
+            //     SqlIdColumnName = "apart.alternativewholesalerid",
+            //     SqlValueColumnName = "apartaltwholesaler.name"
+            // });
+
 
             //META column 
             FieldDefinitions.Add(new DataListFieldDefinition