Skip to content

B
business-java
Commit 2dbf5b36 authored by pshinde's avatar pshinde
Browse files
Options

Changes done in Transporter 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96501 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1919bea9
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 50 deletions
webitm-dis/ibase/webitm/ejb/dis/TransporterIC.java
View file @ 2dbf5b36
...@@ -525,15 +525,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -525,15 +525,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
{ {
//changes by deepak sawant (23/10/13) //changes by deepak sawant (23/10/13)
currCode = genericUtility.getColumnValue("curr_code", dom); currCode = genericUtility.getColumnValue("curr_code", dom);
if(currCode!=null && currCode.trim().length()>0)
if(currCode == null || currCode.trim().length() == 0)
{
errCode = "CURRCODBL";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
break;
}
else
{ {
sql = " select count(*) from currency where curr_code = ? "; sql = " select count(*) from currency where curr_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -555,16 +547,16 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -555,16 +547,16 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
else if(childNodeName.equalsIgnoreCase("acct_code__fp")) else if(childNodeName.equalsIgnoreCase("acct_code__fp"))
{ {
acctCodeFp = genericUtility.getColumnValue("acct_code__fp", dom); acctCodeFp = genericUtility.getColumnValue("acct_code__fp", dom);
if (acctCodeFp != null && acctCodeFp.trim().length() > 0 ) //if (acctCodeFp != null && acctCodeFp.trim().length() > 0 )
{ //{
sql = " select count(*) from accounts where acct_code = ? "; sql = " select count(*) from accounts where acct_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, acctCodeFp); pstmt.setString(1, acctCodeFp);
...@@ -606,7 +598,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -606,7 +598,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} //}
} }
else if(childNodeName.equalsIgnoreCase("cctr_code__fp")) else if(childNodeName.equalsIgnoreCase("cctr_code__fp"))
...@@ -694,7 +686,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -694,7 +686,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
// } // }
// } // }
} }
//added by priyanka on 26/09/14 //added by priyanka
break; break;
//case2 //case2
...@@ -748,10 +740,9 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -748,10 +740,9 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
} }
else if(childNodeName.equalsIgnoreCase("reg_date")) else if(childNodeName.equalsIgnoreCase("reg_date"))
{ {
regDate = genericUtility.getColumnValue("reg_date", dom); regDate = genericUtility.getColumnValue("reg_date", dom);
validUpto = genericUtility.getColumnValue("valid_upto", dom);
System.out.println(">>>>>>>>>>>regDate===="+regDate); System.out.println(">>>>>>>>>>>regDate===="+regDate);
System.out.println(">>>>>>>>>>>validUpto===="+validUpto);
if(regDate==null || regDate.trim().length()==0) if(regDate==null || regDate.trim().length()==0)
{ {
errCode = "VTREGNULL";//entry message error errCode = "VTREGNULL";//entry message error
...@@ -779,8 +770,9 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -779,8 +770,9 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
if(regDate!=null && regDate.trim().length()>0) if(regDate!=null && regDate.trim().length()>0)
{ {
registerDate = Timestamp.valueOf(genericUtility.getValidDateString(regDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0"); registerDate = Timestamp.valueOf(genericUtility.getValidDateString(regDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
validDate = Timestamp.valueOf(genericUtility.getValidDateString(validUpto, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0"); validDate = Timestamp.valueOf(genericUtility.getValidDateString(validUpto, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
if(validDate.equals(registerDate)||validDate.compareTo(registerDate)<0)
if(validDate.equals(registerDate)||validDate.compareTo(registerDate)<0)
{ {
errCode = "VTVALREGDT"; errCode = "VTVALREGDT";
errList.add(errCode); errList.add(errCode);
...@@ -986,26 +978,33 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -986,26 +978,33 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
groupCode = genericUtility.getColumnValue("group_code", dom); groupCode = genericUtility.getColumnValue("group_code", dom);
//changes done by priyanka as per pb code on 26/9/14 //changes done by priyanka as per pb code on 26/9/14
if(tranCodePay == null || tranCodePay.trim().length()==0) if(tranCode!=null && tranCode.trim().length()>0)
{ {
valueXmlString.append("<tran_code__pay>").append("<![CDATA[" + tranCode + "]]>").append("</tran_code__pay>"); valueXmlString.append("<tran_code__pay>").append("<![CDATA[" + tranCode + "]]>").append("</tran_code__pay>");
valueXmlString.append("<group_code>").append("<![CDATA[" + tranCode + "]]>").append("</group_code>");
} }
if(groupCode == null || groupCode.trim().length()==0) else
{ {
valueXmlString.append("<group_code>").append("<![CDATA[" + tranCode + "]]>").append("</group_code>"); valueXmlString.append("<tran_code__pay>").append("<![CDATA["+" "+"]]>").append("</tran_code__pay>");
valueXmlString.append("<group_code>").append("<![CDATA[" + " " + "]]>").append("</group_code>");
} }
} }
else if(currentColumn.trim().equalsIgnoreCase("tran_name")) else if(currentColumn.trim().equalsIgnoreCase("tran_name"))
{ {
tranName = genericUtility.getColumnValue("tran_name", dom); tranName = genericUtility.getColumnValue("tran_name", dom);
chqName = genericUtility.getColumnValue("chq_name", dom); chqName = genericUtility.getColumnValue("chq_name", dom);
//changes done by priyanka as per pb code on 26/9/14 if(tranName!=null && tranName.trim().length()>0)
if(chqName == null || chqName.trim().length() == 0)
{ {
valueXmlString.append("<chq_name>").append("<![CDATA[" + tranName + "]]>").append("</chq_name>"); valueXmlString.append("<chq_name>").append("<![CDATA[" + tranName + "]]>").append("</chq_name>");
} }
else
{
valueXmlString.append("<chq_name>").append("<![CDATA[" + "" + "]]>").append("</chq_name>");
}
} }
else if(currentColumn.trim().equalsIgnoreCase("stan_code")) else if(currentColumn.trim().equalsIgnoreCase("stan_code"))
...@@ -1017,7 +1016,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1017,7 +1016,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if(rs1.next()) if(rs1.next())
{ {
stateCode = rs1.getString(1); stateCode =checkNull(rs1.getString(1));
sql2 = " select count_code from state where state_code = ? "; sql2 = " select count_code from state where state_code = ? ";
pstmt2 = conn.prepareStatement(sql2); pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1, stateCode); pstmt2.setString(1, stateCode);
...@@ -1025,7 +1024,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1025,7 +1024,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
if(rs2.next()) if(rs2.next())
{ {
if(rs1.getString(1) != null) if(rs1.getString(1) != null)
countCode = rs2.getString(1); countCode = checkNull( rs2.getString(1));
} }
rs2.close(); rs2.close();
rs2 = null; rs2 = null;
...@@ -1050,8 +1049,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1050,8 +1049,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
else if(currentColumn.trim().equalsIgnoreCase("curr_code")) else if(currentColumn.trim().equalsIgnoreCase("curr_code"))
{ {
currCode = genericUtility.getColumnValue("curr_code", dom); currCode = genericUtility.getColumnValue("curr_code", dom);
sql1 = " select descr from currency where curr_code = ? "; sql1 = " select descr from currency where curr_code = ? ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
...@@ -1060,7 +1058,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1060,7 +1058,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
if(rs1.next()) if(rs1.next())
{ {
if(rs1.getString(1) != null) if(rs1.getString(1) != null)
currencyDescr = rs1.getString(1); currencyDescr = checkNull(rs1.getString(1));
} }
...@@ -1120,40 +1118,40 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1120,40 +1118,40 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
if(rs1.next()) if(rs1.next())
{ {
if(rs1.getString(1) != null) if(rs1.getString(1) != null)
tranName1 = rs1.getString(1); tranName1 =checkNull( rs1.getString(1));
if(rs1.getString(2) != null) if(rs1.getString(2) != null)
shName = rs1.getString(2); shName = checkNull(rs1.getString(2));
if(rs1.getString(3) != null) if(rs1.getString(3) != null)
contactPer = rs1.getString(3); contactPer = checkNull(rs1.getString(3));
if(rs1.getString(4) != null) if(rs1.getString(4) != null)
contPfx = rs1.getString(4); contPfx = checkNull(rs1.getString(4));
if(rs1.getString(5) != null) if(rs1.getString(5) != null)
addr1 = rs1.getString(5); addr1 =checkNull(rs1.getString(5));
if(rs1.getString(6) != null) if(rs1.getString(6) != null)
addr2 = rs1.getString(6); addr2 = checkNull(rs1.getString(6));
if(rs1.getString(7) != null) if(rs1.getString(7) != null)
addr3 = rs1.getString(7); addr3 = checkNull(rs1.getString(7));
if(rs1.getString(8) != null) if(rs1.getString(8) != null)
city = rs1.getString(8); city = checkNull(rs1.getString(8));
if(rs1.getString(9) != null) if(rs1.getString(9) != null)
pin = rs1.getString(9).trim(); pin = checkNull(rs1.getString(9).trim());
if(rs1.getString(10) != null) if(rs1.getString(10) != null)
stateCode = rs1.getString(10); stateCode =checkNull( rs1.getString(10));
if(rs1.getString(11) != null) if(rs1.getString(11) != null)
countCode = rs1.getString(11); countCode = checkNull(rs1.getString(11));
if(rs1.getString(12) != null) if(rs1.getString(12) != null)
tele1 = rs1.getString(12); tele1 = checkNull(rs1.getString(12));
if(rs1.getString(13) != null) if(rs1.getString(13) != null)
tele2 = rs1.getString(13); tele2 = checkNull(rs1.getString(13));
if(rs1.getString(14) != null) if(rs1.getString(14) != null)
tele3 = rs1.getString(14); tele3 = checkNull(rs1.getString(14));
if(rs1.getString(15) != null) if(rs1.getString(15) != null)
teleExt = rs1.getString(15); teleExt = checkNull(rs1.getString(15));
if(rs1.getString(16) != null) if(rs1.getString(16) != null)
fax = rs1.getString(16); fax = checkNull(rs1.getString(16));
if(rs1.getString(17) != null) if(rs1.getString(17) != null)
mail = rs1.getString(17); mail = checkNull(rs1.getString(17));
} }
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
...@@ -1225,7 +1223,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T ...@@ -1225,7 +1223,7 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
break; break;
//added by priyanka on 26/09/14
case 2: case 2:
System.out.println("Transporter itemchanged case 2"); System.out.println("Transporter itemchanged case 2");
......
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