updated changes for validations on submit button - F14FSUN003

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

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

@@ -47,7 +47,7 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 		java.sql.Timestamp datesubmit=null;
 		//added by vishakha on 03/Aug/2015 for validations on Submit button.
 		double totAmt = 0.0,totAmtMiscPay = 0.0,adjAmtMiscPay = 0.0,payAmt = 0.0;
-		boolean isError = true;
+	
 	//	String ignorechklimit ="",tranKeyFld = "",bankCode = "",siteCode = "",payType = "";
 		Timestamp tranDate = null;
 		String refNo = "",tranSer = "";
@@ -120,10 +120,6 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 					retString = itmDBAccessLocal.getErrorString("","VTAMTMIS1","");
 					return retString;
 				}
-				else
-				{
-					isError = false;
-				}
 			
 				sql1 = "select TRAN_SER,vouch_no,pay_amt from misc_paydet where tran_id = ?";
 				pstmt1 = conn.prepareStatement(sql1);
@@ -136,7 +132,7 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 				    refNo = checkNull(rs1.getString("vouch_no"));
 				    payAmt = rs1.getDouble("pay_amt");
 					
-					sql = "SELECT tot_amt as tot_amt, adj_amt as adj_amt , sundry_type as sundrytype from misc_payables where tran_ser = ?  and ref_no = ?  for update nowait";
+					sql = "SELECT tot_amt as tot_amt, adj_amt as adj_amt , sundry_type as sundrytype from misc_payables where tran_ser = ?  and ref_no = ?  ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,tranSer);
 					pstmt.setString(2,refNo);
@@ -146,17 +142,16 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 					{
 					totAmtMiscPay = rs.getDouble("tot_amt");
 					adjAmtMiscPay = rs.getDouble("adj_amt");
+					
 					System.out.println("totAmtMiscPay ========="+ totAmtMiscPay);
 					System.out.println("adjAmtMiscPay ========="+ adjAmtMiscPay);
-					System.out.println("Pay Amount ============ "+ totAmt);
-					if(Math.abs(totAmtMiscPay - adjAmtMiscPay) < payAmt)//if there is no balance in misc_payables
+					System.out.println("Pay Amount ============ "+ payAmt);
+					if(Math.abs(totAmtMiscPay - adjAmtMiscPay) < Math.abs(payAmt))//if there is no balance in misc_payables
 					{
+						System.out.println("Entering the if condition Pay Amount ============ "+ payAmt);
 						retString = itmDBAccessLocal.getErrorString("","VTBAL1","");
 						return retString;
 					}
-					else{
-						isError = false;
-					}
 					
 					}
 					pstmt.close();
@@ -170,8 +165,6 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 				rs1.close();
 				rs1 = null;
 						//SQL for update the work flow status/..........
-					if(isError == false)
-					{
 						sql = "UPDATE MISC_PAYMENT SET WF_STATUS='S',emp_code__submit=?,submit_date=? WHERE tran_id = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,userId);
@@ -188,7 +181,7 @@ public class MiscPaySubAct extends ActionHandlerEJB implements MiscPaySubActLoca
 							conn.commit();
 							//return retString;
 						}
-					}
+					
 				}