From 8f25d78fe6d5e8a1f760e50f39fcf39df9bc6ab4 Mon Sep 17 00:00:00 2001
From: "Infineon\\Mitchem" <mitchem.external@infineon.com>
Date: Mon, 30 Jun 2025 13:12:11 -0700
Subject: [PATCH] Final fixes.

---
 LSL2/STPROC/NDW_RDS_QUERY_EVENTS.txt |   3 +-
 LSL2/STPROC/RDS_LAYER_SERVICES.txt   | 188 +++++++++++++--------------
 2 files changed, 89 insertions(+), 102 deletions(-)

diff --git a/LSL2/STPROC/NDW_RDS_QUERY_EVENTS.txt b/LSL2/STPROC/NDW_RDS_QUERY_EVENTS.txt
index f924261..d07fbb7 100644
--- a/LSL2/STPROC/NDW_RDS_QUERY_EVENTS.txt
+++ b/LSL2/STPROC/NDW_RDS_QUERY_EVENTS.txt
@@ -215,7 +215,7 @@ Event PUB_ENG_OPTIONS.CLICK()
                 
              Case SelOpt EQ 'CLEAN_INSP':@VM: 'UPDATE_RDS_LAYER'
                 Caption        = "Updating RDS Layer and Clean & Insp specs for selected RDS cassettes..."
-                ServiceModules = 'WO_MAT_QA_SERVICES':@VM:'RDS_LAYER_SERVICES'
+                ServiceModules = 'CLEAN_INSP_SERVICES':@VM:'RDS_LAYER_SERVICES'
                 Services       = 'UpdateAllCleanInsp':@VM:'UpdateRDSLayerSpecs'
                 
             Case SelOpt EQ 'CLEAN_INSP':@VM:'QA_MET':@VM: 'UPDATE_RDS_LAYER'
@@ -679,3 +679,4 @@ return
 
 
 
+
diff --git a/LSL2/STPROC/RDS_LAYER_SERVICES.txt b/LSL2/STPROC/RDS_LAYER_SERVICES.txt
index 532e7c1..05ebac1 100644
--- a/LSL2/STPROC/RDS_LAYER_SERVICES.txt
+++ b/LSL2/STPROC/RDS_LAYER_SERVICES.txt
@@ -1,11 +1,14 @@
 Compile function RDS_LAYER_Services(@Service, @Params)
 #pragma precomp SRP_PreCompiler
-$insert LOGICAL
+
+$Insert SERVICE_SETUP
+$insert APP_INSERTS
 $insert RDS_LAYER_EQUATES
 $INSERT RECIPE_PARMS_EQU
+$Insert RDS_Equates
 
 Declare function   Database_Services, Error_Services, SRP_JSONX, SRP_JSONX_END, SRP_JSON, Obj_Tables, Obj_Recipe
-Declare subroutine Error_Services, SRP_JSONX, SRP_JSONX_BEGIN, SRP_JSON, Obj_Tables, Set_Status
+Declare subroutine Error_Services, SRP_JSONX, SRP_JSONX_BEGIN, SRP_JSON, Obj_Tables, Set_Status, Database_Services
 
 
 GoToService
@@ -50,27 +53,7 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
                 SRP_JSON(objRDSLayer, 'Release')
                 
             end
