This commit is contained in:
2021-06-28 19:34:23 +00:00
parent 1f03d8c232
commit 2f1c38f4dc
4 changed files with 44 additions and 23 deletions

View File

@@ -24,6 +24,7 @@ namespace AyaNova.DataList
+ "left join aunit on (aworkorderitemoutsideservice.unitid=aunit.id) "
+ "left join avendor as vendto on (aworkorderitemoutsideservice.vendorsenttoid=vendto.id) "
+ "left join avendor as vendvia on (aworkorderitemoutsideservice.vendorsentviaid=vendvia.id) "
+ "left join ataxcode on (aworkorderitemoutsideservice.taxcodeid=ataxcode.id) "
;
var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -54,25 +55,7 @@ namespace AyaNova.DataList
*/
#region WorkOrderItemOutsideService fields
/*
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceNotes", FieldKey = "WorkOrderItemOutsideServiceNotes", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemOutsideServiceUnit", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceVendorSentToID", FieldKey = "WorkOrderItemOutsideServiceVendorSentToID", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceVendorSentViaID", FieldKey = "WorkOrderItemOutsideServiceVendorSentViaID", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRMANumber", FieldKey = "WorkOrderItemOutsideServiceRMANumber", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceTrackingNumber", FieldKey = "WorkOrderItemOutsideServiceTrackingNumber", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRepairCost", FieldKey = "WorkOrderItemOutsideServiceRepairCost", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRepairPrice", FieldKey = "WorkOrderItemOutsideServiceRepairPrice", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceShippingCost", FieldKey = "WorkOrderItemOutsideServiceShippingCost", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceShippingPrice", FieldKey = "WorkOrderItemOutsideServiceShippingPrice", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateSent", FieldKey = "WorkOrderItemOutsideServiceDateSent", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateETA", FieldKey = "WorkOrderItemOutsideServiceDateETA", TKeySection = "WorkOrderItemOutsideServiceList" });
l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateReturned", FieldKey = "WorkOrderItemOutsideServiceDateReturned", TKeySection = "WorkOrderItemOutsideServiceList" });
"notes TEXT, unitid BIGINT NOT NULL REFERENCES aunit, vendorsenttoid BIGINT REFERENCES avendor, vendorsentviaid BIGINT REFERENCES avendor, rmanumber text, trackingnumber text, "
taxcodeid BIGINT REFERENCES ataxcode, repaircost DECIMAL(38,18) NOT NULL default 0, repairprice DECIMAL(38,18) NOT NULL default 0, shippingcost DECIMAL(38,18) NOT NULL default 0,
shippingprice DECIMAL(38,18) NOT NULL default 0, SentDate TIMESTAMP, etadate TIMESTAMP, returndate TIMESTAMP"
*/
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "Unit",
@@ -154,6 +137,16 @@ namespace AyaNova.DataList
// SqlValueColumnName = "aworkorderitemoutsideservice.repaircost"
// });
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "WorkOrderItemOutsideServiceTaxCode",
FieldKey = "WorkOrderItemOutsideServiceTaxCode",
UiFieldDataType = (int)UiFieldDataType.Text,
AType = (int)AyaType.TaxCode,
SqlIdColumnName = "aworkorderitemoutsideservice.taxcodeid",
SqlValueColumnName = "ataxcode.name"
});
//META column
FieldDefinitions.Add(new DataListFieldDefinition