diff --git a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs index be16d084..c4e06ba0 100644 --- a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs @@ -22,6 +22,7 @@ namespace AyaNova.DataList //workorder item travel + "left join aworkorderitemtravel on aworkorderitem.id=aworkorderitemtravel.workorderitemid " + "left join auser on (aworkorderitemtravel.userid=auser.id) " + + "left join atravelrate on (aworkorderitemtravel.travelrateid=atravelrate.id) " ; @@ -34,21 +35,21 @@ namespace AyaNova.DataList "Customer", "WorkOrderServiceDate", "WorkOrderItemTravelUserID", - "WorkOrderItemTravelTravelRateQuantity", - "WorkOrderItemTravelTravelRateID" + "WorkOrderItemTravelRateQuantity", + "WorkOrderItemTravelServiceRateID" }; DefaultSortBy = new Dictionary() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" }, { "WorkOrderItemTravelUserID", "+" } }; FieldDefinitions = new List(); - /* - ████████╗██████╗ █████╗ ██╗ ██╗███████╗██╗ - ╚══██╔══╝██╔══██╗██╔══██╗██║ ██║██╔════╝██║ - ██║ ██████╔╝███████║██║ ██║█████╗ ██║ - ██║ ██╔══██╗██╔══██║╚██╗ ██╔╝██╔══╝ ██║ - ██║ ██║ ██║██║ ██║ ╚████╔╝ ███████╗███████╗ - ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═══╝ ╚══════╝╚══════╝ - */ + /* + ████████╗██████╗ █████╗ ██╗ ██╗███████╗██╗ + ╚══██╔══╝██╔══██╗██╔══██╗██║ ██║██╔════╝██║ + ██║ ██████╔╝███████║██║ ██║█████╗ ██║ + ██║ ██╔══██╗██╔══██║╚██╗ ██╔╝██╔══╝ ██║ + ██║ ██║ ██║██║ ██║ ╚████╔╝ ███████╗███████╗ + ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═══╝ ╚══════╝╚══════╝ + */ #region WorkOrderItemTravel fields /* l.Add(new FormField { TKey = "WorkOrderItemTravelStartDate", FieldKey = "WorkOrderItemTravelStartDate", TKeySection = "WorkOrderItemTravels" }); @@ -77,51 +78,51 @@ l.Add(new FormField { TKey = "WorkOrderItemTravelNoChargeQuantity", FieldKey = " FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderItemTravelTravelRateQuantity", - FieldKey = "WorkOrderItemTravelTravelRateQuantity", + TKey = "WorkOrderItemTravelRateQuantity", + FieldKey = "WorkOrderItemTravelRateQuantity", AType = (int)AyaType.WorkOrderItemTravel, UiFieldDataType = (int)UiFieldDataType.Decimal, SqlIdColumnName = "aworkorderitemtravel.id", - SqlValueColumnName = "aworkorderitemtravel.serviceratequantity" + SqlValueColumnName = "aworkorderitemtravel.travelratequantity" }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderItemTravelTravelRateID", - FieldKey = "WorkOrderItemTravelTravelRateID", + TKey = "WorkOrderItemTravelServiceRateID", + FieldKey = "WorkOrderItemTravelServiceRateID", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.TravelRate, - SqlIdColumnName = "aworkorderitemtravel.servicerateid", - SqlValueColumnName = "aservicerate.name" + SqlIdColumnName = "aworkorderitemtravel.travelrateid", + SqlValueColumnName = "atravelrate.name" }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderItemTravelServiceStartDate", - FieldKey = "WorkOrderItemTravelServiceStartDate", + TKey = "WorkOrderItemTravelStartDate", + FieldKey = "WorkOrderItemTravelStartDate", AType = (int)AyaType.WorkOrderItemTravel, UiFieldDataType = (int)UiFieldDataType.DateTime, SqlIdColumnName = "aworkorderitemtravel.id", - SqlValueColumnName = "aworkorderitemtravel.servicestartdate", + SqlValueColumnName = "aworkorderitemtravel.travelstartdate", IsRowId = true }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderItemTravelServiceStopDate", - FieldKey = "WorkOrderItemTravelServiceStopDate", + TKey = "WorkOrderItemTravelStopDate", + FieldKey = "WorkOrderItemTravelStopDate", AType = (int)AyaType.WorkOrderItemTravel, UiFieldDataType = (int)UiFieldDataType.DateTime, SqlIdColumnName = "aworkorderitemtravel.id", - SqlValueColumnName = "aworkorderitemtravel.servicestopdate" + SqlValueColumnName = "aworkorderitemtravel.travelstopdate" }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderItemTravelServiceDetails", - FieldKey = "WorkOrderItemTravelServiceDetails", + TKey = "WorkOrderItemTravelDetails", + FieldKey = "WorkOrderItemTravelDetails", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorderitemtravel.servicedetails" + SqlValueColumnName = "aworkorderitemtravel.traveldetails" }); FieldDefinitions.Add(new DataListFieldDefinition