WIP to switch branches
This commit is contained in:
Infineon\Mitchem
Stieber Daniel (CSC FI SPS MESLEO)
parent
5d31e6f84c
commit
e8b73d30c8
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
|
||||
|
||||
@ -85,10 +85,11 @@ Event WINDOW.CREATE(CreateParam)
|
||||
MsgUp = Msg(@Window, MsgDef)
|
||||
|
||||
MakeupWafers = Material_Services('GetAvailableMakeupWafers', ThisWorkOrderNo, False$)
|
||||
|
||||
debug
|
||||
// Remove cassette being backfilled from available list
|
||||
MakeupWafersClean = ''
|
||||
NumMUCass = DCount(MakeupWafers, @VM)
|
||||
|
||||
If NumMUCass GT 0 then
|
||||
For CassIndex = 1 to NumMUCass
|
||||
Row = MakeupWafers<0, CassIndex>
|
||||
@ -186,6 +187,9 @@ Setup_OLE_Controls:
|
||||
PicUnsignedCtrl = @Window : '.OLE_PIC_UNAVAILABLE_DIVIDER'
|
||||
RptNoBatchCtrl = @Window : '.OLE_RPT_NO_BATCH_WAFERS'
|
||||
PicNoBatchCtrl = @Window : '.OLE_PIC_NO_BATCH_DIVIDER'
|
||||
RptNoLabelCtrl = @Window : '.OLE_RPT_NO_PACK_LABEL'
|
||||
PicNoLabelCtrl = @Window : '.OLE_PIC_NO_PACK_LABEL'
|
||||
|
||||
|
||||
ColumnList = ''
|
||||
ColumnList<1> = 'WO No' : @VM : 'TEXT' : @VM : 100 : @VM : @VM : @VM : @VM : @VM : @VM : @VM : 'Center' : @VM : @VM : @VM : @VM : 'Segoe UI,9'
|
||||
@ -198,10 +202,12 @@ Setup_OLE_Controls:
|
||||
Set_Property(RptSignedCtrl, 'OLE.ColumnList', ColumnList)
|
||||
Set_Property(RptUnsignedCtrl, 'OLE.ColumnList', ColumnList)
|
||||
Set_Property(RptNoBatchCtrl, 'OLE.ColumnList', ColumnList)
|
||||
|
||||
Set_Property(RptNoLabelCtrl, 'OLE.ColumnList', ColumnList)
|
||||
debug
|
||||
SignedWafers = ''
|
||||
UnsignedWafers = ''
|
||||
NoBatchWafers = ''
|
||||
NoLabelWafers = ''
|
||||
If MakeupWafers NE '' then
|
||||
SignedWafers = MakeupWafers<1>
|
||||
Convert @VM to @FM in SignedWafers
|
||||
@ -212,6 +218,9 @@ Setup_OLE_Controls:
|
||||
NoBatchWafers = MakeupWafers<3>
|
||||
Convert @VM to @FM in NoBatchWafers
|
||||
Convert @SVM to @VM in NoBatchWafers
|
||||
NoLabelWafers = MakeupWafers<4>
|
||||
Convert @VM to @FM in NoLabelWafers
|
||||
Convert @SVM to @VM in NoLabelWafers
|
||||
end
|
||||
|
||||
// Get the design time form size. This will be adjusted based on various conditions.
|
||||
@ -222,9 +231,12 @@ Setup_OLE_Controls:
|
||||
PicUnsignedCtrlSize = Get_Property(PicUnsignedCtrl, 'SIZE')
|
||||
RptNoBatchCtrlSize = Get_Property(RptNoBatchCtrl, 'SIZE')
|
||||
PicNoBatchCtrlSize = Get_Property(PicNoBatchCtrl, 'SIZE')
|
||||
RptNoLabelCtrlSize = Get_Property(RptNoLabelCtrl, 'SIZE')
|
||||
PicNoLabelCtrlSize = Get_Property(PicNoLabelCtrl, 'SIZE')
|
||||
NumSignedWafers = DCount(SignedWafers, @FM)
|
||||
NumUnsignedWafers = DCount(UnsignedWafers, @FM)
|
||||
NumNoBatchWafers = DCount(NoBatchWafers, @FM)
|
||||
NumNoLabelWafers = DCount(NoLabelWafers, @FM)
|
||||
|
||||
If NumSignedWafers EQ 0 then
|
||||
// If there are no signed wafers are available, display the prompt that asks the user to convert to a makeup box.
|
||||
@ -249,6 +261,15 @@ Setup_OLE_Controls:
|
||||
Set_Property(RptNoBatchCtrl, 'SIZE', RptNoBatchCtrlSize)
|
||||
Set_Property(PicNoBatchCtrl, 'SIZE', PicNoBatchCtrlSize)
|
||||
end
|
||||
If NumNoBatchWafers GT 0 then
|
||||
// Increase the height of the form to display the no label wafers ReportTable control. Move the controls
|
||||
// down to display below the makeup box message.
|
||||
FormSize<4> = FormSize<4> + 72
|
||||
RptNoLabelCtrlSize<2> = RptNoLabelCtrlSize<2> + 146
|
||||
PicNoLabelCtrlSize<2> = PicNoLabelCtrlSize<2> + 146
|
||||
Set_Property(RptNoLabelCtrl, 'SIZE', RptNoLabelCtrlSize)
|
||||
Set_Property(PicNoLabelCtrl, 'SIZE', PicNoLabelCtrlSize)
|
||||
end
|
||||
end else
|
||||
Set_Property(RptSignedCtrl, 'OLE.List', SignedWafers)
|
||||
If NumSignedWafers GT 1 then
|
||||
@ -321,7 +342,44 @@ Setup_OLE_Controls:
|
||||
Set_Property(RptNoBatchCtrl, 'SIZE', RptNoBatchCtrlSize)
|
||||
Set_Property(PicNoBatchCtrl, 'SIZE', PicNoBatchCtrlSize)
|
||||
end
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Adjust no Label ReportTable
|
||||
If NumNoLabelWafers EQ 0 then
|
||||
Set_Property(PicNoLabelCtrl, 'VISIBLE', False$)
|
||||
Set_Property(RptNoLabelCtrl, 'VISIBLE', False$)
|
||||
FormSize<4> = FormSize<4> - 74
|
||||
end else
|
||||
Set_Property(RptNoLabelCtrl, 'OLE.List', NoLabelWafers)
|
||||
If NumNoLabelWafers GT 1 then
|
||||
// Add more height to display extra rows.
|
||||
RptNoLabelCtrlSize<4> = RptNoLabelCtrlSize<4> + (20 * (NumNoLabelWafers - 1))
|
||||
end
|
||||
If NumSignedWafers EQ 0 then
|
||||
// There are no signed wafers. Move the no Label ReportTable up.
|
||||
RptNoLabelCtrlSize<2> = RptNoLabelCtrlSize<2> - 74
|
||||
PicNoLabelCtrlSize<2> = PicNoLabelCtrlSize<2> - 74
|
||||
end else
|
||||
If NumSignedWafers GT 1 then
|
||||
// Signed wafers has been made taller. Move the no Label ReportTable down further.
|
||||
RptNoLabelCtrlSize<2> = RptNoLabelCtrlSize<2> + (20 * (NumSignedWafers - 1))
|
||||
PicNoLabelCtrlSize<2> = PicNoLabelCtrlSize<2> + (20 * (NumSignedWafers - 1))
|
||||
end
|
||||
end
|
||||
If NumUnsignedWafers EQ 0 then
|
||||
// There are no unsigned wafers. Move the no Label ReportTable up.
|
||||
RptNoLabelCtrlSize<2> = RptNoLabelCtrlSize<2> - 74
|
||||
PicNoLabelCtrlSize<2> = PicNoLabelCtrlSize<2> - 74
|
||||
end else
|
||||
If NumUnsignedWafers GT 1 then
|
||||
// Unsigned wafers has been made taller. Move the no Label ReportTable down further.
|
||||
RptNoLabelCtrlSize<2> = RptNoLabelCtrlSize<2> + (20 * (NumUnsignedWafers - 1))
|
||||
PicNoLabelCtrlSize<2> = PicNoLabelCtrlSize<2> + (20 * (NumUnsignedWafers - 1))
|
||||
end
|
||||
end
|
||||
Set_Property(RptNoLabelCtrl, 'SIZE', RptNoLabelCtrlSize)
|
||||
Set_Property(PicNoLabelCtrl, 'SIZE', PicNoLabelCtrlSize)
|
||||
end
|
||||
////////////////////////////////////////////////////////
|
||||
AdditionalRowsAdj = 0
|
||||
If NumSignedWafers GT 1 then AdditionalRowsAdj += (NumSignedWafers - 1) * 20
|
||||
If NumUnsignedWafers GT 1 then AdditionalRowsAdj += (NumUnsignedWafers - 1) * 20
|
||||
@ -352,3 +410,4 @@ Setup_OLE_Controls:
|
||||
|
||||
return
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user