From e13f2df00319c789bc86a5723b5bd72d8d454151 Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Wed, 14 May 2025 00:21:59 +0200 Subject: [PATCH] Merged PR 16582: RDS Query List, default sort order Added in a default sort order using the cassette number to RDS list. This is to facilitate 7 digit RDS numbers. Related work items: #227112 --- LSL2/STPROC/RDS_SERVICES.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/LSL2/STPROC/RDS_SERVICES.txt b/LSL2/STPROC/RDS_SERVICES.txt index bc7d09b..d29b3b2 100644 --- a/LSL2/STPROC/RDS_SERVICES.txt +++ b/LSL2/STPROC/RDS_SERVICES.txt @@ -418,8 +418,9 @@ end service // Rows are @FM delimted while columns are @VM delimited. //---------------------------------------------------------------------------------------------------------------------- Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList) - RDSList = '' + RDSList = '' + If ( (WorkOrderNo NE '') or (RDSOverrideList NE '') ) then If ShowGasGauge NE True$ then ShowGasGauge = False$ rv = Set_Status(0) @@ -431,6 +432,7 @@ Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList) Swap @FM with @VM in RDSOverrideList RDSKeys = RDSOverrideList end + StatusCode = '' If Get_Status(StatusCode) then Error_Services('Add', 'Error calling Extract_SI_Keys in the ' : Service : ' service. StatusCode: ' : StatusCode) @@ -489,7 +491,9 @@ Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList) end else Error_Services('Add', 'WorkOrderNo or RDSOverrideList argument was missing from the ' : Service : ' service.') end - + //Sort based on cassette number + Locate 'RUN_ORDER_NUM' in Columns using @VM setting ColNoCassNo else ColNoCassNo = 1 + RDSList = SRP_Sort_Array(RDSList, 'AR' : ColNoCassNo, True$, @FM) Response = RDSList end service @@ -1800,3 +1804,4 @@ return +