Modified ApplyQA100PercentADE service to delete the @VM delimited test instead of just clearing it.
This commit is contained in:
@ -547,34 +547,49 @@ Service SetWoMatVoidFlag(WoMatKey, Username)
|
||||
end service
|
||||
|
||||
|
||||
Service MakeupFlagOn(RDSNo)
|
||||
Service MakeupFlagOn(WOMatKey)
|
||||
|
||||
EpiCheck = Rds_Services('IsEpiPro', RDSNo)
|
||||
BioRadDown = False$
|
||||
Bio4Down = False$
|
||||
Bio5Down = False$
|
||||
Bio4LogKey = Xlate('TOOL', 'BIORAD4', 'CURR_MODE_KEY', 'X')
|
||||
Bio5LogKey = Xlate('TOOL', 'BIORAD5', 'CURR_MODE_KEY', 'X')
|
||||
Bio4Mode = Xlate('TOOL_LOG', Bio4LogKey, 'TOOL_MODE', 'X')
|
||||
Bio5Mode = Xlate('TOOL_LOG', Bio5LogKey, 'TOOL_MODE', 'X')
|
||||
|
||||
If (Bio4Mode NE 'PROD') AND (Bio4Mode NE 'LIM') then Bio4Down = True$
|
||||
If (Bio5Mode NE 'PROD') AND (Bio5Mode NE 'LIM') then Bio5Down = True$
|
||||
|
||||
If (Bio4Down) AND (Bio5Down) then BioRadDown = True$
|
||||
|
||||
If EpiCheck EQ False$ then
|
||||
WOMatKey = Xlate('RDS', RDSNo, 'WO_MAT_KEY', 'X')
|
||||
WOMatQARec = XLATE('WO_MAT_QA',WOMatKey,'','X')
|
||||
PropRow = WOMatQARec<3>
|
||||
If (Count(PropRow, 'THICK') NE 0) AND (BioRadDown EQ False$) then
|
||||
CurrentStage = Rds_Services('GetCurrentStage', RDSNo)
|
||||
If CurrentStage EQ 'COMP' then
|
||||
Signature_Services('UnsignFQAStage', RDSNo)
|
||||
end
|
||||
Rds_Services('ApplyQA100PercentADE', RDSNo)
|
||||
end
|
||||
end
|
||||
ErrorMsg = ''
|
||||
If (WOMatKey NE '') then
|
||||
If RowExists('WO_MAT', WOMatKey) then
|
||||
RDSNo = Database_Services('ReadDataColumn', 'WO_MAT', WOMatKey, WO_MAT_RDS_NO$)
|
||||
If Error_Services('NoError') then
|
||||
EpiCheck = Rds_Services('IsEpiPro', RDSNo)
|
||||
BioRadDown = False$
|
||||
Bio4Down = False$
|
||||
Bio5Down = False$
|
||||
Bio4LogKey = Xlate('TOOL', 'BIORAD4', 'CURR_MODE_KEY', 'X')
|
||||
Bio5LogKey = Xlate('TOOL', 'BIORAD5', 'CURR_MODE_KEY', 'X')
|
||||
Bio4Mode = Xlate('TOOL_LOG', Bio4LogKey, 'TOOL_MODE', 'X')
|
||||
Bio5Mode = Xlate('TOOL_LOG', Bio5LogKey, 'TOOL_MODE', 'X')
|
||||
|
||||
If (Bio4Mode NE 'PROD') AND (Bio4Mode NE 'LIM') then Bio4Down = True$
|
||||
If (Bio5Mode NE 'PROD') AND (Bio5Mode NE 'LIM') then Bio5Down = True$
|
||||
|
||||
If (Bio4Down) AND (Bio5Down) then BioRadDown = True$
|
||||
|
||||
If EpiCheck EQ False$ then
|
||||
WOMatKey = Xlate('RDS', RDSNo, 'WO_MAT_KEY', 'X')
|
||||
WOMatQARec = XLATE('WO_MAT_QA',WOMatKey,'','X')
|
||||
PropRow = WOMatQARec<3>
|
||||
If (Count(PropRow, 'THICK') NE 0) AND (BioRadDown EQ False$) then
|
||||
CurrentStage = Rds_Services('GetCurrentStage', RDSNo)
|
||||
If CurrentStage EQ 'COMP' then
|
||||
Signature_Services('UnsignFQAStage', RDSNo)
|
||||
end
|
||||
Rds_Services('ApplyQA100PercentADE', RDSNo)
|
||||
end
|
||||
end
|
||||
end else
|
||||
ErrorMsg = 'Error in ':Service:' service. Error reading RDS_NO from WO_MAT record ':WOMatKey:'. '
|
||||
ErrorMsg := 'Error message: ':Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
ErrorMsg = 'Error in ':Service:' service. WO_MAT record ':WOMatKey:' does not exist.'
|
||||
end
|
||||
end else
|
||||
ErrorMsg = 'Error in ':Service:' service. Null WOMatKey passed into service.'
|
||||
end
|
||||
|
||||
end service
|
||||
|
||||
@ -697,6 +712,3 @@ Service VerifyWOLogWOMatKeyColumn(WOMatKey)
|
||||
|
||||
end service
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user