Commit a51fa256 authored by msharma's avatar msharma

Total Amount column Added


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92241 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 083f9936
......@@ -318,7 +318,7 @@ Put a validation chq amount in filter and total of details matches in case heade
// 20/07/12 manoharan invoice amendment consideration removed
sql = "SELECT A.INVOICE_ID,D.TRAN_SER,A.TRAN_DATE,D.TOT_AMT - D.ADJ_AMT,C.CUST_NAME,"
+ "B.BANK_CODE,B.CHEQUE_DATE,E.REF_NO AS CHEQUE_NO,B.CHQ_AMOUNT,A.CUST_CODE " //added by rajesh k to get cust_code
+ "B.BANK_CODE,B.CHEQUE_DATE,E.REF_NO AS CHEQUE_NO,B.CHQ_AMOUNT,A.CUST_CODE,D.TOT_AMT " //added by rajesh k to get cust_code
+ "FROM INVOICE A,SORDER B ,CUSTOMER C, RECEIVABLES D, INVOICE_AMENDMENT E "
+ "WHERE A.SALE_ORDER = B.SALE_ORDER "
+ "AND A.CUST_CODE = C.CUST_CODE "
......@@ -344,7 +344,7 @@ Put a validation chq amount in filter and total of details matches in case heade
+ "ORDER BY A.CUST_CODE, E.REF_NO ";
sql = "SELECT A.INVOICE_ID,D.TRAN_SER,A.TRAN_DATE,D.TOT_AMT - D.ADJ_AMT,C.CUST_NAME,"
+ "B.BANK_CODE,B.CHEQUE_DATE,(select E.REF_NO from invoice_amendment e where e.invoice_id = a.invoice_id and e.status = 'S' and e.confirmed = 'Y') AS CHEQUE_NO ,B.CHQ_AMOUNT,A.CUST_CODE " //added by rajesh k to get cust_code
+ "B.BANK_CODE,B.CHEQUE_DATE,(select E.REF_NO from invoice_amendment e where e.invoice_id = a.invoice_id and e.status = 'S' and e.confirmed = 'Y') AS CHEQUE_NO ,B.CHQ_AMOUNT,A.CUST_CODE,D.TOT_AMT " //added by rajesh k to get cust_code
+ "FROM INVOICE A,SORDER B ,CUSTOMER C, RECEIVABLES D " //INVOICE_AMENDMENT E "
+ "WHERE A.SALE_ORDER = B.SALE_ORDER "
+ "AND A.CUST_CODE = C.CUST_CODE "
......@@ -442,6 +442,7 @@ Put a validation chq amount in filter and total of details matches in case heade
retTabSepStrBuff.append("0").append("\t");
retTabSepStrBuff.append(remarks).append("\t");
// adjusted_amt
retTabSepStrBuff.append(0).append("\t");
retTabSepStrBuff.append(0).append("\n");
System.out.println("INVOICE_ID :::::::: "+rs.getString(1));
System.out.println("TRAN_DATE :::::::: "+rs.getDate(3));
......@@ -458,7 +459,7 @@ Put a validation chq amount in filter and total of details matches in case heade
sql = "SELECT D.REF_NO,D.TRAN_SER,D.REF_DATE,D.TOT_AMT - D.ADJ_AMT,C.CUST_NAME ,"
//+ "' ' C.BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE "
+ "' ' BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE, " // ADDED BY RAJESH AS ALIAS IS NOT REQUIRED FOR BANK_CODE
+ " D.CUST_REF_NO,D.REAS_CODE,D.REAS_DETAIL,D.CUST_REF_DATE,D.ADJ_AMT,D.CUST_REF_AMT,D.DUE_DATE " // ADDED BY RAJESH AS ALIAS IS NOT REQUIRED FOR BANK_CODE
+ " D.CUST_REF_NO,D.REAS_CODE,D.REAS_DETAIL,D.CUST_REF_DATE,D.ADJ_AMT,D.CUST_REF_AMT,D.DUE_DATE,D.TOT_AMT " // ADDED BY RAJESH AS ALIAS IS NOT REQUIRED FOR BANK_CODE
+ "FROM CUSTOMER C, RECEIVABLES D "
+ "WHERE C.CUST_CODE = D.CUST_CODE "
+ "AND D.TRAN_SER <> 'S-INV' "
......@@ -575,7 +576,8 @@ Put a validation chq amount in filter and total of details matches in case heade
retTabSepStrBuff.append(rs.getDouble("CUST_REF_AMT")).append("\t");
retTabSepStrBuff.append(remarks).append("\t");
// adjusted_amt
retTabSepStrBuff.append(rs.getDouble("ADJ_AMT")).append("\n");
retTabSepStrBuff.append(rs.getDouble("ADJ_AMT")).append("\t");
retTabSepStrBuff.append(rs.getDouble("TOT_AMT")).append("\n");
System.out.println("INVOICE_ID :::::::: "+rs.getString(1));
writeLog(filePtr,"%%%%%%%%% INVOICE_ID :::."+rs.getString(1),true);
writeLog(filePtr,"%%%%%%%%% CHEQUE_DATE :::."+rs.getString(7),true);
......
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