Bugfix Commit
This commit is contained in:
@ -1456,6 +1456,8 @@ end service
|
||||
|
||||
Service SignUnloadExtra1(RDSNo, LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1465,18 +1467,24 @@ Service SignUnloadExtra1(RDSNo, LSLUserName)
|
||||
RDSRec<RDS_OP_OUT_EX1_DATE$> = SRP_Date('Today')
|
||||
RDSRec<RDS_OP_OUT_EX1_TIME$> = SRP_Time('Now')
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
If Error_Services('NoError') then
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Reactor_Services('RemoveRDSFromReactorLoad', RDSNo, Reactor, LSLUserName)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unload Extra 1 is not able to be signed at this stage')
|
||||
ErrorMsg = 'Unload Extra 1 is not able to be signed at this stage'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Sign Unload Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Sign Unload Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', 'Error signing Unload Extra 1 : ' : ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1484,6 +1492,8 @@ end service
|
||||
|
||||
Service UnsignUnloadExtra1(RDSNo, LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1496,26 +1506,32 @@ Service UnsignUnloadExtra1(RDSNo, LSLUserName)
|
||||
RDSRec<RDS_OP_OUT_EX1$> = ''
|
||||
RDSRec<RDS_OP_OUT_EX1_DATE$> = ''
|
||||
RDSRec<RDS_OP_OUT_EX1_TIME$> = ''
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('AddRDSToReactorLoad', RDSNo, Reactor)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unsign Load Extra 1 is not able to be unsigned.')
|
||||
ErrorMsg = 'Unsign Load Extra 1 is not able to be unsigned.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.')
|
||||
ErrorMsg = 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS is not assigned to a reactor.')
|
||||
ErrorMsg = 'RDS is not assigned to a reactor.'
|
||||
end
|
||||
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Unsign Load Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Unsign Load Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1523,6 +1539,8 @@ end service
|
||||
|
||||
Service SignLoadExtra1(RDSNo,LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1538,22 +1556,28 @@ Service SignLoadExtra1(RDSNo,LSLUserName)
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('AddRDSToReactorLoad', RDSNo, Reactor)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Load Extra 1 is not able to be signed at this stage')
|
||||
ErrorMsg = 'Load Extra 1 is not able to be signed at this stage'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.')
|
||||
ErrorMsg = 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS is not assigned to a reactor.')
|
||||
ErrorMsg = 'RDS is not assigned to a reactor.'
|
||||
end
|
||||
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Sign Unload Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Sign Unload Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('GetMessage')
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1561,6 +1585,8 @@ end service
|
||||
|
||||
Service UnsignLoadExtra1(RDSNo, LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1569,19 +1595,25 @@ Service UnsignLoadExtra1(RDSNo, LSLUserName)
|
||||
RDSRec<RDS_OP_IN_EX2$> = ''
|
||||
RDSRec<RDS_OP_IN_EX2_DATE$> = ''
|
||||
RDSRec<RDS_OP_IN_EX2_TIME$> = ''
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('RemoveRDSFromReactorLoad', RDSNo, Reactor, LSLUserName)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unsign Load Extra 1 is not able to be unsigned.')
|
||||
ErrorMsg = 'Unsign Load Extra 1 is not able to be unsigned.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Unsign Load Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Unsign Load Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1589,6 +1621,8 @@ end service
|
||||
|
||||
Service SignUnloadExtra2(RDSNo,LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1598,18 +1632,24 @@ Service SignUnloadExtra2(RDSNo,LSLUserName)
|
||||
RDSRec<RDS_OP_OUT_EX2_DATE$> = SRP_Date('Today')
|
||||
RDSRec<RDS_OP_OUT_EX2_TIME$> = SRP_Time('Now')
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
If Error_Services('NoError') then
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Reactor_Services('RemoveRDSFromReactorLoad', RDSNo, Reactor, LSLUserName)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unload Extra 2 is not able to be signed at this stage')
|
||||
ErrorMsg = 'Unload Extra 2 is not able to be signed at this stage'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Sign Unload Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Sign Unload Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1617,6 +1657,8 @@ end service
|
||||
|
||||
Service UnsignUnloadExtra2(RDSNo, LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1629,26 +1671,32 @@ Service UnsignUnloadExtra2(RDSNo, LSLUserName)
|
||||
RDSRec<RDS_OP_OUT_EX2$> = ''
|
||||
RDSRec<RDS_OP_OUT_EX2_DATE$> = ''
|
||||
RDSRec<RDS_OP_OUT_EX2_TIME$> = ''
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('AddRDSToReactorLoad', RDSNo, Reactor)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unsign Load Extra 2 is not able to be unsigned.')
|
||||
ErrorMsg = 'Unsign Load Extra 2 is not able to be unsigned.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.')
|
||||
ErrorMsg = 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS is not assigned to a reactor.')
|
||||
ErrorMsg = 'RDS is not assigned to a reactor.'
|
||||
end
|
||||
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Unsign Unload Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Unsign Unload Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1656,6 +1704,8 @@ end service
|
||||
|
||||
Service SignLoadExtra2(RDSNo,LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1671,21 +1721,27 @@ Service SignLoadExtra2(RDSNo,LSLUserName)
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('AddRDSToReactorLoad', RDSNo, Reactor)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Load Extra 2 is not able to be signed at this stage')
|
||||
ErrorMsg = 'Load Extra 2 is not able to be signed at this stage'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.')
|
||||
ErrorMsg = 'Reactor #' : Reactor : ' does not currently have the capacity to be loaded. Unload a lot to allow.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS is not assigned to a reactor.')
|
||||
ErrorMsg = 'RDS is not assigned to a reactor.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Sign Unload Extra 2 routine')
|
||||
ErrorMsg = 'Invalid user passed to Sign Unload Extra 2 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -1693,6 +1749,8 @@ end service
|
||||
|
||||
Service UnsignLoadExtra2(RDSNo, LSLUserName)
|
||||
|
||||
ErrorMsg = ''
|
||||
|
||||
IF LSLUserName NE '' AND RowExists('LSL_USERS', LSLUserName) then
|
||||
If RowExists('RDS', RDSNo) then
|
||||
RDSRec = Database_Services('ReadDataRow', 'RDS', RDSNo)
|
||||
@ -1701,19 +1759,25 @@ Service UnsignLoadExtra2(RDSNo, LSLUserName)
|
||||
RDSRec<RDS_OP_IN_EX3$> = ''
|
||||
RDSRec<RDS_OP_IN_EX3_DATE$> = ''
|
||||
RDSRec<RDS_OP_IN_EX3_TIME$> = ''
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
Reactor = RDSRec<RDS_REACTOR$>
|
||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, False$)
|
||||
If Error_Services('NoError') then
|
||||
Reactor_Services('RemoveRDSFromReactorLoad', RDSNo, Reactor, LSLUserName)
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Unsign Load Extra 2 is not able to be unsigned.')
|
||||
ErrorMsg = 'Unsign Load Extra 2 is not able to be unsigned.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'RDS ' : RDSNo : ' does not exist.')
|
||||
ErrorMsg = 'RDS ' : RDSNo : ' does not exist.'
|
||||
end
|
||||
end else
|
||||
Error_Services('Add', 'Invalid user passed to Unsign Unload Extra 1 routine')
|
||||
ErrorMsg = 'Invalid user passed to Unsign Unload Extra 1 routine'
|
||||
end
|
||||
|
||||
If ErrorMsg NE '' then
|
||||
Error_Services('Add', ErrorMsg)
|
||||
end
|
||||
|
||||
end service
|
||||
@ -2442,3 +2506,4 @@ ClearCursors:
|
||||
|
||||
return
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user