after change the gp query

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91661 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvAct.java

@@ -190,10 +190,12 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 		
 		try
 		{
+			System.out.println("<---- IN RECEIPTADVACT IN TRY ----->");
 			//detCnt = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"detCnt"); //Will be Uncommented later - Jiten
 			
 			if (detCnt.equals("0"))
 			{
+				System.out.println("<-----IN RECEIPTADVACT IN TRY detCnt equal 0----->");
 				conn = connDriver.getConnectDB("DriverITM");
 				siteCode = genericUtility.getColumnValue("site_code",dom);
 				custCode = genericUtility.getColumnValue("cust_code",dom);
@@ -250,7 +252,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 				String acctCode = "";
 				String descrCurr = "";
 				String descrAccnt = "";
-				//Aviprash Start 26/10/05
+				//aviprash Start 26/10/05
 				java.sql.Date refDate = null;
 				java.sql.Date dueDate = null;
 				String refDate1 = "";
@@ -408,6 +410,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 	    //Added by nisar on 04/01/08 for RID : SY6BAS0059
 		String siteCode = null;
 		String custCode = null;
+		String custCodeS = null;
 		String detCnt = null;
 		String tranSer = null;
 		String sql = null;
@@ -501,21 +504,34 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 			WHERE cu.group_code in ( select group_code from customer where cust_code = 'AD0108') 	
 		AND r.site_code = 'SA117'	AND r.tran_ser = 'R-IBCA' 	AND ( r.TOT_AMT- r.ADJ_AMT <> 0 )
 */
-			sql= "SELECT r.ref_no, r.tran_ser, d.gp_no, r.due_date,r.tot_amt,"   
-				+"	r.adj_amt, ((r.tot_amt) - (r.adj_amt)) Balance, fn_remark(ref_no, tran_ser) remark, "  
-				+"	r.tran_date, r.ref_no, r.ref_date, r.curr_code, "
-				+"	c.descr as curr_descr, r.exch_rate, r.acct_code, a.descr as acct_descr, "
-				+"	r.cctr_code, r.discount, r.tax_amt, r.bad_debt_amt "
-				+"	FROM ((((invoice i "
-				+"	left outer join despatch d on i.desp_id = d.desp_id) "
-				+"	right outer join receivables r on r.ref_no = i.invoice_id ) "
-				+"	inner join customer cu on r.cust_code = cu.cust_code) "
-				+"	inner join currency c on r.curr_code = c.curr_code) "
-				+"	inner join accounts a on r.acct_code = a.acct_code "
-				+"	WHERE cu.group_code in ( select group_code from customer where cust_code = '"+custCode+"') "
-				+"	AND r.site_code = '"+siteCode+"'"
-				+"	AND r.tran_ser = '"+tranSer+"' "
-				+"	AND ( r.TOT_AMT- r.ADJ_AMT <> 0 ) ";
+			// NEW SQL FOR GPLIST
+			sql= "SELECT r.cust_code custcode,r.ref_no ref_no,r.tran_ser, d.gp_no dsp_gpno, r.due_date due_date," +
+					"r.tot_amt,    r.adj_amt,((r.tot_amt) - (r.adj_amt)) Balance,fn_remark(ref_no, tran_ser) remark," +
+					"r.tran_date, r.ref_no, r.ref_date,r.curr_code,  c.descr as curr_descr, r.exch_rate, r.acct_code, " +
+					"a.descr as acct_descr,r.cctr_code, r.discount, r.tax_amt, r.bad_debt_amt  FROM " +
+					"((((invoice i left outer join despatch d on i.desp_id = d.desp_id) left outer join" +
+					" receivables r on r.ref_no = i.invoice_id ) inner join customer cu on r.cust_code = cu.cust_code)   " +
+					"inner join currency c on r.curr_code = c.curr_code) inner join accounts a on r.acct_code = a.acct_code   " +
+					"WHERE cu.group_code in ( select group_code from customer where cust_code = '"+custCode+"')" +
+					" AND r.site_code = '"+siteCode+"' AND r.tran_ser = '"+tranSer+"'  AND ( r.TOT_AMT- r.ADJ_AMT <> 0 ) " +
+					"order by r.cust_code,r.ref_no,dsp_gpno,due_date asc";
+			
+			// COMMITED BY AKHILESH AAD NEW SQL ABOVE THIS QUERY
+			/*SQL= "SELECT R.CUST_CODE CUSTCODE,R.REF_NO, R.TRAN_SER, D.GP_NO DSP_GPNO, R.DUE_DATE DUE_DATE,R.TOT_AMT,"   
+				+"	R.ADJ_AMT, ((R.TOT_AMT) - (R.ADJ_AMT)) BALANCE, FN_REMARK(REF_NO, TRAN_SER) REMARK, "  
+				+"	R.TRAN_DATE, R.REF_NO, R.REF_DATE, R.CURR_CODE, "
+				+"	C.DESCR AS CURR_DESCR, R.EXCH_RATE, R.ACCT_CODE, A.DESCR AS ACCT_DESCR, "
+				+"	R.CCTR_CODE, R.DISCOUNT, R.TAX_AMT, R.BAD_DEBT_AMT "
+				+"	FROM ((((INVOICE I "
+				+"	LEFT OUTER JOIN DESPATCH D ON I.DESP_ID = D.DESP_ID) "
+				+"	RIGHT OUTER JOIN RECEIVABLES R ON R.REF_NO = I.INVOICE_ID ) "
+				+"	INNER JOIN CUSTOMER CU ON R.CUST_CODE = CU.CUST_CODE) "
+				+"	INNER JOIN CURRENCY C ON R.CURR_CODE = C.CURR_CODE) "
+				+"	INNER JOIN ACCOUNTS A ON R.ACCT_CODE = A.ACCT_CODE "
+				+"	WHERE CU.GROUP_CODE IN ( SELECT GROUP_CODE FROM CUSTOMER WHERE CUST_CODE = '"+CUSTCODE+"') "
+				+"	AND R.SITE_CODE = '"+SITECODE+"'"
+				+"	AND R.TRAN_SER = '"+TRANSER+"' "
+				+"	AND ( R.TOT_AMT- R.ADJ_AMT <> 0 ) ORDER BY R.CUST_CODE,R.REF_NO,DSP_GPNO,DUE_DATE ASC ";*/
 				
 
 			System.out.println("[ReceiptAdvActEJB] sql==>"+sql);
@@ -525,7 +541,8 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 
 			while(rs.next())
 			{
-				gpNo = rs.getString("gp_no");
+				custCodeS = rs.getString("custcode");
+				gpNo = rs.getString("dsp_gpno");
 				dueDate = rs.getTimestamp("due_date");
 				refDate = rs.getTimestamp("ref_date");
 				totAmt = rs.getDouble("tot_amt");
@@ -537,7 +554,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
 				rcptAmt = totAmt - adjAmt;
 			
 				valueXmlString.append("<Detail>\r\n");
-				valueXmlString.append("<cust_code>").append("<![CDATA[").append(custCode).append("]]>").append("</cust_code>\r\n");
+				valueXmlString.append("<cust_code>").append("<![CDATA[").append(custCodeS).append("]]>").append("</cust_code>\r\n");
 				valueXmlString.append("<ref_no>").append("<![CDATA[").append(rs.getString("ref_no").trim()).append("]]>").append("</ref_no>\r\n");//Added srvCallOnChng by jiten 04/10/06
 				valueXmlString.append("<dsp_gpno>").append("<![CDATA[").append(gpNo==null?" ":gpNo.trim()).append("]]>").append("</dsp_gpno>\r\n");
 				valueXmlString.append("<due_date>").append("<![CDATA[").append(sdf.format(dueDate)).append("]]>").append("</due_date>\r\n");

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvActLocal.java

@@ -8,7 +8,6 @@ import ibase.webitm.ejb.ActionHandlerLocal;
 import javax.ejb.Local; // added for ejb3
 
 @Local // added for ejb3
-
 public interface ReceiptAdvActLocal extends ActionHandlerLocal//,EJBObject 
 {
 	public String actionHandler() throws RemoteException,ITMException;

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvActRemote.java

@@ -8,7 +8,6 @@ import ibase.webitm.ejb.ActionHandlerRemote;
 import javax.ejb.Remote; // added for ejb3
 
 @Remote // added for ejb3
-
 public interface ReceiptAdvActRemote extends ActionHandlerRemote//,EJBObject 
 {
 	public String actionHandler() throws RemoteException,ITMException;