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

refactored PTO form to address freezing

Browse Source
This commit is contained in:
Infineon\StieberD 2024-09-23 16:21:45 -07:00 committed by Stieber Daniel (IT FI MES)
parent 37b912b801
commit ae4bfcbfe1
7 changed files with 1160 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
LSL2/STPROC/TEST_DANIEL3.txt

64
LSL2/MSG/YESNO.json
View File

@ -7,27 +7,79 @@
"record1": { "record1": {
"<1>": "%2%", "<1>": "%2%",
"<2>": "BNY", "<2>": "BNY",
"<3>": "A", "<3>": "",
"<4>": "!", "<4>": "!",
"<5>": "2", "<5>": "2",
"<6>": "-2", "<6>": "-2",
"<7>": "-2", "<7>": "-2",
"<8>": "T", "<8>": "T",
"<9>": "", "<9>": "-2",
"<10>": "", "<10>": "-2",
"<11>": "", "<11>": "",
"<12>": "%1%", "<12>": "%1%",
"<13>": "", "<13>": "",
"<14>": "", "<14>": "",
"<15>": "0", "<15>": "0",
"<16>": "", "<16>": "",
"<17>": "1", "<17>": "0",
"<18>": "", "<18>": {
"<18,1>": {
"<18,1,1>": "Segoe UI",
"<18,1,2>": "-12",
"<18,1,3>": "400",
"<18,1,4>": "0",
"<18,1,5>": "0",
"<18,1,6>": "0",
"<18,1,7>": "1",
"<18,1,8>": "0",
"<18,1,9>": "0",
"<18,1,10>": "0",
"<18,1,11>": "0",
"<18,1,12>": "0"
}
},
"<19>": "0", "<19>": "0",
"<20>": "", "<20>": "",
"<21>": "0", "<21>": "0",
"<22>": "", "<22>": "",
"<23>": "" "<23>": "",
"<24>": "0",
"<25>": "0",
"<26>": "0",
"<27>": "0",
"<28>": "0",
"<29>": "",
"<30>": "",
"<31>": "-2",
"<32>": "-2",
"<33>": "-2",
"<34>": "",
"<35>": "",
"<36>": "",
"<37>": "",
"<38>": "0",
"<39>": "",
"<40>": "",
"<41>": "",
"<42>": "0",
"<43>": "1",
"<44>": "0",
"<45>": "-2",
"<46>": "",
"<47>": "",
"<48>": "",
"<49>": "",
"<50>": "",
"<51>": "0",
"<52>": "",
"<53>": "",
"<54>": "",
"<55>": "",
"<56>": "-2",
"<57>": "-2",
"<58>": "-2",
"<59>": "-2",
"<60>": "-2"
} }
} }
} }

1478
LSL2/OIWIN/NDW_PTO_MAT_SCAN.json
View File

File diff suppressed because it is too large Load Diff

8
LSL2/STPROC/MATERIAL_MOVEMENT_SERVICES.txt
View File

@ -30,6 +30,7 @@ $insert RDS_EQUATES
$insert NOTIFICATION_EQU $insert NOTIFICATION_EQU
$insert EPI_PART_EQUATES $insert EPI_PART_EQUATES
$Insert WO_LOG_EQUATES $Insert WO_LOG_EQUATES
$Insert MSG_EQUATES
Declare function Scan_Services, Memory_Services, Database_Services, SRP_JSON, RTI_CreateGUID, Memberof, obj_WO_Mat Declare function Scan_Services, Memory_Services, Database_Services, SRP_JSON, RTI_CreateGUID, Memberof, obj_WO_Mat
Declare function Get_Property, RDS_Services, EpiPro_Services, DateTime, Signature_Services, Material_Movement_Services Declare function Get_Property, RDS_Services, EpiPro_Services, DateTime, Signature_Services, Material_Movement_Services
@ -370,7 +371,8 @@ Service ProcessPTOScanData(ScanData, ScanType = SCAN_TYPES_PTO, Param1, Param2)
MsgText = 'Scanned at ':LastPTO<2>:' by ':LastPTO<1>:CRLF$ MsgText = 'Scanned at ':LastPTO<2>:' by ':LastPTO<1>:CRLF$
MsgText := 'Are you sure you wish to rescan and reprint the shipping label?' MsgText := 'Are you sure you wish to rescan and reprint the shipping label?'
OK = Msg(@WINDOW,'','YESNO','',MsgHead:@FM:MsgText) OK = Msg(@WINDOW, '','YESNO','',MsgHead:@FM:MsgText)
IF NOT(OK) THEN IF NOT(OK) THEN
Error_Services('Add', 'Scan Cancelled') Error_Services('Add', 'Scan Cancelled')
RETURN RETURN
@ -688,7 +690,3 @@ SendPTOMismatchNotification:
return return

