diff --git a/LSL2/STPROC/NCR_SERVICES.txt b/LSL2/STPROC/NCR_SERVICES.txt index b471b9b..f705ec9 100644 --- a/LSL2/STPROC/NCR_SERVICES.txt +++ b/LSL2/STPROC/NCR_SERVICES.txt @@ -603,6 +603,9 @@ Service GetOpenNCRKeys() 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 If ErrorMessage NE '' then Error_Services('Add', ErrorMessage) @@ -626,7 +629,7 @@ Service ConvertRecordToJson(NCRId) SRP_JSON(objNCR, 'SetValue', 'EntryDateTime', ThisNCREntryDateTime, 'String') SRP_JSON(objNCR, 'SetValue', 'Shift', NCRRecord) ThisNCRReactorNo = NCRRecord - 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 = '' ThisNCRReactorType = Xlate('REACTOR', ThisNCRReactorNo, REACTOR_REACT_TYPE$, 'X') If ThisNCRReactorType NE 'EPP' then @@ -635,13 +638,13 @@ Service ConvertRecordToJson(NCRId) ThisNCRWONo = NCRRecord ThisNCRStepNo = NCRRecord ThisNCRCassNo = NCRRecord - ThisNCRCassId = ThisNCRWONo : '*' : ThisNCRStepNo : '*' : ThisNCRCassNo + ThisNCRCassId = ThisNCRWONo : '-' : ThisNCRStepNo : '-' : ThisNCRCassNo end - SRP_JSON(objNCR, 'SetValue', 'CasetteId', ThisNCRCassId) + SRP_JSON(objNCR, 'SetValueArray', 'CassetteId', ThisNCRCassId, @VM) SRP_JSON(objNCR, 'SetValue', 'LossStage', NCRRecord) ThisNCRRejectCount = 0 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) NCRJson = SRP_JSON(objNCR, 'Stringify', 'Styled') SRP_JSON(objNCR, 'Release')