phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added customer and SAP Batch No. fields to JSON objects for WM_OUT and RDS

Browse Source
This commit is contained in:
Infineon\Ouellette 2025-01-14 12:02:00 -07:00
parent 84ab215aee
commit 3cd56295dc
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LSL2/STPROC/RDS_SERVICES.txt
View File

@ -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
@ -1086,6 +1087,7 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
If SRP_JSON(objRDS, 'New', 'Object') then
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,7 +1106,7 @@ 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})
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})
@ -1118,6 +1120,16 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
SRP_JSON(objRDS, 'SetValue', 'reactorType', {REACTOR_TYPE})
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

16
LSL2/STPROC/WM_OUT_SERVICES.txt
View File

@ -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