From 8b3f1f8c221febc6962007d6ea0453b9901984be Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 28 Jun 2021 17:31:28 +0000 Subject: [PATCH] --- .../AyaNova/DataList/WorkOrderItemPartDataList.cs | 14 ++++++++++++++ .../AyaNova/DataList/WorkOrderItemUnitDataList.cs | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs index 9123ca20..a1617d04 100644 --- a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs @@ -23,6 +23,7 @@ namespace AyaNova.DataList + "left join aworkorderitempart on aworkorderitem.id=aworkorderitempart.workorderitemid " + "left join apart on (aworkorderitempart.partid=apart.id) " + "left join apartwarehouse on (aworkorderitempart.partwarehouseid=apartwarehouse.id) " + + "left join ataxcode on (aworkorderitempart.taxpartsaleid=ataxcode.id) " ; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); @@ -114,6 +115,19 @@ namespace AyaNova.DataList }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPartTaxPartSaleID", + FieldKey = "WorkOrderItemPartTaxPartSaleID", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.TaxCode, + SqlIdColumnName = "aworkorderitempart.taxpartsaleid", + SqlValueColumnName = "ataxcode.name" + }); + + + //META column FieldDefinitions.Add(new DataListFieldDefinition { diff --git a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs index 84b72dcd..ff1966fd 100644 --- a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs @@ -452,17 +452,6 @@ namespace AyaNova.DataList }); - /* - - await ExecQueryAsync("CREATE TABLE aworkorder (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, " - + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT NOT NULL REFERENCES acustomer (id), " - + "projectid BIGINT REFERENCES aproject, contractid BIGINT NULL, internalreferencenumber text, customerreferencenumber text, customercontactname text, " - + "servicedate TIMESTAMP, completebydate TIMESTAMP, invoicenumber TEXT, customersignature TEXT, customersignaturename TEXT, customersignaturecaptured TIMESTAMP, " - + "techsignature TEXT, techsignaturename TEXT, techsignaturecaptured TIMESTAMP, durationtocompleted INTERVAL NOT NULL, onsite BOOL NOT NULL, contract TEXT, " - + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6) " - + ")");//n - */ - FieldDefinitions.Add(new DataListFieldDefinition {