phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced supplement RList calls with Btree.Extract

Browse Source
This commit is contained in:
Infineon\StieberD 2024-09-16 15:17:40 -07:00 committed by Stieber Daniel (IT FI MES)
parent 6fbc512eac
commit 293d01a2c0
6 changed files with 3993 additions and 1895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1022
LSL2/OIWIN/NDW_ADD_SUPPLEMENT.json
View File

File diff suppressed because it is too large Load Diff

1120
LSL2/OIWIN/NDW_RDS_SUPPLEMENT.json
View File

File diff suppressed because it is too large Load Diff

2396
LSL2/OIWIN/NDW_REMOVE_SUPPLEMENTS.json
View File

File diff suppressed because it is too large Load Diff

8
LSL2/OIWIN/RDS.json
View File

@ -22313,10 +22313,10 @@
"<2>": { "<2>": {
"<2,1>": { "<2,1>": {
"<2,1,1>": { "<2,1,1>": {
"<2,1,1,1>": "SEND_MESSAGE.MESSAGE_W/ATTACHMENT", "<2,1,1,1>": "UNLOAD/LOAD_EXTRA.SIGNATURE_INFO",
"<2,1,1,2>": "PRINT.CUSTOMER_RDS", "<2,1,1,2>": "PRINT.FACTORY_LABELS",
"<2,1,1,3>": "PRINT.FACTORY_LABELS", "<2,1,1,3>": "PRINT.CUSTOMER_RDS",
"<2,1,1,4>": "UNLOAD/LOAD_EXTRA.SIGNATURE_INFO" "<2,1,1,4>": "SEND_MESSAGE.MESSAGE_W/ATTACHMENT"
} }
}, },
"<2,2>": { "<2,2>": {

136
LSL2/STPROC/NDW_ADD_SUPPLEMENT_EVENTS.txt
View File

@ -38,7 +38,7 @@ $insert APP_INSERTS
$insert EVENT_SETUP $insert EVENT_SETUP
$insert MSG_EQUATES $insert MSG_EQUATES
$Insert SUPPLEMENTS_EQUATES $Insert SUPPLEMENTS_EQUATES
Declare subroutine SRP_Show_Window, Supplement_Services Declare subroutine SRP_Show_Window, Supplement_Services
Declare function SRP_Array, Supplement_Services Declare function SRP_Array, Supplement_Services
@ -49,15 +49,15 @@ Subclass = SubclassInfo<1>
// Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler. // Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler.
If Event EQ 'OLE' then If Event EQ 'OLE' then
Transfer Event to OIEvent Transfer Event to OIEvent
Transfer Param1 to Event Transfer Param1 to Event
Transfer Param2 to Param1 Transfer Param2 to Param1
Transfer Param3 to Param2 Transfer Param3 to Param2
* Transfer Param4 to Param3 Transfer Param4 to Param3
* Transfer Param5 to Param4 Transfer Param5 to Param4
* Transfer Param6 to Param5 Transfer Param6 to Param5
* Transfer Param7 to Param6 Transfer Param7 to Param6
* Transfer Param8 to Param7 Transfer Param8 to Param7
end end
GoToEvent Event for CtrlEntID GoToEvent Event for CtrlEntID
@ -70,69 +70,71 @@ Return EventFlow else EVENT_CONTINUE$
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Event WINDOW.CREATE(CreateParam) Event WINDOW.CREATE(CreateParam)
Result = '' Result = ''
SupplInst = '' SupplInst = ''
GoSub Setup_OLE_Controls GoSub Setup_OLE_Controls
If CreateParam NE '' then If CreateParam NE '' then
Gosub PopulateStages Gosub PopulateStages
Set_Property(@Window : '.CMB_STAGE', 'LIST', StageList) Set_Property(@Window : '.CMB_STAGE', 'LIST', StageList)
Set_Property(@Window : '.CMB_STAGE', 'SELPOS', 1) Set_Property(@Window : '.CMB_STAGE', 'SELPOS', 1)
Set_Property(@Window : '.PUB_OK', 'ENABLED', True$) Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
end end
Gosub CheckForSupplements Gosub CheckForSupplements
SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize) SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize)
end event end event
Event WINDOW.CLOSE(CancelFlag) Event WINDOW.CLOSE(CancelFlag)
Result = '' Result = ''
Result<1> = False$ Result<1> = False$
End_Dialog(@Window, Result) End_Dialog(@Window, Result)
end event end event
Event CMB_STAGE.CHANGED(CreateParam) Event CMB_STAGE.CHANGED(CreateParam)
Gosub CheckForSupplements Gosub CheckForSupplements
end event end event
Event EDL_SUPPL_INST.CHAR(VirtCode, ScanCode, CtrlKey, ShiftKey, AltKey) Event EDL_SUPPL_INST.CHAR(VirtCode, ScanCode, CtrlKey, ShiftKey, AltKey)
SupplInst = Get_Property(CtrlEntId, 'TEXT') SupplInst = Get_Property(CtrlEntId, 'TEXT')
If SupplInst NE '' then If SupplInst NE '' then
Set_Property(@Window : '.PUB_OK', 'ENABLED', True$) Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
end else end else
Set_Property(@Window : '.PUB_OK', 'ENABLED', False$) Set_Property(@Window : '.PUB_OK', 'ENABLED', False$)
end end
end event end event
Event PUB_OK.CLICK() Event PUB_OK.CLICK()
Result = '' Result = ''
SupplInst = Get_Property(@Window : '.EDL_SUPPL_INST', 'TEXT') SupplInst = Get_Property(@Window : '.EDL_SUPPL_INST', 'TEXT')
StageSel = Get_Property(@Window : '.CMB_STAGE', 'TEXT') StageSel = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
StageReturn = Field(StageSel, '-', 2) StageReturn = Field(StageSel, '-', 2)
Result<1> = True$ Result<1> = True$
Result<2> = StageReturn :': ': SupplInst Result<2> = StageReturn :': ': SupplInst
End_Dialog(@Window, Result) End_Dialog(@Window, Result)
end event end event
Event PUB_CANCEL.CLICK() Event PUB_CANCEL.CLICK()
Result = '' Result = ''
Result<1> = False$ Result<1> = False$
End_Dialog(@Window, Result) End_Dialog(@Window, Result)
end event end event
@ -141,11 +143,11 @@ end event
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Setup_OLE_Controls: Setup_OLE_Controls:
Qualify = '' Qualify = ''
Qualify<1> = 1 Qualify<1> = 1
Qualify<4> = 0 Qualify<4> = 0
return return
PopulateStages: PopulateStages:
@ -154,8 +156,7 @@ PopulateStages:
PlainTextStages = '' PlainTextStages = ''
RDSList = SRP_Array("Rotate", CreateParam) RDSList = SRP_Array("Rotate", CreateParam)
@ReCur1 = RDSList<5> @ReCur1 = RDSList<5>
@ReCur2 = RDSList<15> @ReCur2 = RDSList<15>
For Each RDSKey in @ReCur1 Using @VM For Each RDSKey in @ReCur1 Using @VM
RDSStageList = Supplement_Services('GetStagesForLot', 'RDS', RDSKey) RDSStageList = Supplement_Services('GetStagesForLot', 'RDS', RDSKey)
RDSStageList2 = RDSStageList<2> :@FM: RDSStageList<1> RDSStageList2 = RDSStageList<2> :@FM: RDSStageList<1>
@ -168,14 +169,16 @@ PopulateStages:
Next RDSKey Next RDSKey
Swap @VM with ' -' in DraftStageList Swap @VM with ' -' in DraftStageList
StageList = SRP_Array('Clean', DraftStageList, "TrimAndMakeUnique", @FM) StageList = SRP_Array('Clean', DraftStageList, "TrimAndMakeUnique", @FM)
return return
CheckForSupplements: CheckForSupplements:
SuppFound = False$ SuppFound = False$
SuppText = '' SuppText = ''
StageSel = Get_Property(@Window : '.CMB_STAGE', 'TEXT') StageSel = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
Stage = Field(StageSel, '-', 2) Stage = Field(StageSel, '-', 2)
For Each RDSKey in @ReCur1 Using @VM Setting Pos For Each RDSKey in @ReCur1 Using @VM Setting Pos
If @Recur2<pos> NE '' then If @Recur2<pos> NE '' then
Supps = @Recur2<pos> Supps = @Recur2<pos>
@ -186,7 +189,7 @@ CheckForSupplements:
SuppText = TrimF(SuppText) SuppText = TrimF(SuppText)
SuppFound = True$ SuppFound = True$
end end
Until SuppFound NE False$ Until SuppFound NE False$
Next Supp Next Supp
If SuppText EQ '' then SuppFound = Supplement_Services('GetSupplementsForLot', 'RDS', RDSKey, Stage) If SuppText EQ '' then SuppFound = Supplement_Services('GetSupplementsForLot', 'RDS', RDSKey, Stage)
end else end else
@ -209,11 +212,6 @@ CheckForSupplements:
Set_Property(@Window : '.EDL_SUPPL_INST', 'TEXT', '') Set_Property(@Window : '.EDL_SUPPL_INST', 'TEXT', '')
Set_Property(@Window : '.PUB_OK', 'ENABLED', False$) Set_Property(@Window : '.PUB_OK', 'ENABLED', False$)
end end
return return

1206
LSL2/STPROC/SUPPLEMENT_SERVICES.txt
View File

File diff suppressed because it is too large Load Diff