-*            SRP_JsonX_Begin('rdslayer', '{')
-*            SRP_JsonX('keyId',@ID)
-*            SRP_JsonX('EpiTime', OCONV(Record<RDS_LAYER_EPI_TIME$>, 'MD1'))
-*            SRP_JsonX('DiluentAdjParam', OCONV(Record<RDS_LAYER_DILUENT_ADJ_PARAM$>,'MD2'))
-*            SRP_JsonX('DopantFlow', OCONV(Record<RDS_LAYER_DOPANT_FLOW$>,'MD2'))
-*            SRP_JsonX('HCLFlow', OCONV(Record<RDS_LAYER_HCL_FLOW$>,'MD2'))
-*            SRP_JsonX('BakeTime', OCONV(Record<RDS_LAYER_BAKE_TIME$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('EpiH2Flow', OCONV(Record<RDS_LAYER_EPI_H2_FLOW$>,'MD0'))
-*            SRP_JsonX('TCSFlow', OCONV(Record<RDS_LAYER_TCS_FLOW$>, 'MD1'))
-*            SRP_JsonX('DCSFlow', OCONV(Record<RDS_LAYER_DCS_FLOW$>,'MD0'))
-*            SRP_JsonX('FOffset', OCONV(Record<RDS_LAYER_F_OFFSET$>,'MD0'))
-*            SRP_JsonX('SOffset', OCONV(Record<RDS_LAYER_S_OFFSET$>,'MD0'))
-*            SRP_JsonX('ROffset', OCONV(Record<RDS_LAYER_R_OFFSET$>,'MD0'))
-*            SRP_JsonX('Etch1', OCONV(Record<RDS_LAYER_ETCH1$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('Etch2', OCONV(Record<RDS_LAYER_ETCH2$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('Etch3', OCONV(Record<RDS_LAYER_ETCH3$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('AUX1', OCONV(Record<RDS_LAYER_AUX1$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('AUX2', OCONV(Record<RDS_LAYER_AUX2$>,'[SECONDS_CONV]'))
-*            SRP_JsonX('ULTemp', OCONV(Record<RDS_LAYER_UL_TEMP$>,'MD0'))
-*            SRP_JsonX('SuscEtch', OCONV(Record<RDS_LAYER_SUSC_ETCH$>,'MD1'))
-*            jsonRecord  = SRP_JsonX_End('Pretty')
+
         end
     end else
         Error_Services('Add', 'KeyID argument was missing in the ' : Service : ' service.')
@@ -80,7 +63,8 @@ end service
 
 
 Service UpdateRDSLayerSpecs(RDSNo)
-    
+   
+   ErrMsg = ''
     IF RDSNo = ''		THEN
         Error_Services('RDSNo parameter missing from service')
         return
@@ -88,93 +72,95 @@ Service UpdateRDSLayerSpecs(RDSNo)
     
     RDSLayerKeys = Xlate('RDS', RDSNo, 'RDS_LAYER_KEYS', 'X')
 
-    LayerCount = DCount(RDSLayerKeys, @FM)
+    LayerCount = DCount(RDSLayerKeys, @VM)
     For I = 1 to LayerCount
         
-        RLKey = RDSLayerKeys<I>
+        RLKey = RDSLayerKeys<1,I>
         LayerSet = Field(RLKey, '*', 2)
 
-        Set_Status(0)
-        RLParms = 'RDS_LAYER':@RM:RLKey
-        RDSLayerRec = obj_Tables('ReadOnlyRec',RLParms)
+        RDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', RLKey, '', '', '')
 
-        IF Get_Status(errCode) THEN
-            Error_Services('Add', errCode)
-            RETURN
-        END
-            
+        IF Error_Services('NoError') then
 
-        RecipeNo	= RDSLayerRec<RDS_LAYER_RECIPE_NO$>
-        WOStepKey	= XLATE('RDS',RDSNo,RDS_WO_STEP_KEY$,'X')
-        PSNId		= XLATE('WO_STEP',WOStepKey,1,'X')
+            RecipeNo	= RDSLayerRec<RDS_LAYER_RECIPE_NO$>
+            WOStepKey	= XLATE('RDS',RDSNo,RDS_WO_STEP_KEY$,'X')
+            PSNId		= XLATE('WO_STEP',WOStepKey,1,'X')
 
-        IF INDEX(LayerSet,'L',1) THEN
-            LayerLimits = obj_Recipe('GetLimits',RecipeNo:@RM:PSNId:@RM:LayerSet)
+            IF INDEX(LayerSet,'L',1) THEN
+                LayerLimits = obj_Recipe('GetLimits',RecipeNo:@RM:PSNId:@RM:LayerSet)
 
-            RDSLayerRec<RDS_LAYER_RECIPE_NO$>			= RecipeNo
-            RDSLayerRec<RDS_LAYER_DOPANT$>				= LayerLimits<RP_DOPANT$>
+                RDSLayerRec<RDS_LAYER_RECIPE_NO$>			= RecipeNo
+                RDSLayerRec<RDS_LAYER_DOPANT$>				= LayerLimits<RP_DOPANT$>
 
-            RDSLayerRec<RDS_LAYER_EPI_DILUENT$>			= LayerLimits<RP_EPI_DILUENT$>
-            
-            RDSLayerRec<RDS_LAYER_EPI_TIME_MIN$>		= LayerLimits<RP_DEPOSIT_TIME_MIN$>
-            RDSLayerRec<RDS_LAYER_EPI_TIME_MAX$>		= LayerLimits<RP_DEPOSIT_TIME_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_DILUENT_MIN$>			= LayerLimits<RP_DILUENT_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_DILUENT_MAX$>			= LayerLimits<RP_DILUENT_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_DOPANT_FLOW_MIN$>		= LayerLimits<RP_DOPANT_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_DOPANT_FLOW_MAX$>		= LayerLimits<RP_DOPANT_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_HCL_FLOW_MIN$>		= LayerLimits<RP_HCL_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_HCL_FLOW_MAX$>		= LayerLimits<RP_HCL_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_BAKE_TIME_MIN$>		= LayerLimits<RP_BAKE_TIME_MIN$>
-            RDSLayerRec<RDS_LAYER_BAKE_TIME_MAX$>		= LayerLimits<RP_BAKE_TIME_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_EPI_H2_FLOW_MIN$>		= LayerLimits<RP_H2_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_EPI_H2_FLOW_MAX$>		= LayerLimits<RP_H2_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_TCS_FLOW_MIN$>		= LayerLimits<RP_TCS_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_TCS_FLOW_MAX$>		= LayerLimits<RP_TCS_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_DCS_FLOW_MIN$>		= LayerLimits<RP_DCS_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_DCS_FLOW_MAX$>		= LayerLimits<RP_DCS_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_AUX1_MIN$>			= LayerLimits<RP_AUX1_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_AUX1_MAX$>			= LayerLimits<RP_AUX1_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_AUX2_MIN$>			= LayerLimits<RP_AUX2_FLOW_MIN$>
-            RDSLayerRec<RDS_LAYER_AUX2_MAX$>			= LayerLimits<RP_AUX2_FLOW_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_F_OFFSET_MIN$>		= LayerLimits<RP_FOFFSET_MIN$>
-            RDSLayerRec<RDS_LAYER_F_OFFSET_MAX$>		= LayerLimits<RP_FOFFSET_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_S_OFFSET_MIN$>		= LayerLimits<RP_SOFFSET_MIN$>
-            RDSLayerRec<RDS_LAYER_S_OFFSET_MAX$>		= LayerLimits<RP_SOFFSET_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_R_OFFSET_MIN$>		= LayerLimits<RP_ROFFSET_MIN$>
-            RDSLayerRec<RDS_LAYER_R_OFFSET_MAX$>		= LayerLimits<RP_ROFFSET_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_SUSC_ETCH_MIN$>		= LayerLimits<RP_SUSC_ETCH_MIN$>
-            RDSLayerRec<RDS_LAYER_SUSC_ETCH_MAX$>		= LayerLimits<RP_SUSC_ETCH_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_ETCH1_MIN$>			= LayerLimits<RP_ETCH1_MIN$>
-            RDSLayerRec<RDS_LAYER_ETCH1_MAX$>			= LayerLimits<RP_ETCH1_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_ETCH2_MIN$>			= LayerLimits<RP_ETCH2_MIN$>
-            RDSLayerRec<RDS_LAYER_ETCH2_MAX$>			= LayerLimits<RP_ETCH2_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_ETCH3_MIN$> = LayerLimits<RP_ETCH3_MIN$>
-            RDSLayerRec<RDS_LAYER_ETCH3_MAX$> = LayerLimits<RP_ETCH3_MAX$>
-            
-            RDSLayerRec<RDS_LAYER_UL_TEMP_MIN$> = LayerLimits<RP_UL_TEMP_MIN$>
-            RDSLayerRec<RDS_LAYER_UL_TEMP_MAX$> = LayerLimits<RP_UL_TEMP_MAX$>
-            
-        END
+                RDSLayerRec<RDS_LAYER_EPI_DILUENT$>			= LayerLimits<RP_EPI_DILUENT$>
+                
+                RDSLayerRec<RDS_LAYER_EPI_TIME_MIN$>		= LayerLimits<RP_DEPOSIT_TIME_MIN$>
+                RDSLayerRec<RDS_LAYER_EPI_TIME_MAX$>		= LayerLimits<RP_DEPOSIT_TIME_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_DILUENT_MIN$>			= LayerLimits<RP_DILUENT_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_DILUENT_MAX$>			= LayerLimits<RP_DILUENT_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_DOPANT_FLOW_MIN$>		= LayerLimits<RP_DOPANT_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_DOPANT_FLOW_MAX$>		= LayerLimits<RP_DOPANT_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_HCL_FLOW_MIN$>		= LayerLimits<RP_HCL_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_HCL_FLOW_MAX$>		= LayerLimits<RP_HCL_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_BAKE_TIME_MIN$>		= LayerLimits<RP_BAKE_TIME_MIN$>
+                RDSLayerRec<RDS_LAYER_BAKE_TIME_MAX$>		= LayerLimits<RP_BAKE_TIME_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_EPI_H2_FLOW_MIN$>		= LayerLimits<RP_H2_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_EPI_H2_FLOW_MAX$>		= LayerLimits<RP_H2_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_TCS_FLOW_MIN$>		= LayerLimits<RP_TCS_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_TCS_FLOW_MAX$>		= LayerLimits<RP_TCS_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_DCS_FLOW_MIN$>		= LayerLimits<RP_DCS_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_DCS_FLOW_MAX$>		= LayerLimits<RP_DCS_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_AUX1_MIN$>			= LayerLimits<RP_AUX1_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_AUX1_MAX$>			= LayerLimits<RP_AUX1_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_AUX2_MIN$>			= LayerLimits<RP_AUX2_FLOW_MIN$>
+                RDSLayerRec<RDS_LAYER_AUX2_MAX$>			= LayerLimits<RP_AUX2_FLOW_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_F_OFFSET_MIN$>		= LayerLimits<RP_FOFFSET_MIN$>
+                RDSLayerRec<RDS_LAYER_F_OFFSET_MAX$>		= LayerLimits<RP_FOFFSET_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_S_OFFSET_MIN$>		= LayerLimits<RP_SOFFSET_MIN$>
+                RDSLayerRec<RDS_LAYER_S_OFFSET_MAX$>		= LayerLimits<RP_SOFFSET_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_R_OFFSET_MIN$>		= LayerLimits<RP_ROFFSET_MIN$>
+                RDSLayerRec<RDS_LAYER_R_OFFSET_MAX$>		= LayerLimits<RP_ROFFSET_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_SUSC_ETCH_MIN$>		= LayerLimits<RP_SUSC_ETCH_MIN$>
+                RDSLayerRec<RDS_LAYER_SUSC_ETCH_MAX$>		= LayerLimits<RP_SUSC_ETCH_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_ETCH1_MIN$>			= LayerLimits<RP_ETCH1_MIN$>
+                RDSLayerRec<RDS_LAYER_ETCH1_MAX$>			= LayerLimits<RP_ETCH1_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_ETCH2_MIN$>			= LayerLimits<RP_ETCH2_MIN$>
+                RDSLayerRec<RDS_LAYER_ETCH2_MAX$>			= LayerLimits<RP_ETCH2_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_ETCH3_MIN$> = LayerLimits<RP_ETCH3_MIN$>
+                RDSLayerRec<RDS_LAYER_ETCH3_MAX$> = LayerLimits<RP_ETCH3_MAX$>
+                
+                RDSLayerRec<RDS_LAYER_UL_TEMP_MIN$> = LayerLimits<RP_UL_TEMP_MIN$>
+                RDSLayerRec<RDS_LAYER_UL_TEMP_MAX$> = LayerLimits<RP_UL_TEMP_MAX$>
+                
+            END
 
-        RLParms = FieldStore(RLParms, @RM, 4, 1, RDSLayerRec)
-        obj_Tables('WriteOnlyRec',RLParms)		
+            Database_Services('WriteDataRow', 'RDS_LAYER', RLKey, RDSLayerRec, True$, False$, False$)
             
+        end else
+            Errmsg = Error_Services('GetMessage')
+        end
+        
+    Until Errmsg NE ''
+        
     Next I
-   
+    
+    If ErrMsg NE '' then Error_Services('Add',ErrMsg)
+    
 end service
+