Skip to content

B
business-java
Commit fe713f24 authored by psali's avatar psali
Browse files
Options

coin difference issue due to taxtran multiple posting for multiple lines in detail 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104972 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f109876c
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 32 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java
View file @ fe713f24
......@@ -76,8 +76,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
if(conn == null){
connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
conn = connDriver.getConnectDB("DriverITM");
//conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
connDriver = null;
conn.setAutoCommit(false);
......@@ -223,7 +223,7 @@ conn = getConnection();
String lineNoReco="",acctCodeReco="",cctrCodeReco="",siteCodeFor ="";
double totTaxAmt=0,totRecoAmt=0,amt=0,recoAmt=0,netWr=0,rndAmtTot=0;
double totAmtPayables=0,adjAmtPayables=0,holdAmtPayables=0;
int lineInt =0;
int lineInt =0,cnt = 0,lineNoDet = 0;
SimpleDateFormat sdf = null;
try
{
......@@ -670,19 +670,54 @@ conn = getConnection();
pstmtInner.close();
pstmtInner = null;
}
if (cctrCodeTax == null) cctrCodeTax = "";
if (cctrCodeTax == null) cctrCodeTax = " ";
for (int ctr =0; ctr < miscdetList.size(); ctr++)
//for (int ctr =0; ctr < miscdetList.size(); ctr++)
// {
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
System.out.println("line no ::"+lineNo);
System.out.println("lineNoTax ::"+lineNoTax);
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeTax);
pstmtInner.setString(3,cctrCodeTax);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
miscdetListMap = new HashMap();
miscdetListMap = (HashMap) miscdetList.get(ctr);
cnt = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
//lineNo = (String) miscdetListMap.get("line_no");
acctCode = (String) miscdetListMap.get("acct_code");
cctrCode =(String) miscdetListMap.get("cctr_code");
amount = Double.parseDouble(miscdetListMap.get("amount").toString());
amtTax = amount+amt;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeTax);
pstmtInner.setString(3,cctrCodeTax);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
}
System.out.println("acctCodeTax is equals to ::"+acctCodeTax);
System.out.println("acctCode is equals to ::"+acctCode);
......@@ -690,7 +725,7 @@ conn = getConnection();
System.out.println("cctrCodeTax is equals to ::"+cctrCode);
System.out.println("lineInt is equals to ::"+lineInt);
if(!((acctCodeTax.equalsIgnoreCase(acctCode)) &&(cctrCodeTax.equalsIgnoreCase(cctrCode))))
if(cnt == 0 )
{
lineInt = lineInt +1;
System.out.println(" SQL for insert :: "+sql);
......@@ -709,19 +744,21 @@ conn = getConnection();
}
else
{
sqlInner =" update misc_vouchdet set amount = ? where tran_id = ? and line_no = ? ";
sqlInner =" update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
//pstmtInner.setDouble(1,amtTax);
pstmtInner.setDouble(1,amount);
pstmtInner.setDouble(1,amt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,lineNo);
pstmtInner.setString(3,acctCodeTax);
pstmtInner.setString(4,cctrCodeTax);
pstmtInner.setInt(5,lineNoDet);
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amtTax = 0;
} // for
// } // for
} // while
rs.close();
rs = null;
......@@ -768,18 +805,55 @@ conn = getConnection();
{
cctrCodeReco = "";
}
for (int ctr =0; ctr< miscdetList.size(); ctr++)
//for (int ctr =0; ctr< miscdetList.size(); ctr++)
//{
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
// amt = amount+recoAmt;
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeReco);
pstmtInner.setString(3,cctrCodeReco);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
miscdetListMap = new HashMap();
miscdetListMap = (HashMap) miscdetList.get(ctr);
cnt = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
lineNo = (String) miscdetListMap.get("line_no");
acctCode = (String) miscdetListMap.get("acct_code");
cctrCode =(String) miscdetListMap.get("cctr_code");
amount = Double.parseDouble(miscdetListMap.get("amount").toString());
amt = amount+recoAmt;
if(!(acctCodeReco.equalsIgnoreCase(acctCode)) &&(cctrCodeReco.equalsIgnoreCase(cctrCode)))
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeReco);
pstmtInner.setString(3,cctrCodeReco);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
}
if(cnt > 0)
{
lineNo = lineNo +1;
......@@ -795,18 +869,20 @@ conn = getConnection();
}
else
{
sqlInner = "update misc_vouchdet set amount = ? where tran_id = ? and line_no = ? ";
sqlInner = "update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setDouble(1,amt);
pstmtInner.setDouble(1,recoAmt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,lineNo);
pstmtInner.setString(3,acctCodeReco);
pstmtInner.setString(4,cctrCodeReco);
pstmtInner.setInt(3,lineNoDet);
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amt = 0;
}
//}
}//while
rs.close();
rs = null;
......
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