modified in-line ncr hold removal to use RDS key instead of WO_MAT key
This commit is contained in:
parent
2ac49b85ec
commit
0716e25303
@ -378,9 +378,10 @@ RejMat:
|
||||
// Ensure cassette is not on hold
|
||||
WONo = Get_Property(@Window:'.WO_NO', 'TEXT')
|
||||
CassNo = Get_Property(@Window:'.CASS_NO', 'TEXT')
|
||||
RDSNo = Get_Property(@Window:'.RDS_NO', 'TEXT')
|
||||
WOMatKey = WONo:'*':CassNo
|
||||
OnHold = Xlate('WO_MAT', WOMatKey, 'HOLD', 'X')
|
||||
Result = ''
|
||||
Result = ''
|
||||
|
||||
SlotList = Get_Property('WO_MAT_WFR.SLOT_NO','LIST')
|
||||
SlotSelection = Get_Property('WO_MAT_WFR.SLOT_NO','SELPOS')
|
||||
@ -397,7 +398,7 @@ RejMat:
|
||||
If Not(Authorized) then Return 0
|
||||
|
||||
If OnHold EQ True$ then
|
||||
Result = Dialog_Box('NDW_HOLD_REMOVAL_PROMPT',@WINDOW,'WO_MAT':@VM:WOMatKey:@VM:WOMatKey)
|
||||
Result = Dialog_Box('NDW_HOLD_REMOVAL_PROMPT',@WINDOW,'RDS':@VM:RDSNo:@VM:WOMatKey)
|
||||
If Result NE True$ then
|
||||
Return 0
|
||||
end else
|
||||
@ -425,10 +426,6 @@ RejMat:
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
IneligibleSlots = ''
|
||||
AllSlotsPermitted = True$ ; // Assume that all slots are permitted to be NCR'd for now.
|
||||
For I = 1 TO SelCnt
|
||||
@ -1216,3 +1213,4 @@ LogRecord:
|
||||
return
|
||||
|
||||
|
||||
|
||||
|
@ -57,6 +57,7 @@ Event WINDOW.CREATE(CreateParam)
|
||||
|
||||
End Event
|
||||
|
||||
|
||||
Event EDB_REMOVAL_REASON.CHAR(VirtCode, ScanCode, CtrlKey, ShiftKey, AltKey)
|
||||
|
||||
Reason = Get_Property(CtrlEntId, 'TEXT')
|
||||
@ -104,7 +105,6 @@ Event PUB_OK.CLICK()
|
||||
end event
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Internal GoSubs
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
Loading…
x
Reference in New Issue
Block a user