Changes if vendorNo found blank select it from table voucher.

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

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

@@ -48,9 +48,9 @@ public class MatchVoucherConfSch implements Schedule
 		Connection conn = null;
 		conn = connDriver.getConnectDB("DriverITM");
 		connDriver = null;
-		PreparedStatement pstmt1 = null,pstmt2=null,pstmt3=null;
-		ResultSet rs1 = null,rs2=null,rs3=null;
-		String sql="",sql1="",sql2="",sql3="";
+		PreparedStatement pstmt1 = null,pstmt2=null,pstmt3=null,pstmt4=null,pstmt5=null;
+		ResultSet rs1 = null,rs2=null,rs3=null,rs4=null,rs5=null;
+		String sql="",sql1="",sql2="",sql3="",sql4="",sql5="";
 		String tranId="",loginSiteCode="";
 		ibase.utility.UserInfoBean userInfo = null;
 		String sysDate ="";
@@ -95,7 +95,9 @@ public class MatchVoucherConfSch implements Schedule
 			System.out.println("childNodeListLength  !!!!!"+childNodeListLength);
 			
 			//Select porder_no from 'SUPPLIER_BILL'
-			sql1 = "select TRAN_ID as supplier_bill_id,PORDER_NO,BILL_NO,BILL_AMT,BILL_DATE,VOUCHER_NO from SUPPLIER_BILL where MATCH_STATUS='1'";  
+//			sql1 = "select TRAN_ID as supplier_bill_id,PORDER_NO,BILL_NO,BILL_AMT,BILL_DATE,VOUCHER_NO from SUPPLIER_BILL where MATCH_STATUS='1'";  
+			sql1 = "select TRAN_ID as supplier_bill_id,PORDER_NO,BILL_NO,BILL_AMT,BILL_DATE,VOUCHER_NO"
+					+ " from SUPPLIER_BILL where (CASE WHEN MATCH_STATUS IS NULL THEN '1' ELSE MATCH_STATUS END) ='1'";// VALLABH KADAM check for NULL also 25/MAY/15  
 			pstmt1 = conn.prepareStatement(sql1);			
 			rs1 = pstmt1.executeQuery();
 			while (rs1.next())
@@ -107,6 +109,37 @@ public class MatchVoucherConfSch implements Schedule
 				bllDate=rs1.getDate("BILL_DATE");
 				billAmt=rs1.getString("BILL_AMT");
 				voucherNo=rs1.getString("VOUCHER_NO");
+				/**
+				 * If voucherNo is NULL
+				 * select from table 'VOUCHER'
+				 * for porderNo,billNo
+				 * and update it in table 'SUPPLIER_BILL'
+				 * 25/MAY/15  
+				 * */
+				if(voucherNo==null || voucherNo.trim().length()<=0){	
+					sql4 ="select TRAN_ID from voucher where BILL_NO=? AND PURC_ORDER=?";  
+					pstmt4 = conn.prepareStatement(sql4);
+					pstmt4.setString(1,billNo);							
+					pstmt4.setString(2,porderNo);		
+					rs4 = pstmt4.executeQuery();
+					while (rs4.next())
+						{
+						voucherNo=rs4.getString("TRAN_ID");						
+						}
+					rs4.close();
+					rs4=null;
+					pstmt4.close();
+					pstmt4=null;
+					
+					/**UPDATE voucherNo in table 'SUPPLIER_BILL'*/
+					sql5 = "UPDATE SUPPLIER_BILL set VOUCHER_NO=? WHERE TRAN_ID=?";
+					pstmt5 = conn.prepareStatement(sql5);
+					pstmt5.setString(1,voucherNo.trim());
+					pstmt5.setString(2,suppBillId.trim());		
+					pstmt5.executeUpdate();
+					pstmt5.close();
+					pstmt5 = null;
+				}
 				
 //				sql2 = "select A.tran_id,A.tran_id__rcp from VOUCHER A,VOUCHRCP B where A.TRAN_ID=B.TRAN_ID AND B.PURC_ORDER=? and A.confirmed='N' ";  //check from vouchrcp
 				sql2 = "select A.tran_id,A.tran_id__rcp from VOUCHER A,VOUCHRCP B where A.TRAN_ID=B.TRAN_ID AND B.PURC_ORDER=? AND A.tran_id=? and A.confirmed='N' ";  //check from vouchrcp