admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-01 23:04:21 +00:00
parent 7aa0346e07
commit d4e9fa51fb
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/DataList/PurchaseOrderDataList.cs
View File

@@ -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"
});

34
server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
View File

@@ -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