Added in checking that QA stage exists. This allows for lack of QA stage measurements

LSL2/STPROC/WO_MAT_QA_SERVICES.txt

@@ -422,39 +422,58 @@ end service
 Service GetQAMetComplete(WOMatKey)
 
 	ErrorMsg = ''
-	Response = True$
+	QAMetComplete = True$
 	
     If WOMatKey NE '' then
+        // Lack of WO_MAT_QA record may not be an error here. Gen5 Products do not have WO_MAT_QA Records
         If Rowexists('WO_MAT_QA', WOMatKey) then
             QAMetRec   = Database_Services('ReadDataRow', 'WO_MAT_QA', WOMatKey, '', True$, 0, False$)
-            Stages     = QAMetRec<WO_MAT_QA_STAGE$>
+            If Error_Services('NoError') then
-            Results    = QAMetRec<WO_MAT_QA_RESULT$>
+                Stages     = QAMetRec<WO_MAT_QA_STAGE$>
-            StageCount = DCount(Stages, @VM)
+                Results    = QAMetRec<WO_MAT_QA_RESULT$>
-            For I = 1 to StageCount
+                StageCount = DCount(Stages, @VM)
-            	If Stages<1, I> NE '' then
+                QAStagePresent = False$
-					If Results<1,I> EQ '' then
+                For I = 1 to StageCount
-						Response = False$
+                    If Stages<1, I> EQ 'QA' then
-					end
+                        QAStagePresent = True$
+                        If Results<1,I> EQ '' then
+                            QAMetComplete = False$
+                        end
+                    end
+                Until QAMetComplete EQ False$
+                Next I
+                If QAMetComplete EQ True$ AND QAStagePresent = True$ then
+                    QAMUMetComplete = WO_Mat_QA_Services('GetMUWaferQAComplete', WOMatKey)
+                    If Error_Services('NoError') then
+                        If Not(QAMUMetComplete) then
+                            QAMetComplete = False$
+                        end
+                    end else
+                        ErrorMsg = Error_Services('GetMessage')
+                    end
                 end
-            Until Response EQ False$
+            end else
-            Next I
+                ErrorMsg = Error_Services('GetMessage')
-        end else
+            end
-            Response = True$
         end
     end else
         ErrorMsg = 'Missing WOMatKey parameter.'
-        Response = False$
     end
     
-    If ErrorMsg NE '' then
+    If ErrorMsg EQ '' then
-    	Error_Services('Add', ErrorMsg)
+        Response = QAMetComplete
+    end else
+        Response = False$
+        Error_Services('Add', ErrorMsg)
     end
     
 end service
 
 
 Service GetMUWaferQAComplete(WOMatKey)
-
+    
+    ErrorMsg = ''
+    
 	If WOMatKey NE '' then
         Response = True$
         WOMatRec = Database_Services('ReadDataRow', 'WO_MAT', WoMatKey, True$, 0, False$)
@@ -492,11 +511,16 @@ Service GetMUWaferQAComplete(WOMatKey)
                 Next Box
             end
         end else
-            Error_Services('Add', 'Failed to open WO_MAT record.')
+            ErrorMsg = 'Failed to open WO_MAT record.'
         end
 	end else
-	    Error_Services('Add', 'Missing WOMatKey parameter.')
+	    ErrorMsg = 'Missing WOMatKey parameter.'
+	end
+	
+	If ErrorMsg NE '' then
+	    Error_Services('Add', ErrorMsg)
 	end
 	
 end service
 
+