fixed barcode scanning focus issues

LSL2/STPROC/MATERIAL_MOVEMENT_SERVICES.txt

@@ -597,8 +597,6 @@ ToggleLotHold:
 		WOMatKey    = WONo:'*':CassNo
 		CtrlEntID   = False$		;* Control checked/unchecked
 		OriginFlag	= 'PTO'         ;* Flag to indicate a hold initiated from the packagaing form
-		//Parms       = WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEntID:@RM:OriginFlag:@RM:OperatorID
-		//obj_WO_Mat('ToggleHold', Parms)
 		Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, '', OperatorID)
 
 		// Check if second cassette ID is a valid RDS or WM_OUT key
@@ -625,9 +623,6 @@ ToggleLotHold:
 				
 		End Case
 		
-*		testCass2 = Cassette2
-*		Convert '*' to '.' in testCass2
-
 		// Write fail packaging record in material log for second cassette ID
 		If ValidCass EQ True$ then
 			LogFile = 'WO_MAT'               
@@ -662,7 +657,6 @@ ToggleLotHold:
 			CtrlEntID  = False$		;* Control checked/unchecked
 			OriginFlag = 'PTO'         ;* Flag to indicate a hold initiated from the packaging form
 			Parms      = WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEntID:@RM:OriginFlag:@RM:OperatorID
-			//obj_WO_Mat('ToggleHold', Parms)
 			Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, '', OperatorID)
 		end
 
@@ -697,3 +691,4 @@ return
 
 
 
+

LSL2/STPROC/NDW_PACKAGING_EVENTS.txt

@@ -90,6 +90,7 @@ Event EDL_USER_ID_SCAN.LOSTFOCUS(Flag, FocusID)
                 MsgStruct = "" 
                 MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
                 Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+                Set_Property(CtrlEntId, 'FOCUS', True$)
             end
         end
     end
@@ -115,6 +116,7 @@ Event EDL_CASS_SCAN_1.LOSTFOCUS(Flag, FocusID)
                 MsgStruct = "" 
                 MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
                 Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+                Set_Property(@Window:'.EDL_USER_ID_SCAN', 'FOCUS', True$)
             end
         end
     end
@@ -142,6 +144,7 @@ Event EDL_CASS_SCAN_2.LOSTFOCUS(Flag, FocusID)
 				MsgStruct = "" 
 				MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
 				Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+				Set_Property(@Window:'.EDL_USER_ID_SCAN', 'FOCUS', True$)
 			end
 		end
 	end
@@ -229,7 +232,6 @@ Event EDL_PASSWORD_SCAN.LOSTFOCUS(Flag, FocusID)
                     MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
                     Msg(@Window, MsgStruct, 'PROCESS_COMPLETE', '', SuccessMessage)       
                 end else
-*                    ErrorMessage = Error_Services('GetMessage')        
                     ErrorMessage           = 'An internal error occurred. Please retry the pack scan.'
                     MsgStruct              = "" 
                     MsgStruct<MTEXTWIDTH$> = MSG_WIDTH$
@@ -254,7 +256,9 @@ end event
 
 
 Event PUB_CLEAR_FORM.CLICK()
+	
     GoSub ClearForm
+    
 end event
 
 
@@ -263,6 +267,7 @@ end event
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 ClearForm:
+	
 	Set_Property(@Window:'.EDL_SEQUENCE1'		 , 'TEXT'   , '')
     Set_Property(@Window:'.EDL_USER_ID_SCAN'     , 'TEXT'   , '')
     Set_Property(@Window:'.EDL_CASS_SCAN_1'      , 'TEXT'   , '')
@@ -295,3 +300,4 @@ return
 
 
 
+

LSL2/STPROC/NDW_PTI_MAT_SCAN_EVENTS.txt

@@ -97,8 +97,8 @@ end event
 
 
 Event OLE_BTN_CLEAR.OnClick(Point, Button, Shift, Ctrl)
