diff --git a/LSL2/STPROC/COMM_DIALOG_WO_SCAN.txt b/LSL2/STPROC/COMM_DIALOG_WO_SCAN.txt index e71cb5b..e3d532a 100644 --- a/LSL2/STPROC/COMM_DIALOG_WO_SCAN.txt +++ b/LSL2/STPROC/COMM_DIALOG_WO_SCAN.txt @@ -211,12 +211,10 @@ If Error_Services('NoError') then IF RawLot[1,2] = '1T' OR RawLot[1,2] = '2T' THEN LotNo = RawLot[3,99] END ELSE - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Scanned Code ':QUOTE(RawLot):' is not an ANSI Lot No.' - Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') + Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Scanned Code ':QUOTE(RawLot):' is not an ANSI Lot No.') Set_Property(CtrlEntId,"SELPOS",PrevSelPos) Set_Property(CtrlEntID,'INVALUE','',PrevSelPos) + Set_Property(CtrlEntID, 'FOCUS', True$) RETURN END END ELSE @@ -229,13 +227,10 @@ If Error_Services('NoError') then LOCATE LotNo IN CheckArray USING @VM SETTING Pos ELSE * Accept or Rescan message - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Lot No ':QUOTE(LotNo):' not found in':@TM:'Order Item Lot Numbers!' - Resp = Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') - - LotNo = '' ;* Clear entered field for a rescan + Resp = Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Lot No ':QUOTE(LotNo):' not found in':@TM:'Order Item Lot Numbers!') + LotNo = '' ;* Clear entered field for a rescan Set_Property(CtrlEntId,"SELPOS",PrevSelPos) ;* Cursor to Lot No for a rescan + Set_Property(CtrlEntID, 'FOCUS', True$) END END @@ -248,12 +243,10 @@ If Error_Services('NoError') then IF RawLotQty[1,1] = 'Q' THEN LotQty = RawLotQty[2,99] END ELSE - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Scanned Code ':QUOTE(RawLotQty):' is not an ANSI Quantity' - Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') + Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Scanned Code ':QUOTE(RawLotQty):' is not an ANSI Quantity') Set_Property(CtrlEntId,"SELPOS",PrevSelPos) Set_Property(CtrlEntID,'INVALUE','',PrevSelPos) + Set_Property(CtrlEntID, 'FOCUS', True$) RETURN END END ELSE @@ -262,13 +255,10 @@ If Error_Services('NoError') then IF NOT(NUM(LotQty)) THEN * Accept or Rescan message - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Lot Qty ':QUOTE(LotQty):' is not a number!' - Resp = Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') - + Resp = Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Lot Qty ':QUOTE(LotQty):' is not a number!') LotNo = '' ;* Clear entered field for a rescan Set_Property(CtrlEntId,"SELPOS",PrevSelPos) ;* Cursor to Lot No for a rescan + Set_Property(CtrlEntID, 'FOCUS', True$) END Set_Property(CtrlEntID,'INVALUE',LotQty,PrevSelPos) @@ -291,12 +281,10 @@ If Error_Services('NoError') then IF RawPartNo[1,1] _EQC 'P' OR RawPartNo[1,1] _EQC 'S' THEN PartNo = RawPartNo[2,99] END ELSE - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Scanned Code ':QUOTE(RawPartNo):' is not an ANSI Part No' - Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') + Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Scanned Code ':QUOTE(RawPartNo):' is not an ANSI Part No') Set_Property(CtrlEntId,"SELPOS",PrevSelPos) Set_Property(CtrlEntID,'INVALUE','',PrevSelPos) + Set_Property(CtrlEntID, 'FOCUS', True$) RETURN END END ELSE @@ -309,25 +297,20 @@ If Error_Services('NoError') then PartNo = CheckArray END ELSE * Accept or Rescan message - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Part No ':QUOTE(PartNo):' not found in':@TM:'Order Customer Part Numbers!' - Resp = Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') + Resp = Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Part No ':QUOTE(PartNo):' not found in':@TM:'Order Customer Part Numbers!') PartNo = '' ;* Clear entered field for a rescan Set_Property(CtrlEntId,"SELPOS",PrevSelPos) ;* Cursor to Lot No for a rescan + Set_Property(CtrlEntID, 'FOCUS', True$) END END ELSE * Check Substrate Part Numbers LOCATE PartNo IN CheckArray USING @VM SETTING Pos ELSE * Accept or Rescan message - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Part No ':QUOTE(PartNo):' not found in':@TM:'Order Substrate Part Numbers!' - Resp = Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') - - PartNo = '' ;* Clear entered field for a rescan + Resp = Msg(@Window, '', 'OK', '', 'Scan Error':@FM:'Part No ':QUOTE(PartNo):' not found in':@TM:'Order Substrate Part Numbers!') + PartNo = '' ;* Clear entered field for a rescan Set_Property(CtrlEntId,"SELPOS",PrevSelPos) ;* Cursor to Lot No for a rescan + Set_Property(CtrlEntID, 'FOCUS', True$) END END ;* End of check for Customer supplied or Inventory substrate part number @@ -336,18 +319,19 @@ If Error_Services('NoError') then CASE PrevCol = COL$LQP_VENDOR SubSuppBy = CheckArray - + VendCode = '' IF StripANSI AND NOT(SkipSubAnsi) THEN RawVendCode = TRIM(ListData) IF RawVendCode[1,2] = '1V' THEN VendCode = RawVendCode[3,99] END ELSE - TypeOver = '' + TypeOver = '' TypeOver = 'B&Rescan' TypeOver = 'Scanned Code ':QUOTE(RawVendCode):' is not an ANSI Vendor Code' - Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') - Set_Property(CtrlEntId,"SELPOS",PrevSelPos) + Resp = Msg(@WINDOW, '','OK', '', 'Scan Error':@FM:'Scanned Code ':QUOTE(RawVendCode):' is not an ANSI Vendor Code') + Set_Property(CtrlEntID,"SELPOS",PrevSelPos) Set_Property(CtrlEntID,'INVALUE','',PrevSelPos) + Set_Property(CtrlEntID, 'FOCUS', True$) RETURN END END ELSE @@ -356,28 +340,24 @@ If Error_Services('NoError') then IF RowExists('SEMI_VEND_CODE', VendCode) OR SubSuppBy = 'C' ELSE * Accept or Rescan message - TypeOver = '' - TypeOver = 'B&Rescan' - TypeOver = 'Vendor Code ':QUOTE(VendCode):' not found in':@TM:'Vendor Codes on file!' - Resp = Msg(@WINDOW,TypeOver,'LABEL_DATA_ERROR') - - VendCode = '' ;* Clear entered field for a rescan + If VendCode EQ '' then VendCode = RawVendCode + Resp = Msg(@WINDOW, '','OK', '', 'Scan Error':@FM:'Vendor Code ':QUOTE(VendCode):' not found in':@TM:'Vendor Codes on file!') + VendCode = '' ;* Clear entered field for a rescan Set_Property(CtrlEntId,"SELPOS",PrevSelPos) ;* Cursor to Lot No for a rescan + Set_Property(CtrlEntID,'INVALUE','',PrevSelPos) + Set_Property(CtrlEntID, 'FOCUS', True$) RETURN END Set_Property(CtrlEntID,'INVALUE',VendCode,PrevSelPos) - *IF VendCode NE 'NA' THEN ExpectedCode = Get_Property(@WINDOW,'@VENDOR_DEF') IF VendCode NE ExpectedCode AND ExpectedCode NE '' THEN void = Msg(@WINDOW,'','EXPECTED_VENDOR_CODE','',ExpectedCode:@FM:VendCode) + Set_Property(CtrlEntID, 'FOCUS', True$) END - *END ELSE - * void = Msg(@WINDOW,'','NA_CODE_USED') - *END - + ListArray = Get_Property(CtrlEntId,'ARRAY') CheckArray = Get_Property(@WINDOW,'@CHECK_ARRAY') diff --git a/LSL2/STPROC/COMM_WO_MAT_WFR.txt b/LSL2/STPROC/COMM_WO_MAT_WFR.txt index efe359d..5e108be 100644 --- a/LSL2/STPROC/COMM_WO_MAT_WFR.txt +++ b/LSL2/STPROC/COMM_WO_MAT_WFR.txt @@ -72,6 +72,8 @@ EQU COL$USER_ID TO 8 EQU COL$TAGS TO 9 EQU COL$TOOL_ID TO 10 +EQU MULTILINE_STYLE$ TO 512 ;* MultiLine Select + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\WO_Mat' LogDate = Oconv(Date(), 'D4/') LogTime = Oconv(Time(), 'MTS') @@ -122,18 +124,6 @@ Create: * get the current style - EQU MULTILINE_STYLE$ TO 512 ;* MultiLine Select - - Style = Get_Property('WO_MAT_WFR.SLOT_NO', 'STYLE') - - IF Style [1,2] _EQC "0x" THEN - CONVERT @LOWER.CASE TO @UPPER.CASE IN STYLE - Style = ICONV(Style [3,99], "MX") - END - - Style = BitOr(Style, MULTILINE_STYLE$) - Set_Property('WO_MAT_WFR.SLOT_NO', "STYLE", Style) - * Provides compatibility with the existing messaging attachment system IF Parm1 NE '' THEN