Existing budget account generated check is for budget id and budget group code...

Existing budget account generated check is for budget id and budget group code in where condition. previously it was for composite primary key and budget group code. Also, count query is now outside of while loop.


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

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

@@ -119,6 +119,57 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 				 this.closeResources(pstmt, rs);
 				 sql = null;
 				 
+				/*
+				 *    Code to check budget account already generated for given budget group code, budget_id,
+				 *    fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code
+				 */
+				
+				int cntExist = 0;
+				
+				 sql =" select count(*) from acctbudget "+ 
+						 "where bud_group_code = ? "+
+						 "and budget_id = ? ";
+						 /*"and fin_entity = ? "+
+				 		 "and acct_code = ? "+
+				 		 "and cctr_code = ? "+
+				 		 "and anal_code = ? "+
+				 		 "and from_date= ? "+
+				 		 "and dept_code = ? ";*/
+				 
+				 pstmt = conn.prepareStatement(sql);
+				 pstmt.setString(1,budgetGrpCode);
+				 pstmt.setString(2,budgetId);
+				 /*pstmt.setString(3,finEntity);
+					 pstmt.setString(4,acctCode);
+					 pstmt.setString(5,cctrCode);
+					 pstmt.setString(6,analCode);
+					 pstmt.setDate(7,(java.sql.Date)fromDate);
+					 pstmt.setString(8,deptCode);
+				 */
+				 rs = pstmt.executeQuery();
+				 
+				 if(rs.next())
+				 {
+					 cntExist = rs.getInt(1);
+				 }
+				 System.out.println("\n cntExist acct budget : "+cntExist);
+				 
+				 this.closeResources(pstmt, rs);
+				 sql = null;
+				 
+				 if(cntExist>0){
+					 
+					 // Error : Account already generated for selected budget group code, budget_id,
+					 
+					 System.out.println("\n  Error : Account already generated for selected budget group code, budget_id, ");
+							 
+					 errString = itmDBAccessEJB.getErrorString("","VTBUACEXST",chgUser);
+					 return errString;
+					 
+				 }
+				
+				//---------------------------------------------------------------------------				 
+				 
 				 // Getting site code against loginSiteCode from XTRA PARAMS
 				 
 				 sql = "select site_code__budget from site where site_code = ?";
@@ -244,8 +295,6 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 						 
 						 conn.setAutoCommit(false);
 						 
-						 int cntExist = 0;
-						 
 						 while(rsData.next()){
 						 
 							deptCode = rsData.getString(1);
@@ -284,58 +333,6 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 							
 							this.closeResources(psStmtCCode, rsCCode);
 
-							/*
-							 *    Code to check budget account already generated for given budget group code, budget_id,
-							 *    fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code
-							 */
-							
-							this.closeResources(pstmt, rs);
-							
-							 sql =" select count(*) from acctbudget "+ 
-									 "where bud_group_code = ? "+
-									 "and budget_id = ? "+
-									 "and fin_entity = ? "+
-							 		 "and acct_code = ? "+
-							 		 "and cctr_code = ? "+
-							 		 "and anal_code = ? "+
-							 		 "and from_date= ? "+
-							 		 "and dept_code = ? ";
-							 
-							 pstmt = conn.prepareStatement(sql);
-							 pstmt.setString(1,budgetGrpCode);
-							 pstmt.setString(2,budgetId);
-							 pstmt.setString(3,finEntity);
-							 pstmt.setString(4,acctCode);
-							 pstmt.setString(5,cctrCode);
-							 pstmt.setString(6,analCode);
-							 pstmt.setDate(7,(java.sql.Date)fromDate);
-							 pstmt.setString(8,deptCode);
-
-							 rs = pstmt.executeQuery();
-							 
-							 if(rs.next())
-							 {
-								 cntExist = rs.getInt(1);
-							 }
-							 System.out.println("\n cntExist acct budget : "+cntExist);
-							 
-							 this.closeResources(pstmt, rs);
-							 sql = null;
-							 
-							 if(cntExist>0){
-								 
-								 // Error : Account already generated for selected budget group code, budget_id,
-								 //         fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code
-								 
-								 System.out.println("\n  Error : Account already generated for selected budget group code, budget_id, "+
-								         "fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code");
-										 
-								 errString = itmDBAccessEJB.getErrorString("","VTBUACEXST",chgUser);
-								 return errString;
-								 
-							 }
-							
-							//---------------------------------------------------------------------------
 							final_budget_amt = (budgetAmt * allocPerc)/100;
 							
 							System.out.println("\n final_budget_amt = (budgetAmt * allocPerc)/100");