diff --git a/LSL2/STPROC/RDS_SERVICES.txt b/LSL2/STPROC/RDS_SERVICES.txt
index b534b15..b37384c 100644
--- a/LSL2/STPROC/RDS_SERVICES.txt
+++ b/LSL2/STPROC/RDS_SERVICES.txt
@@ -81,6 +81,7 @@ $Insert TOOL_EQUATES
 $Insert POPUP_EQUATES
 $Insert NOTIFICATION_EQUATES
 $Insert DICT_EQUATES
+$Insert COMPANY_EQUATES
 
 EQU COL$LSID			TO 1
 EQU COL$RECIPE			TO 2
@@ -1085,7 +1086,8 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
 			If SRP_JSON(objJSON, 'New', 'Object') then
 				
 				If SRP_JSON(objRDS, 'New', 'Object') then
-					WOMatKey   = {WO_MAT_KEY}
+					WOMatKey     = {WO_MAT_KEY}
+					SAPBatchNo   = Database_Services('ReadDataColumn', 'WO_MAT', WOMatKey, WO_MAT_SAP_BATCH_NO$, True$, 0, False$)
 					SRP_JSON(objRDS, 'SetValue', 'keyId', @ID)
 					SRP_JSON(objRDS, 'SetValue', 'reactor', {REACTOR})
 					SRP_JSON(objRDS, 'SetValue', 'workOrder', {WO})
@@ -1104,8 +1106,8 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
 					SRP_JSON(objRDS, 'SetValue', 'dtmOut', Trim(OConv({DATE_OUT}, 'D4/H'):' ':OConv({TIME_OUT}, 'MTHS')))
 					SRP_JSON(objRDS, 'SetValue', 'postEpiSig', {POST_EPI_SIG})
 					SRP_JSON(objRDS, 'SetValue', 'postEpiSigDtm', Trim(OConv({POST_EPI_SIG_DATE}, 'D4/H'):' ':OConv({POST_EPI_SIG_TIME}, 'MTHS')))
-					SRP_JSON(objRDS, 'SetValue', 'sapBatchNo', {SAP_BATCH_NO})
-					SAPTxDtm   = Xlate('WO_MAT', {WO_MAT_KEY}, 'SAP_TX_DTM', 'X')
+					SRP_JSON(objRDS, 'SetValue', 'SapBatchNo', SAPBatchNo)
+					SAPTxDtm     = Xlate('WO_MAT', {WO_MAT_KEY}, 'SAP_TX_DTM', 'X')
 					SRP_JSON(objRDS, 'SetValue', 'sapTxDtm', Trim(OConv(SAPTxDtm, 'DT2/^H')))
 					SRP_JSON(objRDS, 'SetValue', 'supVerSig', {SUP_VER_SIG})
 					SRP_JSON(objRDS, 'SetValue', 'supVerSigDtm', Trim(OConv({SUP_VER_SIG_DATE}, 'D4/H'):' ':OConv({SUP_VER_SIG_TIME}, 'MTHS')))
@@ -1116,8 +1118,18 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
 					SRP_JSON(objRDS, 'SetValue', 'loadLockSide', {LOAD_LOCK_SIDE})
 					SRP_JSON(objRDS, 'SetValue', 'waferSize', {WAFER_SIZE})
 					SRP_JSON(objRDS, 'SetValue', 'reactorType', {REACTOR_TYPE})
-					CurrWfrCnt = Xlate('WO_MAT', {WO_MAT_KEY}, 'CURR_WFR_CNT', 'X')
+					CurrWfrCnt   = Xlate('WO_MAT', {WO_MAT_KEY}, 'CURR_WFR_CNT', 'X')
 					SRP_JSON(objRDS, 'SetValue', 'CURR_WFR_CNT', CurrWfrCnt)
