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

Pushing final backend changes to scanner

Browse Source
This commit is contained in:
Infineon\Ouellette 2024-12-11 16:27:59 -07:00 committed by Ouellette Jonathan (CSC FI SPS MESLEO)
parent 0c2a5770a9
commit 8701ded568
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
LSL2/STPROC/SCAN_SERVICES.txt
View File

@ -279,7 +279,8 @@ Service ProcessScanData(ScanID, ScanJSON)
Case ScanData[1, 4] EQ '1TTW' Case ScanData[1, 4] EQ '1TTW'
ValidTWLot = False$ ValidTWLot = False$
If RowExists('LOT', LotId) then If RowExists('LOT', LotId) then
Locate LotId in ScansRow<SCANS.TW_LOT_ID$> using @VM setting twPos then TWLots = ScansRow<SCANS.TW_LOT_ID$>
Locate LotId in TWLots using @VM setting twPos then
Error_Services('Add', LotID : ' has already been added as a test wafer lot being used.') Error_Services('Add', LotID : ' has already been added as a test wafer lot being used.')
end else end else
LotCurrentOperation = Lot_Services('GetLotCurrOperationName', LotId) LotCurrentOperation = Lot_Services('GetLotCurrOperationName', LotId)
@ -534,6 +535,8 @@ Service ProcessScanData(ScanID, ScanJSON)
Case ScanData[1, 17] EQ 'TESTRUNTYPEUPDATE' Case ScanData[1, 17] EQ 'TESTRUNTYPEUPDATE'
TestRunTypeId = Field(ScanData, '|', 2) TestRunTypeId = Field(ScanData, '|', 2)
ScansRow<SCANS.TEST_RUN_TYPE_ID$> = TestRunTypeId ScansRow<SCANS.TEST_RUN_TYPE_ID$> = TestRunTypeId
//ScansRow<SCANS.TEST_RUN_TYPE_NAME$> = TestRunTypeName
Case ScanData EQ '' Case ScanData EQ ''
// Most likely receiving RDS data, so nothing to do here. // Most likely receiving RDS data, so nothing to do here.
Null Null
@ -1082,6 +1085,7 @@ Service ProcessScanData(ScanID, ScanJSON)
Abort = False$ Abort = False$
for each TWLot in TestWaferLotData using @VM setting twPOS for each TWLot in TestWaferLotData using @VM setting twPOS
If ScansRow<SCANS.TW_LOT_QTY$, twPOS> NE '' OR ScansRow<SCANS.TW_LOT_QTY$, twPOS> GT 0 then If ScansRow<SCANS.TW_LOT_QTY$, twPOS> NE '' OR ScansRow<SCANS.TW_LOT_QTY$, twPOS> GT 0 then
TWLotCurrOperation = Lot_Services('GetLotCurrOperationName', TWLot) TWLotCurrOperation = Lot_Services('GetLotCurrOperationName', TWLot)
If TWLotCurrOperation NE 'TW_CREATE' AND TWLotCurrOperation NE 'TW_CLOSE' then If TWLotCurrOperation NE 'TW_CREATE' AND TWLotCurrOperation NE 'TW_CLOSE' then
TWLotCurrOpen = Database_Services('ReadDataColumn', 'LOT', TWLot, LOT_OPEN$, True$, 0, False$) TWLotCurrOpen = Database_Services('ReadDataColumn', 'LOT', TWLot, LOT_OPEN$, True$, 0, False$)
@ -1520,10 +1524,12 @@ Service ConvertMVScanToJSON(ScanID, mvScan, itemURL)
SRP_JSON(objScan, 'SetValue', 'type', {SCAN_TYPE}, 'String') SRP_JSON(objScan, 'SetValue', 'type', {SCAN_TYPE}, 'String')
SRP_JSON(objScan, 'SetValue', 'action', {ACTION}, 'String') SRP_JSON(objScan, 'SetValue', 'action', {ACTION}, 'String')
SRP_JSON(objScan, 'SetValue', 'testRunTypeId', {TEST_RUN_TYPE_ID}, 'Integer') SRP_JSON(objScan, 'SetValue', 'testRunTypeId', {TEST_RUN_TYPE_ID}, 'Integer')
SRP_JSON(objScan, 'SetValue', 'testRunTypeName', XLate('TEST_RUN_TYPE', {TEST_RUN_TYPE_ID}, TEST_RUN_TYPE_RUN_TYPE$, 'X'), 'String')
SRP_JSON(objScan, 'SetValue', 'acceptable', {ACCEPTABLE}, 'Boolean') SRP_JSON(objScan, 'SetValue', 'acceptable', {ACCEPTABLE}, 'Boolean')
SRP_JSON(objScan, 'SetValue', 'notAcceptableReason', {NOT_ACCEPTABLE_REASON}, 'String') SRP_JSON(objScan, 'SetValue', 'notAcceptableReason', {NOT_ACCEPTABLE_REASON}, 'String')
SRP_JSON(objScan, 'SetValue', 'result', {RESULT}, 'String') SRP_JSON(objScan, 'SetValue', 'result', {RESULT}, 'String')
SRP_JSON(objScan, 'SetValue', 'testRunTypeId', {TEST_RUN_TYPE_ID}, 'Integer')
SRP_JSON(objScan, 'SetValue', 'testRunTypeName', XLate('TEST_RUN_TYPE', {TEST_RUN_TYPE_ID}, TEST_RUN_TYPE_RUN_TYPE$, 'X'), 'String')
If SRP_JSON(arrayScanLog, 'New', 'Array') then If SRP_JSON(arrayScanLog, 'New', 'Array') then
If {SCANNED_DATES} NE '' then If {SCANNED_DATES} NE '' then
ScannedDates = {SCANNED_DATES} ScannedDates = {SCANNED_DATES}
@ -2030,6 +2036,8 @@ Service ConvertJSONScanToMV(jsonScan)
mvScan<SCANS.PL_NUMBER$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.plNumber') mvScan<SCANS.PL_NUMBER$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.plNumber')
mvScan<SCANS.UNLOAD_PL_CONFIRMED$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.unloadplConfirmed', False$) mvScan<SCANS.UNLOAD_PL_CONFIRMED$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.unloadplConfirmed', False$)
mvScan<SCANS.TRANSFER_TOOL_ID$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.tool.ID') mvScan<SCANS.TRANSFER_TOOL_ID$> = SRP_JSON(objJSONScan, 'GetValue', 'transfer.tool.ID')
mvScan<SCANS.TEST_RUN_TYPE_ID$> = SRP_JSON(objJSONScan, 'GetValue', 'scan.testRunTypId')
mvScan<SCANS.TEST_RUN_TYPE_NAME$> = SRP_JSON(objJSONScan, 'GetValue', 'scan.testRunTypeName')
arrayCassettes = SRP_JSON(objJSONScan, 'Get', 'cassetteIDs') arrayCassettes = SRP_JSON(objJSONScan, 'Get', 'cassetteIDs')
NumCassettes = SRP_JSON(arrayCassettes, 'GetCount') NumCassettes = SRP_JSON(arrayCassettes, 'GetCount')
@ -2233,3 +2241,4 @@ ClearCursors:
Next counter Next counter
return return

2
LSL2/STPROCINS/SCANS_EQUATES.txt
View File

@ -39,5 +39,7 @@ compile insert SCANS_EQUATES
equ SCANS.TW_LOT_ID$ to 30 equ SCANS.TW_LOT_ID$ to 30
equ SCANS.TW_LOT_QTY$ to 31 equ SCANS.TW_LOT_QTY$ to 31
equ SCANS.TEST_RUN_TYPE_ID$ to 32 equ SCANS.TEST_RUN_TYPE_ID$ to 32
equ SCANS.TEST_RUN_TYPE_NAME$ to 33
#endif #endif