4
LSL2/STPROC/NDW_PTI_MAT_SCAN_EVENTS.txt
View File

@ -44,7 +44,7 @@ Equ Cassette2$ to @Window:'.EDL_CASSETTE2_SCAN'
Equ Supplier$ to @Window:'.EDL_SUPPLIER_SCAN' Equ Supplier$ to @Window:'.EDL_SUPPLIER_SCAN'
Declare subroutine Set_Property, Send_Event, Post_Event, Send_Message, SendMessage, Error_Services Declare subroutine Set_Property, Send_Event, Post_Event, Send_Message, SendMessage, Error_Services
Declare subroutine Obj_Wo_Mat_Log, Errmsg, Utility, SRP_Show_Window, Material_Movement_Services Declare subroutine Obj_Wo_Mat_Log, Errmsg, Utility, SRP_Show_Window, Material_Movement_Services, PlaceDialog
Declare function Get_Property, Send_Message, SendMessage, Material_Movement_Services, Error_Services, Declare function Get_Property, Send_Message, SendMessage, Material_Movement_Services, Error_Services,
Declare function Popup, obj_WO_Mat, Database_Services, Utility, Rds_Services, Message_Box Declare function Popup, obj_WO_Mat, Database_Services, Utility, Rds_Services, Message_Box
@ -88,7 +88,7 @@ Event WINDOW.CREATE(CreateParam)
end else end else
GoSub SetupOLEControls GoSub SetupOLEControls
GoSub ResetForm GoSub ResetForm
SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize) PlaceDialog(-2, -2)
MsgStruct = '' MsgStruct = ''
MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$ MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
end end

164
LSL2/STPROC/NDW_PTO_MAT_SCAN_EVENTS.txt
View File

