changes done for Purchase Voucher Scheduler Generation

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

webitm-fin/ibase/webitm/ejb/fin/PorcpVouchCreateSch.java

@@ -48,6 +48,7 @@ public class PorcpVouchCreateSch implements Schedule
 	String strToWrite = "";
 	String endDateStr = null;
 	String startDateStr = null;
+	String tranIdVoucher = "";
 	@Override
 	public String schedule(String scheduleParamXML)throws Exception
 	{
@@ -107,12 +108,12 @@ public class PorcpVouchCreateSch implements Schedule
 				Timestamp sysDate = java.sql.Timestamp.valueOf( sdfdb.format(currentDate)+" 00:00:00.0");
 				System.out.println(">>>>sysDate is:"+sysDate);
 				
-			queryString="SELECT tran_id FROM PORCP A WHERE TRAN_DATE >= ?  AND confirmed='Y' AND " 
-                        +"A.SUPP_CODE NOT IN(SELECT SUPP_CODE FROM SITE_SUPPLIER B WHERE CHANNEL_PARTNER='Y' "
-						+"AND A.SITE_CODE=B.SITE_CODE UNION ALL "
-						+"SELECT SUPP_CODE FROM SUPPLIER C WHERE A.SITE_CODE=C.SITE_CODE AND "
-						+"CHANNEL_PARTNER='Y') AND vouch_created<>'Y' "
-						+"AND NVL(ret_opt,'X')<>'R'   ORDER BY SITE_CODE ";
+			queryString="SELECT tran_id FROM PORCP A WHERE TRAN_DATE >= ?  AND confirmed='Y' AND "
+            +" A.SUPP_CODE NOT IN(SELECT SUPP_CODE FROM SITE_SUPPLIER B WHERE CHANNEL_PARTNER='Y' "
+	        +"	AND A.SITE_CODE=B.SITE_CODE UNION ALL "
+	        +" SELECT SUPP_CODE FROM SUPPLIER C WHERE A.SITE_CODE=C.SITE_CODE AND "
+		    +" CHANNEL_PARTNER='Y') AND case when  A.vouch_created is null then 'N' else A.vouch_created end <>'Y' " 
+		    +" AND case when A.ret_opt is null then 'X' else A.ret_opt end <>'R'  AND  case when A.RECIEPT_TYPE is null then 'F' else A.RECIEPT_TYPE end  <> 'R'   ORDER BY SITE_CODE ";
 	        pstmt=conn.prepareStatement(queryString);
 	    	pstmt.setTimestamp(1,tranDateFromNew);
 	    	//pstmt.setTimestamp(2,sysDate);
@@ -229,11 +230,13 @@ public class PorcpVouchCreateSch implements Schedule
 				retString = createVouc.createPoRcpVoucher(tranidRcp,xtraParams, conn);
 				fos1.write(("Status is::  [" + retString +"]\r\n").getBytes());
 				System.out.println("retString----"+retString);
-				
+				tranIdVoucher=retString.substring( retString.indexOf("<TranID>")+8, retString.indexOf("</TranID>"));
+				System.out.println("tranIdVoucher is :"+tranIdVoucher);
+			
 				/***********STR***********/
 			    sql1 = "select tran_id from vouchrcp where prcp_id = ? ";
 					pstmt1 = conn.prepareStatement(sql1);
-					pstmt1.setString(1,tranidRcp);
+					pstmt1.setString(1,tranIdVoucher);
 					rs1 = pstmt1.executeQuery();
 					if ( rs1.next() )
 					{