separate JV for each site made instead of combined JV in first site

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

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

@@ -118,7 +118,6 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 			conn = connDriver.getConnectDB("DriverITM");			
 			connDriver = null;
 			conn.setAutoCommit(false);
-			jourList = new ArrayList();
 			//failMsg = new StringBuffer( "" );
 			SimpleDateFormat sdf=null;
 			
@@ -140,24 +139,25 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 				StringBuffer finalStr = new StringBuffer("");
 				while (st.hasMoreTokens()) 
 				{
-					finalStr = finalStr.append(st.nextToken()).append("'").append(",").append("'");
-				}
-				siteCode = "";
-				siteCode = finalStr.substring(0,finalStr.length()-3);
+					//finalStr = finalStr.append(st.nextToken()).append("'").append(",").append("'"); // 23/03/11 manoharan commented
+					siteCode = st.nextToken(); //""; // 23/03/11 manoharan each token assigned to sitecode
+					siteCode = siteCode.trim(); //finalStr.substring(0,finalStr.length()-3);
 					System.out.println("siteCode is =====>"+siteCode);
-				if( siteCode.indexOf("'") == -1)
+					/*if( siteCode.indexOf("'") == -1)
 					{
 						firstSite = siteCode;
 					}
 					else
 					{
 						firstSite = siteCode.substring(0,siteCode.indexOf("'"));
-				}
+					}*/
 					System.out.println("firstSite is =====>"+firstSite);
-				sql = "SELECT distinct fin_entity from site where site_code = '"+firstSite+"' ";
+					//sql = "SELECT distinct fin_entity from site where site_code = '"+firstSite+"' ";
+					sql = "SELECT fin_entity from site where site_code = ? ";
 					pstmt = conn.prepareStatement( sql );
+					pstmt.setString(1,siteCode);
 					rs = pstmt.executeQuery();
-				while (rs.next())
+					if (rs.next())
 					{
 						finEntity = rs.getString( 1 );
 					}
@@ -165,6 +165,8 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 					pstmt = null;
 					rs.close();
 					rs = null;
+					jourList = null;
+					jourList = new ArrayList();
 
 					sql = "SELECT A.ACCT_CODE, SUM(CASE WHEN A.DR_AMT__BASE IS NULL THEN 0 ELSE A.DR_AMT__BASE END) AMT_DR,"  
 							  +"SUM(CASE WHEN A.CR_AMT__BASE IS NULL THEN 0 ELSE A.CR_AMT__BASE END) AMT_CR "//A.CCTR_CODE, "
@@ -176,7 +178,8 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 							  +"AND C.GROUP_CODE = D.GROUP_CODE "
 							  +"AND D.ACCT_CAT IN ('I','E') "
 							//  +"AND A.SITE_CODE IN ( ? ) "
-							  +"AND A.SITE_CODE IN ('"+siteCode+"') "
+							//  +"AND A.SITE_CODE IN ('"+siteCode+"') "
+							  +"AND A.SITE_CODE = ? "
 							  +"AND A.PRD_CODE >= ? "
 							  +"AND A.PRD_CODE <=  ? "
 							  +"AND A.ACCT_CODE >= ? "
@@ -185,15 +188,15 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 							  +"GROUP BY A.ACCT_CODE "
 							  +"HAVING SUM(CASE WHEN A.DR_AMT__BASE IS NULL THEN 0 ELSE A.DR_AMT__BASE END) <> SUM(CASE WHEN A.CR_AMT__BASE " +"IS NULL THEN 0 ELSE A.CR_AMT__BASE END)";
 					
-				System.out.println("sql ::"+sql);
+					//System.out.println("sql ::"+sql);
 					pstmt = conn.prepareStatement( sql );
 					
-			//	pstmt.setString( 1, siteCode );
-				pstmt.setString( 1, prdCodeFrom );
-				pstmt.setString( 2, prdCodeTo );
-				pstmt.setString( 3, acctCodeFrom );
-				pstmt.setString( 4, acctCodeTo );
-				System.out.println("After setting data");
+					pstmt.setString( 1, siteCode );
+					pstmt.setString( 2, prdCodeFrom );
+					pstmt.setString( 3, prdCodeTo );
+					pstmt.setString( 4, acctCodeFrom );
+					pstmt.setString( 5, acctCodeTo );
+					//System.out.println("After setting data");
 					rs = pstmt.executeQuery();
 					while (rs.next())
 					{
@@ -227,18 +230,21 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 						sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 						Timestamp currDate = new Timestamp(System.currentTimeMillis());
 						currDateTs = sdf.format(currDate).toString();
-					genTranId = generateTranId("W_CLOSINGDTL_PROC", conn);
+						//genTranId = generateTranId("W_CLOSINGDTL_PROC", conn);
+						genTranId = generateTranId("W_CLOSINGDTL_PROC",siteCode, conn);
 						drAmtHdr = Math.abs(drAmtHdr);
 						crAmtHdr = Math.abs(crAmtHdr);
 						effDate   = genericUtility.getColumnValue("eff_date",headerDom );
 						effDateTs = Timestamp.valueOf(genericUtility.getValidDateString(effDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-					errString = insertJournal( jourList, genTranId, drAmtHdr,crAmtHdr, finEntity, firstSite, effDateTs, conn );
+						//errString = insertJournal( jourList, genTranId, drAmtHdr,crAmtHdr, finEntity, firstSite, effDateTs, conn );
+						errString = insertJournal( jourList, genTranId, drAmtHdr,crAmtHdr, finEntity, siteCode, effDateTs, conn );
 					}
 					else
 					{
-					System.out.println("No record found");
-					errString = "VTNORECFND";
+						System.out.println("No record found for site [" + siteCode + "]");
+						//errString = "VTNORECFND";
 					}
+				} 	// while tokan // 23/03/11 manoharan
 			}//end if
 		} // end of try code 
 	   	catch(Exception e)
@@ -432,7 +438,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
         return timestamp;
     }
 	
-	private String generateTranId(String windowName, Connection conn) throws Exception 
+	private String generateTranId(String windowName,String siteCode, Connection conn) throws Exception 
 	{
 			ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 			PreparedStatement pstmt = null;
@@ -490,7 +496,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
 				xmlValues = xmlValues + "<Header></Header>";
 				xmlValues = xmlValues + "<Detail1>";
 				xmlValues = xmlValues +	"<tran_id></tran_id>";
-				xmlValues = xmlValues + "<site_code>"+loginSiteCode.trim()+"</site_code>" ;
+				xmlValues = xmlValues + "<site_code>"+siteCode.trim()+"</site_code>" ;
 				xmlValues = xmlValues + "<tran_date>"+currDateTs+"</tran_date>" ;
 				xmlValues = xmlValues + "</Detail1></Root>";