Commit c9f5e143 authored by kmandhre's avatar kmandhre

issue tracker point 193- consider customer code in validation with station code to n from


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93126 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 61a6d691
...@@ -224,6 +224,11 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute ...@@ -224,6 +224,11 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
else if(childNodeName.equalsIgnoreCase("stan_code__fr")) else if(childNodeName.equalsIgnoreCase("stan_code__fr"))
{ {
StanCodeFrom = checkNull(genericUtility.getColumnValue("stan_code__fr", dom)); StanCodeFrom = checkNull(genericUtility.getColumnValue("stan_code__fr", dom));
custCode = genericUtility.getColumnValue("cust_code", dom);
if(custCode == null)
{
custCode = " ";
}
if(StanCodeFrom != null && StanCodeFrom.trim().length() > 0) if(StanCodeFrom != null && StanCodeFrom.trim().length() > 0)
{ {
...@@ -250,6 +255,11 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute ...@@ -250,6 +255,11 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
else if(childNodeName.equalsIgnoreCase("stan_code__to")) else if(childNodeName.equalsIgnoreCase("stan_code__to"))
{ {
StanCodeTo = checkNull(genericUtility.getColumnValue("stan_code__to", dom)); StanCodeTo = checkNull(genericUtility.getColumnValue("stan_code__to", dom));
custCode = genericUtility.getColumnValue("cust_code", dom);
/*if(custCode == null)
{
custCode = " ";
}*/
if(StanCodeTo != null && StanCodeTo.trim().length() > 0) if(StanCodeTo != null && StanCodeTo.trim().length() > 0)
{ {
...@@ -271,9 +281,36 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute ...@@ -271,9 +281,36 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(editFlag != null && editFlag.trim().equalsIgnoreCase("A")) if(editFlag != null && editFlag.trim().equalsIgnoreCase("A"))
{ {
sql = "select count(*) from distroute where stan_code__fr = ? and stan_code__to = ?"; if(custCode != null && custCode.trim().length() > 0)
{
sql = "select count(*) from distroute where stan_code__fr = ? and stan_code__to = ? and cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,StanCodeFrom);
pstmt.setString(2,StanCodeTo);
pstmt.setString(3,custCode); //added by kunal on 22/05/13
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
if(count > 0)
{
errCode = "VTSTANDB";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
else
{
sql = "select count(*) from distroute where stan_code__fr = ? and stan_code__to = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,StanCodeFrom); pstmt.setString(1,StanCodeFrom);
pstmt.setString(2,StanCodeTo); pstmt.setString(2,StanCodeTo);
...@@ -293,6 +330,7 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute ...@@ -293,6 +330,7 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
}
} }
......
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