@ -37,14 +37,15 @@ $insert APPCOLORS
$insert MESSAGE_BOX_EQUATES $insert MESSAGE_BOX_EQUATES
$insert SRP_POPUP_EQUATES $insert SRP_POPUP_EQUATES
Equ CRLF$ to \0D0A\ Equ CRLF$ to \0D0A\
Equ MSG_WIDTH$ to 600 Equ MSG_WIDTH$ to 600
Equ Label1$ to @Window:'.EDL_LABEL1_SCAN' Equ Label1$ to @Window:'.EDL_LABEL1_SCAN'
Equ Label2$ to @Window:'.EDL_LABEL2_SCAN' Equ Label2$ to @Window:'.EDL_LABEL2_SCAN'
Equ SaveBtn$ to @Window:'.OLE_BTN_SAVE' Equ ClearBtn$ to @Window:'.PUB_CLEAR'
Equ Popup$ to @Window:".OLE_POPUP" Equ SaveBtn$ to @Window:'.PUB_SAVE'
Equ Popup$ to @Window:".OLE_POPUP"
Declare subroutine Set_Property, Send_Event, Post_Event, Send_Message, SendMessage, Error_Services Declare subroutine Set_Property, Send_Event, Post_Event, Send_Message, SendMessage, Error_Services, PlaceDialog
Declare subroutine Obj_Wo_Mat_Log, Errmsg, Utility, SRP_Show_Window, Material_Movement_Services, Delay, Getengineversion Declare subroutine Obj_Wo_Mat_Log, Errmsg, Utility, SRP_Show_Window, Material_Movement_Services, Delay, Getengineversion
Declare function Get_Property, Send_Message, SendMessage, Material_Movement_Services, Error_Services Declare function Get_Property, Send_Message, SendMessage, Material_Movement_Services, Error_Services
Declare function Popup, obj_WO_Mat, Database_Services, Utility, Rds_Services, Message_Box, SRP_Get_Window_Rect Declare function Popup, obj_WO_Mat, Database_Services, Utility, Rds_Services, Message_Box, SRP_Get_Window_Rect
@ -80,48 +81,15 @@ ScanField = ''
Event WINDOW.CREATE(CreateParam) Event WINDOW.CREATE(CreateParam)
GoSub SetupOLEControls GoSub SetupOLEControls
GoSub ResetForm GoSub ResetForm
SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize) PlaceDialog(-2, -2)
end event end event
Event OLE_BTN_CLEAR.OnClick(Point, Button, Shift, Ctrl)
gosub HidePopup
If Get_Property(Label1$, 'TEXT') NE '' AND Get_Property(Label2$, 'TEXT') NE '' then
MsgHead = 'Record not saved'
MsgText = 'Record has not been saved - are you sure you want to clear form?'
OK = Msg(@WINDOW,'','YESNO','',MsgHead:@FM:MsgText)
If OK then
GoSub ResetForm
end else
Set_Property(@Window:'.OLE_BTN_CLEAR', 'ENABLED', True$)
Set_Property(@Window:'.OLE_BTN_SAVE', 'ENABLED', True$)
end
end else
GoSub ResetForm
end
end event
Event OLE_BTN_SAVE.OnClick(Point, Button, Shift, Ctrl)
Cassette1 = Get_Property(Label1$, 'TEXT')
Cassette2 = Get_Property(Label2$, 'TEXT')
Warehouse = '1K'
Location = 'PTO'
Gosub SaveRecord
end event
Event EDL_LABEL1_SCAN.LOSTFOCUS(Flag, FocusID) Event EDL_LABEL1_SCAN.LOSTFOCUS(Flag, FocusID)
Set_Property(SaveBtn$, 'FOCUS', True$)
ScanField = 'Label1' ScanField = 'Label1'
If Flag EQ 1 then If Flag EQ 1 then
ScanData = Get_Property(CtrlEntID, 'TEXT') ScanData = Get_Property(CtrlEntID, 'TEXT')
@ -149,7 +117,6 @@ end event
Event EDL_LABEL2_SCAN.LOSTFOCUS(Flag, FocusID) Event EDL_LABEL2_SCAN.LOSTFOCUS(Flag, FocusID)
Set_Property(SaveBtn$, 'FOCUS', True$)
ScanField = 'Label2' ScanField = 'Label2'
If Flag EQ 1 then If Flag EQ 1 then
ScanData = Get_Property(CtrlEntID, 'TEXT') ScanData = Get_Property(CtrlEntID, 'TEXT')
@ -165,15 +132,15 @@ Event EDL_LABEL2_SCAN.LOSTFOCUS(Flag, FocusID)
Gosub SetupForm Gosub SetupForm
end else end else
ErrorMessage = Error_Services('GetMessage') ErrorMessage = Error_Services('GetMessage')
if ErrorMessage[1,13] EQ 'Scan Mismatch' then If ErrorMessage[1,13] EQ 'Scan Mismatch' then
Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage) Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
Gosub ResetForm Gosub ResetForm
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'FOCUS', True$) Set_Property(Label1$, 'FOCUS', True$)
end else end else
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'ENABLED', True$) Set_Property(Label2$, 'ENABLED', True$)
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'TEXT', '') Set_Property(Label2$, 'TEXT', '')
Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage) Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'FOCUS', True$) Set_Property(Label2$, 'FOCUS', True$)
end end
end end
end end
@ -189,6 +156,38 @@ Event OLE_POPUP.OnItemClick(Item)
end event end event
Event PUB_CLEAR.CLICK()
gosub HidePopup
If Get_Property(Label1$, 'TEXT') NE '' AND Get_Property(Label2$, 'TEXT') NE '' then
MsgHead = 'Record not saved'
MsgText = 'Record has not been saved - are you sure you want to clear form?'
OK = Msg(@WINDOW,'','YESNO','',MsgHead:@FM:MsgText)
If OK then
GoSub ResetForm
end else
Set_Property(ClearBtn$, 'ENABLED', True$)
Set_Property(SaveBtn$, 'ENABLED', True$)
end
end else
GoSub ResetForm
end
end event
Event PUB_SAVE.CLICK()
Cassette1 = Get_Property(Label1$, 'TEXT')
Cassette2 = Get_Property(Label2$, 'TEXT')
Warehouse = '1K'
Location = 'PTO'
Gosub SaveRecord
end event
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Internal Gosubs // Internal Gosubs
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -221,29 +220,23 @@ return
ShowPopup: ShowPopup:
GoSub HidePopup GoSub HidePopup
PopupCtrl = Popup$
BackColor = Get_Property(@Window, 'BACKCOLOR') BackColor = Get_Property(@Window, 'BACKCOLOR')
ForeColor = Get_Property(@Window, 'FORECOLOR') ForeColor = Get_Property(@Window, 'FORECOLOR')
CursorXPos = Field(Point, ',', 1, 1)
CursorYPos = Field(Point, ',', 2, 1)
FormSize = Get_Property(@Window, 'SIZE') FormSize = Get_Property(@Window, 'SIZE')
FormXPos = FormSize<1> FormXPos = FormSize<1>
FormYPos = FormSize<2> FormYPos = FormSize<2>
CtrlSize = Get_Property(CtrlEntID, 'SIZE') FormWidth = FormSize<3>
CtrlXPos = CtrlSize<1> FormHeight = FormSize<4>
CtrlYPos = CtrlSize<2>
PopupWidth = 0 PopupWidth = 0
PopupHeight = 0 PopupHeight = 0
XPadding = 10 XPadding = 10
YPadding = 10 YPadding = 10
XOffset = 10 XOffset = 10
YOffset = 55 YOffset = 55
PopupXPos = FormXPos + CtrlXPos + CursorXPos + XOffset
PopupYPos = FormYPos + CtrlYPos + CursorYPos + YOffset
Delay = 0 Delay = 0
If saveErr = 1 then If saveErr EQ True$ then
BackColor = 255 + (51*256) + (51*65536) BackColor = 255 + (51*256) + (51*65536)
end else end else
Delay = 2500 Delay = 2500
@ -255,7 +248,6 @@ ShowPopup:
ItemList = '' ItemList = ''
If ItemData NE '' then If ItemData NE '' then
For Each Item in ItemData using @FM setting ItemCount For Each Item in ItemData using @FM setting ItemCount
* debug
ItemLength = Len(Item) ItemLength = Len(Item)
PopupWidth += (20 * ItemLength) PopupWidth += (20 * ItemLength)
rows = INT(PopupWidth /300) rows = INT(PopupWidth /300)
@ -275,26 +267,28 @@ ShowPopup:
ItemList<ItemCount,SRP_POPUP.FONT> = 'Tahoma' : @SVM : '16' : @SVM : '700' : @SVM : '0' : @SVM : '0' ItemList<ItemCount,SRP_POPUP.FONT> = 'Tahoma' : @SVM : '16' : @SVM : '700' : @SVM : '0' : @SVM : '0'
ItemList<ItemCount,SRP_POPUP.ALIGNMENT> = 'Center' : @SVM : 'Center' ItemList<ItemCount,SRP_POPUP.ALIGNMENT> = 'Center' : @SVM : 'Center'
Next Item Next Item
end end
Set_Property(PopupCtrl, 'OLE.Size', Size) PopupXPos = FormXPos + FormWidth/2 - PopupWidth/2
Set_Property(PopupCtrl, 'OLE.Opacity', 255) PopupYPos = FormYPos + FormHeight/2 - PopupHeight/2
Set_Property(PopupCtrl, 'OLE.ShowDelay', Delay)
Set_Property(PopupCtrl, 'OLE.Theme', 'Custom') Set_Property(Popup$, 'OLE.Size', Size)
Set_Property(PopupCtrl, 'OLE.Background', 'Vertical(Gradient(' : Backcolor : ', ' : Backcolor : '), Border(' : Backcolor : ' L=20))' : @FM : 'None' : @FM : 'None') Set_Property(Popup$, 'OLE.Opacity', 255)
Set_Property(PopupCtrl, 'OLE.ItemList', ItemList) Set_Property(Popup$, 'OLE.ShowDelay', Delay)
Set_Property(PopupCtrl, 'OLE.Size', 0 : @FM : 0 : @FM : PopupWidth : @FM : PopupHeight) Set_Property(Popup$, 'OLE.Theme', 'Custom')
Send_Message(PopupCtrl, 'OLE.ShowAt', PopupXPos, PopupYPos) Set_Property(Popup$, 'OLE.Background', 'Vertical(Gradient(' : Backcolor : ', ' : Backcolor : '), Border(' : Backcolor : ' L=20))' : @FM : 'None' : @FM : 'None')
Set_Property(Popup$, 'OLE.ItemList', ItemList)
Set_Property(Popup$, 'OLE.Size', 0 : @FM : 0 : @FM : PopupWidth : @FM : PopupHeight)
Send_Message(Popup$, 'OLE.ShowAt', PopupXPos, PopupYPos)
return return
HidePopup: HidePopup:
PopupCtrl = @Window : '.OLE_POPUP' PopupVisible = Get_Property(Popup$, 'OLE.Visible')
PopupVisible = Get_Property(PopupCtrl, 'OLE.Visible')
If PopupVisible EQ True$ then If PopupVisible EQ True$ then
Send_Message(PopupCtrl, 'OLE.Close') Send_Message(Popup$, 'OLE.Close')
end end
return return
@ -329,10 +323,10 @@ return
DisableFormControls: DisableFormControls:
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'TEXT', '') Set_Property(Label1$, 'TEXT', '')
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'TEXT', '') Set_Property(Label2$, 'TEXT', '')
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'ENABLED', False$) Set_Property(Label1$, 'ENABLED', False$)
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'ENABLED', False$) Set_Property(Label2$, 'ENABLED', False$)
return return
@ -345,25 +339,21 @@ SetupOLEControls:
Qualifier<3> = '' Qualifier<3> = ''
Qualifier<4> = 0 ; * process synchronously Qualifier<4> = 0 ; * process synchronously
Ctrl = @Window:'.OLE_BTN_CLEAR' Send_Message(Popup$, 'QUALIFY_EVENT', 'OLE.OnItemClick', Qualifier)
Send_Message(Ctrl, 'QUALIFY_EVENT', 'OLE.OnClick', Qualifier)
Ctrl = @Window:'.OLE_BTN_SAVE'
Send_Message(Ctrl, 'QUALIFY_EVENT', 'OLE.OnClick', Qualifier)
Ctrl = @Window :'.OLE_POPUP'
Send_Message(Ctrl, 'QUALIFY_EVENT', 'OLE.OnItemClick', Qualifier)
return return
ResetForm: ResetForm:
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'ENABLED', True$) Set_Property(Label1$, 'ENABLED', True$)
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'ENABLED', True$) Set_Property(Label2$, 'ENABLED', True$)
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'TEXT', '') Set_Property(Label1$, 'TEXT', '')
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'TEXT', '') Set_Property(Label2$, 'TEXT', '')
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'ENABLED', True$) Set_Property(Label1$, 'ENABLED', True$)
Set_Property(@Window:'.EDL_LABEL2_SCAN', 'ENABLED', False$) Set_Property(Label2$, 'ENABLED', False$)
Set_Property(@Window:'.EDL_LABEL1_SCAN', 'FOCUS', True$) Set_Property(Label1$, 'FOCUS', True$)
Set_Property(@Window:'.OLE_BTN_SAVE', 'ENABLED', False$) Set_Property(SaveBtn$, 'ENABLED', False$)
return return