-	*get count of unprocessed records
 	
+	*get count of unprocessed records	
 	allCompleted = True$
 	resp = ''
 	Data = Get_Property(EditTable$, "OLE.ARRAY")
@@ -120,10 +120,12 @@ Event OLE_BTN_CLEAR.OnClick(Point, Button, Shift, Ctrl)
 			GoSub ResetForm
 		end
 	end
+	
 end event
 
 
 Event OLE_BTN_SAVE.OnClick(Point, Button, Shift, Ctrl)
+	
 	*check for unfinished scan
 	F1 = Get_Property(Cassette1$, 'TEXT')
 	F2 = Get_Property(Cassette2$, 'TEXT')
@@ -137,10 +139,12 @@ Event OLE_BTN_SAVE.OnClick(Point, Button, Shift, Ctrl)
 		Location = 'PTI'
 		Gosub SaveRecords
 	end
+	
 end event
 
 
 Event EDL_CASSETTE1_SCAN.LOSTFOCUS(Flag, FocusID)
+	
 	ScanField = 'Cassette1'
 	If Flag EQ 1 then
 		ScanData = Get_Property(CtrlEntID, 'TEXT')
@@ -156,13 +160,16 @@ Event EDL_CASSETTE1_SCAN.LOSTFOCUS(Flag, FocusID)
 				GoSub ResetForm
 				ErrorMessage = Error_Services('GetMessage')
 				Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+				Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'FOCUS', True$)
 			end
 		end
 	end
+	
 end event
 
 
 Event EDL_CASSETTE2_SCAN.LOSTFOCUS(Flag, FocusID)
+	
 	ScanField = 'Cassette2'
 	If Flag EQ 1 then
 		ScanData = Get_Property(CtrlEntID, 'TEXT')
@@ -180,13 +187,16 @@ Event EDL_CASSETTE2_SCAN.LOSTFOCUS(Flag, FocusID)
 				GoSub ResetForm
 				ErrorMessage = Error_Services('GetMessage')
 				Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+				Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'FOCUS', True$)
 			end
 		end
 	end
+	
 end event
 
 
 Event EDL_SUPPLIER_SCAN.LOSTFOCUS(Flag, FocusID)
+	
 	ScanField = 'Lot'
 	If Flag EQ 1 then
 		Cassette1 = Get_Property(Cassette1$, 'TEXT')
@@ -201,9 +211,11 @@ Event EDL_SUPPLIER_SCAN.LOSTFOCUS(Flag, FocusID)
 				GoSub ResetForm
 				ErrorMessage = Error_Services('GetMessage')
 				Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+				Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'FOCUS', True$)
 			end
 		end
 	end
+	
 end event
 
 
@@ -212,7 +224,8 @@ end event
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SaveRecords:
-	*iterate thround all records in the grid, saving them and updating the status and location
+	
+	*iterate through all records in the grid, saving them and updating the status and location
 	Data = Get_Property(EditTable$, "OLE.ARRAY")
 	cnt = count(Data<1>, @VM) + (Data<1># '')
 	MsgStruct = ''
@@ -259,6 +272,7 @@ return
 
 
 ValidateGrid:
+	
 	F1 = Get_Property(Cassette1$, 'TEXT')
 	F2 = Get_Property(Cassette2$, 'TEXT')
 	F3 = Get_Property(Supplier$, 'TEXT')
@@ -270,11 +284,6 @@ ValidateGrid:
 			result = 1
 		end
 	end
-* 	if ScanField = 'Lot' then ; * do not look for duplicates
-*		result = 0
-* 	end else
-*		result = InList(Data, ScanData, @VM) OR InList(Data, ScanData, @FM)
-* 	end
 	
 	If INDEX(F1,'.',2) then
 		RDSType = 'EPP'
@@ -317,12 +326,14 @@ return
 
 
 DisableFormControls:
+	
 	Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'TEXT', '')
 	Set_Property(@Window:'.EDL_CASSETTE2_SCAN', 'TEXT', '')
 	Set_Property(@Window:'.EDL_SUPPLIER_SCAN', 'TEXT', '')
 	Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'ENABLED', False$)
 	Set_Property(@Window:'.EDL_CASSETTE2_SCAN', 'ENABLED', False$)
 	Set_Property(@Window:'.EDL_SUPPLIER_SCAN', 'ENABLED', False$)
