Commiting what I have so far. GET API is set up
This commit is contained in:
committed by
Ouellette Jonathan (CSC FI SPS MESLEO)
parent
94ef7f9084
commit
8d9ebaf8b4
@ -82,6 +82,7 @@ $Insert POPUP_EQUATES
|
||||
$Insert NOTIFICATION_EQUATES
|
||||
$Insert DICT_EQUATES
|
||||
$Insert COMPANY_EQUATES
|
||||
$Insert RETURN_TO_FAB_LOTS_EQUATES
|
||||
|
||||
EQU COL$LSID TO 1
|
||||
EQU COL$RECIPE TO 2
|
||||
@ -118,7 +119,7 @@ Declare function Work_Order_Services, SRP_JSON, Logging_Services, Environment
|
||||
Declare function Memberof, Obj_WO_Mat, Obj_WO_Mat_Log, SRP_Array, DateTime, Dialog_Box, obj_Prod_Spec
|
||||
Declare function RDS_Services, RTI_DistinctList, GetTickCount, Clean_Insp_Services, WO_Mat_QA_Services
|
||||
Declare function PSN_Services, Rds_Layer_Services, SRP_Rotate_Array, Qa_Services, SRP_Date, SRP_Time, SRP_Datetime
|
||||
Declare function Reactor_Services, Signature_Services, obj_rds, Test_Run_Services
|
||||
Declare function Reactor_Services, Signature_Services, obj_rds, Test_Run_Services, Return_To_Fab_Services
|
||||
|
||||
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\RDS'
|
||||
LogDate = Oconv(Date(), 'D4/')
|
||||
@ -1074,7 +1075,6 @@ end service
|
||||
|
||||
|
||||
Service ConvertRecordToJSON(KeyID, Record, itemURL)
|
||||
|
||||
jsonRecord = ''
|
||||
If KeyID NE '' then
|
||||
|
||||
@ -1125,12 +1125,12 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
|
||||
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$)
|
||||
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
|
||||
AtRecord = @Record
|
||||
@ -1224,7 +1224,29 @@ Service ConvertRecordToJSON(KeyID, Record, itemURL)
|
||||
SRP_JSON(objRDS, 'Set', 'rdsLayers', objRDSLayerArray)
|
||||
SRP_JSON(objRDSLayerArray, 'Release')
|
||||
end
|
||||
|
||||
AllRTFRecords = Return_To_Fab_Services('GetReturnToFabRecordIdByCassId', KeyID)
|
||||
If AllRTFRecords NE '' then
|
||||
objRTFRecords = ''
|
||||
If SRP_JSON(objRTFRecords, 'New', 'Array') then
|
||||
For each RTFRecordId in AllRTFRecords using @VM setting vPos
|
||||
objRTF = ''
|
||||
If SRP_JSON(objRTF, 'New', 'Object') then
|
||||
RTFRecord = Database_Services('ReadDataRow', 'RETURN_TO_FAB_LOTS', RTFRecordId, True$, 0, False$)
|
||||
SRP_JSON(objRTF, 'SetValue', 'ReturnToFabLotsId', RTFRecordId)
|
||||
SRP_JSON(objRTF, 'SetValue', 'StartDtm', OConv(RTFRecord<RETURN_TO_FAB_LOTS_MH_INIT_DTM$>, 'DT'))
|
||||
SRP_JSON(objRTF, 'SetValue', 'Completed', RTFRecord<RETURN_TO_FAB_LOTS_COMPLETED$>, 'Boolean')
|
||||
SRP_JSON(objRTFRecords, 'Set', 'ReturnToFabRecord', objRTF)
|
||||
SRP_JSON(objRTFRecords, 'Add', objRTF)
|
||||
SRP_JSON(objRTF, 'Release')
|
||||
end
|
||||
Next RTFRecordId
|
||||
|
||||
SRP_JSON(objRDS, 'Set', 'ReturnToFabRecords', objRTFRecords)
|
||||
SRP_JSON(objRTFRecords, 'Release')
|
||||
end
|
||||
end else
|
||||
SRP_JSON(objRDS, 'SetValue', 'ReturnToFabRecords', '')
|
||||
end
|
||||
SRP_JSON(objJSON, 'Set', 'rds', objRDS)
|
||||
SRP_JSON(objRDS, 'Release')
|
||||
end
|
||||
@ -1673,3 +1695,4 @@ return
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user