+					CustNo       = Database_Services('ReadDataColumn', 'WO_LOG', {WO}, WO_LOG_CUST_NO$, True$, 0, False$)
+					CustReshipNo = Database_Services('ReadDataColumn', 'WO_MAT', {WO_MAT_KEY}, WO_MAT_RESHIP_CUST_NO$, True$, 0, False$)
+					If CustReshipNo NE '' then
+					    CustNo = CustReshipNo
+					end
+                    CustName     = Database_Services('ReadDataColumn', 'COMPANY', CustNo, COMPANY_CO_NAME$, True$, 0, False$)
+                    CustAbbrev   = Database_Services('ReadDataColumn', 'COMPANY', CustNo, COMPANY_ABBREV$, True$, 0, False$)
+                    SRP_JSON(objRDS, 'SetValue', 'CustNo', CustNo)
+                    SRP_JSON(objRDS, 'SetValue', 'CustName', CustName)
+                    SRP_JSON(objRDS, 'SetValue', 'CustAbbrev', CustAbbrev)
 					
 					// Save system variables
 					AtID         = @ID
@@ -1660,3 +1672,4 @@ return
 
 
 
+
diff --git a/LSL2/STPROC/WM_OUT_SERVICES.txt b/LSL2/STPROC/WM_OUT_SERVICES.txt
index a345320..c15a91a 100644
--- a/LSL2/STPROC/WM_OUT_SERVICES.txt
+++ b/LSL2/STPROC/WM_OUT_SERVICES.txt
@@ -53,6 +53,9 @@ $Insert LOGICAL
 $Insert MSG_EQUATES
 $Insert DICT_EQUATES
 $Insert WM_OUT_EQUATES
+$Insert WO_MAT_EQUATES
+$Insert WO_LOG_EQUATES
+$Insert COMPANY_EQUATES
 
 Declare function   Database_Services, SRP_JSON, Error_Services, Clean_Insp_Services, WO_Mat_QA_Services
 Declare function   PSN_Services, SRP_Rotate_Array, Datetime
@@ -147,8 +150,20 @@ Service ConvertRecordToJSON(KeyID, Record, ItemURL)
                     SRP_JSON(objWMOut, 'SetValue', 'workOrder', {WO_NO})
                     SRP_JSON(objWMOut, 'SetValue', 'outCassNo', {OUT_CASS_NO})
                     WoMatKey            = {WO_NO} : '*' : {OUT_CASS_NO}
+                    SAPBatchNo          = Database_Services('ReadDataColumn', 'WO_MAT', WoMatKey, WO_MAT_SAP_BATCH_NO$, True$, 0, False$)
+                    SRP_JSON(objWMOut, 'SetValue', 'SapBatchNo', SAPBatchNo, 'String')
                     CurrWfrQty          = XLATE('WO_MAT', WoMatKey, 'CURR_WFR_CNT', 'X')
                     SRP_JSON(objWMOut, 'SetValue', 'CURR_WFR_CNT', CurrWfrQty)
+                    CustNo              = Database_Services('ReadDataColumn', 'WO_LOG', {WO_NO}, WO_LOG_CUST_NO$, True$, 0, False$)
+                    CustReshipNo = Database_Services('ReadDataColumn', 'WO_MAT', WoMatKey, WO_MAT_RESHIP_CUST_NO$, True$, 0, False$)
+					If CustReshipNo NE '' then
+					    CustNo = CustReshipNo
+					end
+                    CustName            = Database_Services('ReadDataColumn', 'COMPANY', CustNo, COMPANY_CO_NAME$, True$, 0, False$)
+                    CustAbbrev          = Database_Services('ReadDataColumn', 'COMPANY', CustNo, COMPANY_ABBREV$, True$, 0, False$)
+                    SRP_JSON(objWMOut, 'SetValue', 'CustNo', CustNo)
+                    SRP_JSON(objWMOut, 'SetValue', 'CustName', CustName)
+                    SRP_JSON(objWMOut, 'SetValue', 'CustAbbrev', CustAbbrev)
                     SRP_JSON(objWMOut, 'SetValue', 'PSN', {PS_NO})
                     SRP_JSON(objWMOut, 'SetValue', 'partNo', {PART_NO})
                     SRP_JSON(objWMOut, 'SetValue', 'postEpiSig', {POST_EPI_SIG})
@@ -358,3 +373,4 @@ Service GetWaferMap(WMOKey)
     end
     
 end service
+