Commit f7f3fad6 authored by dpawar's avatar dpawar

update java source as per new requirement


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93569 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9e26a804
...@@ -83,6 +83,12 @@ public class ProofOfDeliveryConf extends ActionHandlerEJB implements ProofOfDeli ...@@ -83,6 +83,12 @@ public class ProofOfDeliveryConf extends ActionHandlerEJB implements ProofOfDeli
rs.close(); rs.close();
rs = null; rs = null;
} }
if( wfStatus != null && wfStatus.equalsIgnoreCase("O") )
{
//Opened transaction can not confirm
errString = itmdbAccess.getErrorString("", "VTOPCCONF", "", "", conn);
return errString;
}
if( wfStatus != null && wfStatus.equalsIgnoreCase("R") ) if( wfStatus != null && wfStatus.equalsIgnoreCase("R") )
{ {
//Rejected transaction can not confirm //Rejected transaction can not confirm
......
...@@ -59,7 +59,7 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe ...@@ -59,7 +59,7 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe
if( rs.next() ) if( rs.next() )
{ {
confirmed =rs.getString(1)==null ? "N":rs.getString(1); confirmed =rs.getString(1)==null ? "N":rs.getString(1);
wfStatus =rs.getString(1)==null ? "O":rs.getString(1); wfStatus =rs.getString(2)==null ? "O":rs.getString(2);
} }
if( pstmt != null ) if( pstmt != null )
{ {
...@@ -71,6 +71,13 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe ...@@ -71,6 +71,13 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe
rs.close(); rs.close();
rs = null; rs = null;
} }
System.out.println("Transaction Status------->>["+wfStatus+"]");
if( wfStatus != null && wfStatus.equalsIgnoreCase("O") )
{
//Opened Transaction cannot be rejected
errString = itmDBAccess.getErrorString("", "VTOPTCRJ", "", "", conn);
return errString;
}
if( confirmed != null && confirmed.equalsIgnoreCase("Y") ) if( confirmed != null && confirmed.equalsIgnoreCase("Y") )
{ {
//Confirmed Transaction can not be rejected //Confirmed Transaction can not be rejected
...@@ -79,6 +86,7 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe ...@@ -79,6 +86,7 @@ public class ProofOfDeliveryReject extends ActionHandlerEJB implements ProofOfDe
} }
if( wfStatus != null && wfStatus.equalsIgnoreCase("R") ) if( wfStatus != null && wfStatus.equalsIgnoreCase("R") )
{ {
//Already rejected
errString = itmDBAccess.getErrorString("", "VTALREJ", "", "", conn); errString = itmDBAccess.getErrorString("", "VTALREJ", "", "", conn);
return errString; return errString;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment