Commit 97e301c9 authored by manohar's avatar manohar

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
parent af89ba69
...@@ -118,7 +118,6 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -118,7 +118,6 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
jourList = new ArrayList();
//failMsg = new StringBuffer( "" ); //failMsg = new StringBuffer( "" );
SimpleDateFormat sdf=null; SimpleDateFormat sdf=null;
...@@ -140,33 +139,36 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -140,33 +139,36 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
StringBuffer finalStr = new StringBuffer(""); StringBuffer finalStr = new StringBuffer("");
while (st.hasMoreTokens()) while (st.hasMoreTokens())
{ {
finalStr = finalStr.append(st.nextToken()).append("'").append(",").append("'"); //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 = siteCode.trim(); //finalStr.substring(0,finalStr.length()-3);
siteCode = finalStr.substring(0,finalStr.length()-3); System.out.println("siteCode is =====>"+siteCode);
System.out.println("siteCode is =====>"+siteCode); /*if( siteCode.indexOf("'") == -1)
if( siteCode.indexOf("'") == -1) {
{ firstSite = siteCode;
firstSite = siteCode; }
} else
else {
{ firstSite = siteCode.substring(0,siteCode.indexOf("'"));
firstSite = siteCode.substring(0,siteCode.indexOf("'")); }*/
} System.out.println("firstSite is =====>"+firstSite);
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 = conn.prepareStatement( sql );
rs = pstmt.executeQuery(); pstmt.setString(1,siteCode);
while (rs.next()) rs = pstmt.executeQuery();
{ if (rs.next())
finEntity = rs.getString( 1 ); {
} finEntity = rs.getString( 1 );
pstmt.close(); }
pstmt = null; pstmt.close();
rs.close(); pstmt = null;
rs = null; rs.close();
rs = null;
sql = "SELECT A.ACCT_CODE, SUM(CASE WHEN A.DR_AMT__BASE IS NULL THEN 0 ELSE A.DR_AMT__BASE END) AMT_DR," 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, " +"SUM(CASE WHEN A.CR_AMT__BASE IS NULL THEN 0 ELSE A.CR_AMT__BASE END) AMT_CR "//A.CCTR_CODE, "
// +" A.FIN_ENTITY " // +" A.FIN_ENTITY "
+" FROM ACCTBAL A, " +" FROM ACCTBAL A, "
...@@ -176,7 +178,8 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -176,7 +178,8 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
+"AND C.GROUP_CODE = D.GROUP_CODE " +"AND C.GROUP_CODE = D.GROUP_CODE "
+"AND D.ACCT_CAT IN ('I','E') " +"AND D.ACCT_CAT IN ('I','E') "
// +"AND A.SITE_CODE IN ( ? ) " // +"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.PRD_CODE <= ? " +"AND A.PRD_CODE <= ? "
+"AND A.ACCT_CODE >= ? " +"AND A.ACCT_CODE >= ? "
...@@ -184,61 +187,64 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -184,61 +187,64 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
// +"GROUP BY A.PRD_CODE, A.ACCT_CODE, A.CCTR_CODE, A.FIN_ENTITY " // +"GROUP BY A.PRD_CODE, A.ACCT_CODE, A.CCTR_CODE, A.FIN_ENTITY "
+"GROUP BY A.ACCT_CODE " +"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)"; +"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);
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");
rs = pstmt.executeQuery();
while (rs.next())
{
dtlItems = new JournalDetBean();
dtlItems.acct_code = rs.getString(1); //System.out.println("sql ::"+sql);
// dtlItems.cctr_code = rs.getString(4); pstmt = conn.prepareStatement( sql );
double amtDr = Double.parseDouble(rs.getString(2));
double amtCr = Double.parseDouble(rs.getString(3));
// finEntity = rs.getString(5);
if (amtDr >= amtCr) 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())
{ {
dtlItems.drcrFlag = "C"; dtlItems = new JournalDetBean();
dtlItems.amount = amtDr - amtCr;
crAmtHdr = crAmtHdr + dtlItems.amount; dtlItems.acct_code = rs.getString(1);
// dtlItems.cctr_code = rs.getString(4);
double amtDr = Double.parseDouble(rs.getString(2));
double amtCr = Double.parseDouble(rs.getString(3));
// finEntity = rs.getString(5);
if (amtDr >= amtCr)
{
dtlItems.drcrFlag = "C";
dtlItems.amount = amtDr - amtCr;
crAmtHdr = crAmtHdr + dtlItems.amount;
}
else
{
dtlItems.drcrFlag = "D";
dtlItems.amount = amtCr - amtDr;
drAmtHdr = drAmtHdr + dtlItems.amount;
}
jourList.add( dtlItems );
}
pstmt.close();
pstmt = null;
System.out.println("Out of while loop");
if( jourList.size() > 0 )
{
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",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, siteCode, effDateTs, conn );
} }
else else
{ {
dtlItems.drcrFlag = "D"; System.out.println("No record found for site [" + siteCode + "]");
dtlItems.amount = amtCr - amtDr; //errString = "VTNORECFND";
drAmtHdr = drAmtHdr + dtlItems.amount;
} }
jourList.add( dtlItems ); } // while tokan // 23/03/11 manoharan
}
pstmt.close();
pstmt = null;
System.out.println("Out of while loop");
if( jourList.size() > 0 )
{
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
Timestamp currDate = new Timestamp(System.currentTimeMillis());
currDateTs = sdf.format(currDate).toString();
genTranId = generateTranId("W_CLOSINGDTL_PROC", 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 );
}
else
{
System.out.println("No record found");
errString = "VTNORECFND";
}
}//end if }//end if
} // end of try code } // end of try code
catch(Exception e) catch(Exception e)
...@@ -432,7 +438,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -432,7 +438,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
return timestamp; 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(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -490,7 +496,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi ...@@ -490,7 +496,7 @@ public class JvYearEndClosingDtlPrc extends ProcessEJB implements JvYearEndClosi
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>"; xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>"; 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 + "<tran_date>"+currDateTs+"</tran_date>" ;
xmlValues = xmlValues + "</Detail1></Root>"; xmlValues = xmlValues + "</Detail1></Root>";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment