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

Merged PR 12081: Made minor changes to OpenNCR API

Browse Source 
Made minor changes to OpenNCR API

Related work items: #237958
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-03-05 01:05:45 +01:00
parent 018322a2b3
commit 68ec22f2ba
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
LSL2/STPROC/NCR_SERVICES.txt
View File

@ -603,6 +603,9 @@ Service GetOpenNCRKeys()
option = "" option = ""
flag = "" flag = ""
Btree.Extract(srch_strng, table, @DICT, RDSRecords, option, flag) Btree.Extract(srch_strng, table, @DICT, RDSRecords, option, flag)
If Flag NE 0 then
ErrorMessage = 'Error performing BTree Extract on NCR table.'
end
end end
If ErrorMessage NE '' then If ErrorMessage NE '' then
Error_Services('Add', ErrorMessage) Error_Services('Add', ErrorMessage)
@ -626,7 +629,7 @@ Service ConvertRecordToJson(NCRId)
SRP_JSON(objNCR, 'SetValue', 'EntryDateTime', ThisNCREntryDateTime, 'String') SRP_JSON(objNCR, 'SetValue', 'EntryDateTime', ThisNCREntryDateTime, 'String')
SRP_JSON(objNCR, 'SetValue', 'Shift', NCRRecord<NCR_SHIFT$>) SRP_JSON(objNCR, 'SetValue', 'Shift', NCRRecord<NCR_SHIFT$>)
ThisNCRReactorNo = NCRRecord<NCR_REACTOR$> ThisNCRReactorNo = NCRRecord<NCR_REACTOR$>
SRP_JSON(objNCR, 'SetValue', 'Reactor', ThisNCRReactorNo);//This needs to be a list to support EpiPro SRP_JSON(objNCR, 'SetValueArray', 'Reactor', ThisNCRReactorNo, @VM);//This needs to be a list to support EpiPro
ThisNCRCassId = '' ThisNCRCassId = ''
ThisNCRReactorType = Xlate('REACTOR', ThisNCRReactorNo, REACTOR_REACT_TYPE$, 'X') ThisNCRReactorType = Xlate('REACTOR', ThisNCRReactorNo, REACTOR_REACT_TYPE$, 'X')
If ThisNCRReactorType NE 'EPP' then If ThisNCRReactorType NE 'EPP' then
@ -635,13 +638,13 @@ Service ConvertRecordToJson(NCRId)
ThisNCRWONo = NCRRecord<NCR_WO_NO$> ThisNCRWONo = NCRRecord<NCR_WO_NO$>
ThisNCRStepNo = NCRRecord<NCR_WO_STEP$> ThisNCRStepNo = NCRRecord<NCR_WO_STEP$>
ThisNCRCassNo = NCRRecord<NCR_WO_MAT_CASS_NO$> ThisNCRCassNo = NCRRecord<NCR_WO_MAT_CASS_NO$>
ThisNCRCassId = ThisNCRWONo : '*' : ThisNCRStepNo : '*' : ThisNCRCassNo ThisNCRCassId = ThisNCRWONo : '-' : ThisNCRStepNo : '-' : ThisNCRCassNo
end end
SRP_JSON(objNCR, 'SetValue', 'CasetteId', ThisNCRCassId) SRP_JSON(objNCR, 'SetValueArray', 'CassetteId', ThisNCRCassId, @VM)
SRP_JSON(objNCR, 'SetValue', 'LossStage', NCRRecord<NCR_LOSS_STAGE$>) SRP_JSON(objNCR, 'SetValue', 'LossStage', NCRRecord<NCR_LOSS_STAGE$>)
ThisNCRRejectCount = 0 ThisNCRRejectCount = 0
ThisNCRRejectCount = Obj_Ncr('RejQty', NCRId:@RM:NCRRecord) ThisNCRRejectCount = Obj_Ncr('RejQty', NCRId:@RM:NCRRecord)
SRP_JSON(objNCR, 'SetValue', 'TotalRejected', ThisNCRRejectCount) SRP_JSON(objNCR, 'SetValueArray', 'TotalRejected', ThisNCRRejectCount, @VM)
SRP_JSON(objNCR, 'SetValue', 'LossComments', NCRRecord<NCR_LOSS_COMMENTS$>) SRP_JSON(objNCR, 'SetValue', 'LossComments', NCRRecord<NCR_LOSS_COMMENTS$>)
NCRJson = SRP_JSON(objNCR, 'Stringify', 'Styled') NCRJson = SRP_JSON(objNCR, 'Stringify', 'Styled')
SRP_JSON(objNCR, 'Release') SRP_JSON(objNCR, 'Release')