15
LSL2/STPROC/TEST_DANIEL3.txt
View File

@ -94,11 +94,15 @@ $Insert PS_EQUATES
Main: Main:
* Messaging_Services('SendMessage', 'RunProcedure', 'Request', '', 'All', 'RTP27,REACTOR_SERVICES', '', '', '') * Messaging_Services('SendMessage', 'RunProcedure', 'Request', '', 'All', 'RTP27,REACTOR_SERVICES', '', '', '')
debug
ASMList = Reactor_Services('GetReactorNumbers', 'ASM') response = Msg(@Window, '', 'OK', '', 'Test':@FM:'Test2')
ASMList := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
ASMList = SRP_Array('SortSimpleList', ASMList, 'AscendingNumbers', @FM) return
* ASMList = Reactor_Services('GetReactorNumbers', 'ASM')
* ASMList := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
*
* ASMList = SRP_Array('SortSimpleList', ASMList, 'AscendingNumbers', @FM)
* LoadInstAckReq = Xlate('RDS', 646209, 'LOAD_INST_ACK_REQ', 'X') * LoadInstAckReq = Xlate('RDS', 646209, 'LOAD_INST_ACK_REQ', 'X')
* DefPrinter = Get_Printer( "CURRENTDEVICE") * DefPrinter = Get_Printer( "CURRENTDEVICE")
@ -4306,3 +4310,4 @@ return
* *