+	
 return
 
 
@@ -372,6 +383,7 @@ return
 
 
 ResetForm:
+	
 	Set_Property(@Window:'.EDL_CASSETTE1_SCAN', 'ENABLED', True$)
 	Set_Property(@Window:'.EDL_CASSETTE2_SCAN', 'ENABLED', True$)
 	Set_Property(@Window:'.EDL_SUPPLIER_SCAN', 'ENABLED', True$)
@@ -386,5 +398,6 @@ ResetForm:
 	cnt = count(Data<1>, @VM) + (Data<1># '')
 	Set_Property(@Window:'.OLE_BTN_SAVE', 'ENABLED', cnt GE 1)
 	Set_Property(EditTable$, 'OLE.CellColors[ALL;All]', 'Auto':@FM:'Auto')
+	
 return
 

LSL2/STPROC/NDW_PTO_MAT_SCAN_EVENTS.txt

@@ -120,6 +120,7 @@ end event
 
 
 Event EDL_LABEL1_SCAN.LOSTFOCUS(Flag, FocusID)
+	
     Set_Property(SaveBtn$, 'FOCUS', True$)
     ScanField = 'Label1'
     If Flag EQ 1 then
@@ -138,6 +139,7 @@ Event EDL_LABEL1_SCAN.LOSTFOCUS(Flag, FocusID)
                 if ErrorMessage NE 'Scan Cancelled' then
                     Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
                 end
+                Set_Property(@Window:'.EDL_LABEL1_SCAN', 'FOCUS', True$)
             end
         end
     end
@@ -147,6 +149,7 @@ end event
 
 Event EDL_LABEL2_SCAN.LOSTFOCUS(Flag, FocusID)
     
+    Set_Property(SaveBtn$, 'FOCUS', True$)
     ScanField = 'Label2'
     If Flag EQ 1 then
         ScanData = Get_Property(CtrlEntID, 'TEXT')
@@ -165,14 +168,13 @@ Event EDL_LABEL2_SCAN.LOSTFOCUS(Flag, FocusID)
             	if ErrorMessage[1,13] EQ 'Scan Mismatch' then
             		Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
             		Gosub ResetForm
+            		Set_Property(@Window:'.EDL_LABEL1_SCAN', 'FOCUS', True$)
             	end else
 					Set_Property(@Window:'.EDL_LABEL2_SCAN', 'ENABLED', True$)
 					Set_Property(@Window:'.EDL_LABEL2_SCAN', 'TEXT', '')
-					Set_Property(@Window:'.EDL_LABEL2_SCAN', 'FOCUS', True$)
-					//ErrorMessage = Error_Services('GetMessage')
 					Msg(@Window, MsgStruct, 'PROCESS_ERROR', '', ErrorMessage)
+					Set_Property(@Window:'.EDL_LABEL2_SCAN', 'FOCUS', True$)
                 end	
-                                	
             end
         end
     end
@@ -225,7 +227,6 @@ ShowPopup:
     ForeColor   = Get_Property(@Window, 'FORECOLOR')
     CursorXPos  = Field(Point, ',', 1, 1)
     CursorYPos  = Field(Point, ',', 2, 1)
-*    FormSize    = SRP_Get_Window_Rect(@Window)
     FormSize    = Get_Property(@Window, 'SIZE')
     FormXPos    = FormSize<1>
     FormYPos    = FormSize<2>
@@ -366,4 +367,3 @@ ResetForm:
     
 return
 
-