Merged PR 13813: Lot void routines enhancement
Lot void routines enhancement Related work items: #110807
This commit is contained in:
parent
507c6bffba
commit
b76db6bc72
@ -800,6 +800,12 @@ IF WMIKey NE '' OR WMOKey NE '' THEN
|
||||
Result = 'RTB'
|
||||
Case WMIStatus EQ 'HOLD' and WMOStatus NE ''
|
||||
Result = WMOStatus
|
||||
Case WMIStatus EQ 'VOID' and WMOStatus EQ 'VOID'
|
||||
Result = 'VOID'
|
||||
Case WMIStatus EQ 'VOID' and WMOStatus NE 'VOID'
|
||||
Result = WMOStatus
|
||||
Case WMIStatus NE 'VOID' and WMOStatus EQ 'VOID'
|
||||
Result = WMIStatus
|
||||
CASE InboundStat = '' AND OutboundStat = ''
|
||||
Result = ''
|
||||
|
||||
@ -3254,9 +3260,9 @@ ReportStatus:
|
||||
|
||||
RETURN
|
||||
END
|
||||
|
||||
|
||||
IF WMIKey NE '' THEN
|
||||
IF WMIStatus = 'MT' OR WMIStatus = 'VOID' THEN
|
||||
IF WMIStatus = 'MT' THEN
|
||||
NULL
|
||||
END ELSE
|
||||
InboundStat = WMIStatus
|
||||
@ -3267,41 +3273,49 @@ ReportStatus:
|
||||
|
||||
* Removed "( WMOMakeup = 1 AND WMOStatus = 'MT' ) from the OR conditions * 5/1/2014 JCH
|
||||
|
||||
IF WMOStatus = 'RTB' OR WMOStatus = 'VOID' THEN
|
||||
IF WMOStatus = 'RTB' THEN
|
||||
NULL
|
||||
END ELSE
|
||||
OutboundStat = WMOStatus
|
||||
END
|
||||
END
|
||||
|
||||
BEGIN CASE
|
||||
CASE InboundStat = '' AND OutboundStat = ''
|
||||
Result = ''
|
||||
|
||||
CASE InboundStat = '' AND OutboundStat NE ''
|
||||
IF WMOMakeup = 1 THEN
|
||||
OutboundStat = 'WMO':' - M/U - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END ELSE
|
||||
OutboundStat = 'WMO':' - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END
|
||||
Result = OutboundStat
|
||||
|
||||
|
||||
CASE InboundStat NE '' AND OutboundStat = ''
|
||||
Result = 'WMI':' - ':OCONV(WMIStatus,'[WM_IN_CURR_STATUS_CONV]')
|
||||
|
||||
|
||||
CASE InboundStat NE '' AND OutboundStat NE ''
|
||||
Result = 'WMI':' - ':OCONV(WMIStatus,'[WM_IN_CURR_STATUS_CONV]'):@VM
|
||||
|
||||
IF WMOMakeup = 1 THEN
|
||||
OutboundStat = 'WMO':' - M/U - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END ELSE
|
||||
OutboundStat = 'WMO':' - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END
|
||||
Result = Result:OutboundStat
|
||||
|
||||
END CASE
|
||||
BEGIN CASE
|
||||
CASE InboundStat = '' AND OutboundStat = ''
|
||||
Result = ''
|
||||
CASE InboundStat = '' AND OutboundStat NE ''
|
||||
IF WMOMakeup = 1 THEN
|
||||
OutboundStat = 'WMO':' - M/U - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END ELSE
|
||||
OutboundStat = 'WMO':' - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END
|
||||
Result = OutboundStat
|
||||
|
||||
|
||||
CASE InboundStat NE '' AND OutboundStat = ''
|
||||
Result = 'WMI':' - ':OCONV(WMIStatus,'[WM_IN_CURR_STATUS_CONV]')
|
||||
|
||||
CASE InboundStat NE '' AND OutboundStat NE ''
|
||||
Result = 'WMI':' - ':OCONV(WMIStatus,'[WM_IN_CURR_STATUS_CONV]'):@VM
|
||||
|
||||
IF WMOMakeup = 1 THEN
|
||||
OutboundStat = 'WMO':' - M/U - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END ELSE
|
||||
OutboundStat = 'WMO':' - ':OCONV(WMOStatus,'[WM_OUT_CURR_STATUS_CONV]')
|
||||
END
|
||||
Result = Result:OutboundStat
|
||||
|
||||
|
||||
END CASE
|
||||
Begin Case
|
||||
Case InboundStat NE 'VOID' AND OutboundStat NE 'VOID'
|
||||
Result = Result
|
||||
Case InboundStat EQ 'VOID' AND OutboundStat NE 'VOID'
|
||||
Result = OutboundStat
|
||||
Case InboundStat NE 'VOID' AND OutboundStat EQ 'VOID'
|
||||
Result = InboundStat
|
||||
Case InboundStat EQ 'VOID' AND OutboundStat EQ 'VOID'
|
||||
Result = 'VOID'
|
||||
End Case
|
||||
|
||||
RETURN
|
||||
|
||||
@ -5604,3 +5618,4 @@ RETURN
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user