Skip to content

B
business-java
Commit 9d114413 authored by skumbhar's avatar skumbhar
Browse files
Options

changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94336 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0d339cfb
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 36 deletions
webitm-fin/ibase/webitm/ejb/fin/InterCompReconcile.java
View file @ 9d114413
...@@ -563,9 +563,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -563,9 +563,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
valueXmlString.append("</"); valueXmlString.append("</");
valueXmlString.append(resultSetMetaData.getColumnLabel(columnItr)); valueXmlString.append(resultSetMetaData.getColumnLabel(columnItr));
valueXmlString.append(">\r\n"); valueXmlString.append(">\r\n");
System.out.println("ColumnType:["+resultSetMetaData.getColumnType(columnItr)+"]"); /*System.out.println("ColumnType:["+resultSetMetaData.getColumnType(columnItr)+"]");
System.out.println("ColumnTypeName:["+resultSetMetaData.getColumnTypeName(columnItr)+"]"); System.out.println("ColumnTypeName:["+resultSetMetaData.getColumnTypeName(columnItr)+"]");
System.out.println("ColumnValue:["+rs.getString(columnItr)+"]"); System.out.println("ColumnValue:["+rs.getString(columnItr)+"]");*/
traceData.add(rs.getString(columnItr) == null ? "" : rs.getString(columnItr).trim()); traceData.add(rs.getString(columnItr) == null ? "" : rs.getString(columnItr).trim());
} }
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
...@@ -600,7 +600,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -600,7 +600,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
System.out.print("uniqueKey:["+uniqueKey+"]"); System.out.print("uniqueKey:["+uniqueKey+"]");
String [] uniqueKeyArr = getUniqueIntValue(uniqueKey); String [] uniqueKeyArr = getUniqueIntValue(uniqueKey);
int intS = Integer.parseInt(uniqueKeyArr[1]);*/ int intS = Integer.parseInt(uniqueKeyArr[1]);*/
System.out.println("@@@@@@@stringBuffer1["+stringBuffer+"]@@@@@@@"); System.out.println("@@@@@@@stringBuffer1["+stringBuffer+"]@@@@@@@,arrayListData.lenght["+arrayListData.size()+"]");
pstmt = conn.prepareStatement(insertSql); pstmt = conn.prepareStatement(insertSql);
for (int itr = 0;itr < arrayListData.size();itr++) { for (int itr = 0;itr < arrayListData.size();itr++) {
...@@ -610,15 +610,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -610,15 +610,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
String uniqueKey = generator.generateTranSeqID("INCORE", "tran_id", keyString, conn); String uniqueKey = generator.generateTranSeqID("INCORE", "tran_id", keyString, conn);
//System.out.print("uniqueKeyERR:["+uniqueKeyArr[0].toString()+nf.format(intS)+"]"); //System.out.print("uniqueKeyERR:["+uniqueKeyArr[0].toString()+nf.format(intS)+"]");
System.out.print("1:["+uniqueKey+"]"); System.out.println("ListData=1:["+uniqueKey+"]2:["+traceData.get(0)+"]3:["+traceData.get(1)+"]"+
System.out.print("2:["+traceData.get(0)+"]"); "4:["+traceData.get(2)+"]5:["+traceData.get(3)+"]6:["+traceData.get(4)+"]"+
System.out.print("3:["+traceData.get(1)+"]"); "7:["+traceData.get(5)+"]8:["+traceData.get(6)+"]9:["+traceData.get(7)+"]");
System.out.print("4:["+traceData.get(2)+"]");
System.out.print("5:["+traceData.get(3)+"]");
System.out.print("6:["+traceData.get(4)+"]");
System.out.print("7:["+traceData.get(5)+"]");
System.out.print("8:["+traceData.get(6)+"]");
System.out.print("9:["+traceData.get(7)+"]");
pstmt.setString(1, uniqueKey); pstmt.setString(1, uniqueKey);
pstmt.setTimestamp(2, (Timestamp)traceData.get(0)); pstmt.setTimestamp(2, (Timestamp)traceData.get(0));
...@@ -685,11 +679,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -685,11 +679,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
try { try {
ArrayList traceData = null; ArrayList traceData = null;
String refId = "",refDate = ""; String refId = "",refDate = "";
//java.sql.Date refDate = null;
double refAmt = 0.0,tempAmt = 0.0,dramt = 0,cramt = 0; double refAmt = 0.0,tempAmt = 0.0,dramt = 0,cramt = 0;
if ( rs != null && rs.size() > 0 ) { if ( rs != null && rs.size() > 0 ) {
System.out.println("Position of RS");
boolean flag = true;
String siteCode = null; String siteCode = null;
double amount = 0.0; double amount = 0.0;
for (int itr = 0;itr < rs.size();itr++) for (int itr = 0;itr < rs.size();itr++)
...@@ -697,8 +688,22 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -697,8 +688,22 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
dramt = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()); dramt = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString());
cramt = rs.get(itr).get(6) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(6).toString()); cramt = rs.get(itr).get(6) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(6).toString());
tempAmt = dramt + cramt; tempAmt = dramt + cramt;
if(!(refId.equalsIgnoreCase(rs.get(itr).get(2).toString())) && !(refDate.equalsIgnoreCase(rs.get(itr).get(0).toString())) && refAmt != tempAmt) /*System.out.println("refid["+refId+"],=["+rs.get(itr).get(2).toString().trim()+"]");
System.out.println("refDate["+refDate+"],=["+rs.get(itr).get(0).toString().trim()+"]");
System.out.println("refAmt["+refAmt+"],=["+tempAmt+"]");*/
if(refId.equalsIgnoreCase(rs.get(itr).get(2).toString().trim()) && refDate.equalsIgnoreCase(rs.get(itr).get(0).toString().trim()) && refAmt == tempAmt)
{ {
traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1));
traceData.add(rs.get(itr).get(2) == null ? "" : rs.get(itr).get(2));
traceData.add(siteCode);
traceData.add(rs.get(itr).get(7) == null ? "" : rs.get(itr).get(7));
traceData.add(amount > 0 ? amount : rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()));
arrayListData.add(traceData);
refId = "";
refDate = "";
refAmt = 0;
} else {
refId = rs.get(itr).get(2).toString(); refId = rs.get(itr).get(2).toString();
refDate = rs.get(itr).get(0).toString(); refDate = rs.get(itr).get(0).toString();
refAmt = tempAmt; refAmt = tempAmt;
...@@ -706,32 +711,14 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -706,32 +711,14 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(rs.get(itr).get(0).toString()); java.util.Date date = new java.util.Date(rs.get(itr).get(0).toString());
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
System.out.println("1:["+time+"]");
System.out.print(" 2:["+rs.get(itr).get(1)+"]");
System.out.print(" 3:["+rs.get(itr).get(2)+"]");
traceData.add(time); traceData.add(time);
traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1)); traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1));
traceData.add(rs.get(itr).get(2) == null ? "" : rs.get(itr).get(2)); traceData.add(rs.get(itr).get(2) == null ? "" : rs.get(itr).get(2));
siteCode = rs.get(itr).get(7) == null ? "" : rs.get(itr).get(7).toString(); siteCode = rs.get(itr).get(7) == null ? "" : rs.get(itr).get(7).toString();
amount = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()); amount = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString());
flag = false;
} else {
System.out.print(" 4:["+rs.get(itr).get(1)+"]");
System.out.print(" 5:["+rs.get(itr).get(2)+"]");
System.out.print(" 6:["+siteCode+"]");
System.out.print(" 7:["+rs.get(itr).get(7)+"]");
System.out.print(" 8:["+rs.get(itr).get(5)+"]");
traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1));
traceData.add(rs.get(itr).get(2) == null ? "" : rs.get(itr).get(2));
traceData.add(siteCode);
traceData.add(rs.get(itr).get(7) == null ? "" : rs.get(itr).get(7));
traceData.add(amount > 0 ? amount : rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()));
arrayListData.add(traceData);
flag = true;
} }
} }
if ( arrayListData.size() % 2 > 0) { /*if ( arrayListData.size() % 2 > 0) {
System.out.print(" 4:[ ]"); System.out.print(" 4:[ ]");
System.out.print(" 5:[ ]"); System.out.print(" 5:[ ]");
System.out.print(" 6:["+siteCode+"]"); System.out.print(" 6:["+siteCode+"]");
...@@ -744,7 +731,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -744,7 +731,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
traceData.add(amount); traceData.add(amount);
arrayListData.add(traceData); arrayListData.add(traceData);
} }*/
} }
traceData = null; traceData = null;
rs = null; rs = 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