WIP to switch branches
This commit is contained in:
committed by
Stieber Daniel (CSC FI SPS MESLEO)
parent
5d31e6f84c
commit
e8b73d30c8
@ -60,7 +60,7 @@ Common /EnvironmentServices/ Unused1@, Unused2@, Unused3@, Unused4@, Unused5@, U
|
||||
|
||||
Declare function Material_Services, Memory_Services, Database_Services, SRP_Array, obj_WO_Mat, obj_WM_Out
|
||||
Declare function Logging_Services, Environment_Services, Datetime, obj_WO_Step, Database_Services, SQL_Services
|
||||
Declare function SRP_Rotate_Array, SRP_DateTime, obj_WO_Log, obj_Shipment, SRP_Date
|
||||
Declare function SRP_Rotate_Array, SRP_DateTime, obj_WO_Log, obj_Shipment, SRP_Date, Rds_Services
|
||||
Declare subroutine Material_Services, Memory_Services, Database_Services, SRP_Array, Btree.Extract, Logging_Services
|
||||
Declare subroutine SRP_Stopwatch, Set_Status, RList, Work_Order_Services, SQL_Services, obj_WO_Mat, obj_Notes
|
||||
Declare subroutine SRP_Rotate_Array, SRP_DateTime, obj_WO_Log, Hold_Services
|
||||
@ -617,7 +617,7 @@ end service
|
||||
// Data within each field mark will be @VM row and @SVM column limited.
|
||||
//----------------------------------------------------------------------------------------------------------------------
|
||||
Service GetAvailableMakeupWafers(WorkOrderNo, KeysOnly=BOOLEAN)
|
||||
|
||||
|
||||
AvailableMakeupWafers = ''
|
||||
|
||||
If WorkOrderNo NE '' then
|
||||
@ -703,7 +703,9 @@ Service GetAvailableMakeupWafers(WorkOrderNo, KeysOnly=BOOLEAN)
|
||||
ProdSpecID = Xlate('RDS', RDSKeyIDs, RDS_PROD_SPEC_ID$, 'X')
|
||||
end
|
||||
ActiveStatus = XLATE('PROD_SPEC', ProdSpecID, PROD_SPEC_STATUS$, 'X')
|
||||
LabelCheck = Count(WOMatRow<WO_MAT_INV_ACTION$>, 'LBLCHK')
|
||||
// JRO Added the extra condition for Active Status 5/8/2020
|
||||
debug
|
||||
If ActiveStatus EQ 'A' then
|
||||
Begin Case
|
||||
|
||||
@ -711,7 +713,7 @@ Service GetAvailableMakeupWafers(WorkOrderNo, KeysOnly=BOOLEAN)
|
||||
// Cassette has not received a batch number from SAP, so it is not yet eligible to be used.
|
||||
FieldPos = 3
|
||||
|
||||
Case ( (ReactorType NE 'EPP') and (RDSRow<RDS_SUP_VER_SIG$> NE '') ) OR ( (ReactorType EQ 'EPP') and (WMOFQASig NE '') )
|
||||
Case ( (ReactorType NE 'EPP') and (RDSRow<RDS_SUP_VER_SIG$> NE '') and (LabelCheck NE FALSE$) ) OR ( (ReactorType EQ 'EPP') and (WMOFQASig NE '') and (LabelCheck NE FALSE$) )
|
||||
// Cassette has a final signature, so it is eligible to be used.
|
||||
FieldPos = 1
|
||||
|
||||
@ -719,6 +721,10 @@ Service GetAvailableMakeupWafers(WorkOrderNo, KeysOnly=BOOLEAN)
|
||||
// Cassette does not yet have a final signature, so it is not yet eligible to be used.
|
||||
FieldPos = 2
|
||||
|
||||
Case ( (ReactorType NE 'EPP') and (RDSRow<RDS_SUP_VER_SIG$> NE '') and (LabelCheck EQ False$)) OR ( (ReactorType EQ 'EPP') and (WMOFQASig NE '') and (LabelCheck EQ False$))
|
||||
// Cassette does not yet have a packing label check, so it is not yet eligible to be used.
|
||||
FieldPos = 4
|
||||
|
||||
Case Otherwise$
|
||||
// Log these cassettes as we should never end up here.
|
||||
Null
|
||||
@ -1477,3 +1483,4 @@ ClearCursors:
|
||||
|
||||
return
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user