Merged PR 11838: fixed verification logic to remove prefix
fixed verification logic to remove prefix
This commit is contained in:
parent
1f1ecbe85b
commit
15495aa7ef
@ -108,6 +108,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, FirstCassID, OperatorID
|
|||||||
CassetteID = ScanData
|
CassetteID = ScanData
|
||||||
Swap 'FDI' with '' in CassetteID
|
Swap 'FDI' with '' in CassetteID
|
||||||
Swap '^FS' with '' in CassetteID
|
Swap '^FS' with '' in CassetteID
|
||||||
|
Swap 'I' with '' in CassetteID
|
||||||
Convert '.' to '*' in CassetteID
|
Convert '.' to '*' in CassetteID
|
||||||
WMIRow = Database_Services('ReadDataRow', 'WM_IN', CassetteID)
|
WMIRow = Database_Services('ReadDataRow', 'WM_IN', CassetteID)
|
||||||
If Error_Services('NoError') then
|
If Error_Services('NoError') then
|
||||||
@ -136,6 +137,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, FirstCassID, OperatorID
|
|||||||
CassetteID = ScanData
|
CassetteID = ScanData
|
||||||
Swap 'FDI' with '' in CassetteID
|
Swap 'FDI' with '' in CassetteID
|
||||||
Swap '^FS' with '' in CassetteID
|
Swap '^FS' with '' in CassetteID
|
||||||
|
Swap 'I' with '' in CassetteID
|
||||||
Convert '.' to '*' in CassetteID
|
Convert '.' to '*' in CassetteID
|
||||||
WMIRow = Database_Services('ReadDataRow', 'WM_IN', CassetteID)
|
WMIRow = Database_Services('ReadDataRow', 'WM_IN', CassetteID)
|
||||||
If Error_Services('NoError') then
|
If Error_Services('NoError') then
|
||||||
@ -416,6 +418,7 @@ end service
|
|||||||
|
|
||||||
|
|
||||||
Service SendToSPC(NCRNo, RDSList, ReactorType, PSNo, DeptResp, LossCode, LossDesc, LossStage, LossBy, ACCode, ACDesc)
|
Service SendToSPC(NCRNo, RDSList, ReactorType, PSNo, DeptResp, LossCode, LossDesc, LossStage, LossBy, ACCode, ACDesc)
|
||||||
|
|
||||||
Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Level' : @FM : 'Log'
|
Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Level' : @FM : 'Log'
|
||||||
ColumnWidths = 20 : @FM : 12 : @FM : 7 : @FM : 500
|
ColumnWidths = 20 : @FM : 12 : @FM : 7 : @FM : 500
|
||||||
Machine = Environment_Services('GetServer')
|
Machine = Environment_Services('GetServer')
|
||||||
@ -585,4 +588,3 @@ Service SendToSPC(NCRNo, RDSList, ReactorType, PSNo, DeptResp, LossCode, LossDes
|
|||||||
|
|
||||||
end service
|
end service
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user