Auto pay flag based automatic payment of voucher and misc. voucher, pay mode cash to be removed

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

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

@@ -69,7 +69,7 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 		ITMDBAccessEJB itmDBAccessEJB=new ITMDBAccessEJB();
 		
 
-	    String tranType = "",loginUser = "",tranID = "",insertSql = "",remarks = "";
+	    String tranType = "",loginUser = "",tranID = "",insertSql = "",remarks = "",lsRefNo="",chq2Str="",chq1Str="";
 	    String termID = "",currCodeBc = "",exchRateBc = "",filtBankCodeAdd = "",filtBankCodeAddName = "";
 	    String acctCodeBal = "",cctrCodeBal = "",acctCodeBc = "",cctrCodeBc = "",acctCodeCf = "";
 	    String acctCodeCfAp = "",cctrCodeCfAp = "",cctrCodeCf = "",updateSql = "",exchRateHdr = "";
@@ -81,6 +81,7 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 	    String billNo="",currCode="",acctCode="",cctrCode="",siteCode="",finEntity="",sundryType="",bankCode="",userName="",sundryCode="",tranSerM="",
 			  purcOrder="",pCrTerm="",acctCodeDisc="",cctrCodeDisc="",startFrom="";
 	    double exchRate=0.0d,totAmt=0.0d,advAmt=0.0d,holdAmt=0.0d,netPayable=0.0d,adjAmt=0.0d,lcDiscount=0.0d,lcDiscountAmt=0.0d,payAmt=0.0d,totAmount=0.0d;
+	    double chq1=0,chq2=0,llRefNo=0;
 	    E12GenericUtility genericUtility = new E12GenericUtility();
 	    try
 		{
@@ -144,7 +145,7 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 				return errString;
 			}
 			//validation if paymode is not Cash
-			else if(!"C".equalsIgnoreCase(payMode) || !"Y".equalsIgnoreCase(autoPay))
+			else if(/*!"C".equalsIgnoreCase(payMode) ||*/ !"Y".equalsIgnoreCase(autoPay))// commented by Nandkumar Gadkari On 21/06/18
 			{
 				errCode="VTINMODE";
 				errString = itmDBAccessEJB.getErrorString("",errCode, "", "", conn);
@@ -152,6 +153,7 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 				
 			}
 			
+	        
 	        loginUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 	        termID = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
 	        tranType = finCommon.getFinparams("999999","TRAN_TYPE_AUTO_PAY",conn);
@@ -331,6 +333,7 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 		        }
 		        
 			}
+	         
 	        //calculating total amount 
 	        totAmount = totAmt - lcDiscountAmt;
 	        System.out.println("Pay Amt : "+payAmt + "Total Amt : "+totAmt);
@@ -384,7 +387,75 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 			xmlBuff.append("<sundry_type><![CDATA[" + sundryType + "]]></sundry_type>");
 			xmlBuff.append("<sundry_code><![CDATA[" + sundryCode + "]]></sundry_code>");
 			xmlBuff.append("<pay_mode><![CDATA[" + payMode + "]]></pay_mode>");
+			//added by  Nandkumar Gadkari On 21/06/18------Start--------------
+			if("Q".equalsIgnoreCase(payMode) || "D".equalsIgnoreCase(payMode))
+			{	
+				sql = "select chq1,chq2 from bank where bank_code=? and chq1 is not null and chq2 is not null";				             
+		        pstmt = conn.prepareStatement(sql);
+		        pstmt.setString(1, bankCode);
+		        rs = pstmt.executeQuery();
+		        
+		        if(rs.next())
+		        {
+		        	chq1Str=rs.getString("chq1");
+		        	chq2Str=rs.getString("chq2");
+		        }
+		        pstmt.close();
+		        rs.close();
+		        
+		        if ( (chq1Str!= null && chq1Str.trim().length()>0)  &&(chq2Str!= null && chq2Str.trim().length()>0)  )
+			    {
+		        	chq1=Double.parseDouble(chq1Str);
+		        	chq2=Double.parseDouble(chq2Str);
+		        	sql = "select max( to_number(a.ref_no)) from ( select ref_no from banktran_log  where bank_code = ? "
+							+ " and ref_mode = 'Q'  and ref_no is not null and ref_no <> ' ' and (ref_no) = 0 ) a "
+							+ " where  to_number(a.ref_no) >= ?   and to_number (a.ref_no) <= ? ";				             
+			        pstmt = conn.prepareStatement(sql);
+			        pstmt.setString(1, bankCode);
+			        pstmt.setDouble(2, chq1);
+			        pstmt.setDouble(3, chq2);
+			        rs = pstmt.executeQuery();
+			        
+			        if(rs.next())
+			        {
+			            llRefNo=rs.getDouble(1);
+			        }
+			        pstmt.close();
+			        rs.close();
+			       if (llRefNo==0)
+			       {
+			    	   lsRefNo="  ";
+			       }
+			       else 
+			       {
+			    	   if(llRefNo==chq2)
+			    	   {
+			    		   lsRefNo="  ";
+			    	   }
+			    	   else 
+			    	   {
+			    		   lsRefNo=Double.toString(llRefNo +1);
+			    		   if (chq2Str.indexOf(0)==1 )
+			    		   {
+			    			   lsRefNo="000000"+lsRefNo.substring(lsRefNo.length()-6);
+			    		   }
+			    	   }
+			    	 
+			    	   
+			       }
+			       
+			    }
+		        else
+		        {
+		        	 lsRefNo="  ";
+		        }
+		        xmlBuff.append("<ref_no><![CDATA[" + llRefNo + "]]></ref_no>");
+			}
+			//added by  Nandkumar Gadkari On 21/06/18------end--------------
+			if(refDate!=null)// condition added by  Nandkumar Gadkari On 21/06/18
+			{
 			xmlBuff.append("<ref_date><![CDATA[" +  sdf.format(refDate) + "]]></ref_date>");
+			}
 			xmlBuff.append("<net_amt><![CDATA[" + totAmount + "]]></net_amt>");
 			xmlBuff.append("<net_amt__bc><![CDATA[" + totAmount + "]]></net_amt__bc>");
 			xmlBuff.append("<site_code><![CDATA[" + siteCode + "]]></site_code>");
@@ -415,7 +486,10 @@ public class VouchPayAct extends ActionHandlerEJB implements VouchPayActLocal, V
 			}
 			xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
 			xmlBuff.append("<tran_ser><![CDATA[" + tranSerM+ "]]></tran_ser>");
+			if(refDate!=null)// condition added by  Nandkumar Gadkari On 21/06/18 
+			{
 			xmlBuff.append("<vouch_date><![CDATA[" + sdf.format(refDate) + "]]></vouch_date>");
+			}
 			xmlBuff.append("<vouch_no><![CDATA[" + refNo + "]]></vouch_no>");
 			xmlBuff.append("<net_amt><![CDATA[" + totAmount + "]]></net_amt>");
 			xmlBuff.append("<pay_amt><![CDATA[" + totAmount + "]]></pay_amt>");