Commit 6b165a78 authored by msalla's avatar msalla

bank receipt - Posting GL of taxtran to be inserted in rcpacct so that receipt...

bank receipt - Posting GL of taxtran to be inserted in rcpacct so that receipt dishonour will match else will give coin difference

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201362 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5eecd033
...@@ -2168,8 +2168,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2168,8 +2168,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
catch(BatchUpdateException buex) catch(BatchUpdateException buex)
{ {
isError = true; isError = true;
retString = "ERROR"; //CHANGES --by-monika-30-maY-2019
errString= "ERROR";
//commented by-monika-30-maY-2019
/*retString = "ERROR";
int [] updateCounts = buex.getUpdateCounts(); int [] updateCounts = buex.getUpdateCounts();
//changes made by-MONIKA-30-may-2019
for (int j = 0; j < updateCounts.length; j++) for (int j = 0; j < updateCounts.length; j++)
{ {
System.err.println(" Statement " + j + ":" + updateCounts[j]); System.err.println(" Statement " + j + ":" + updateCounts[j]);
...@@ -2186,6 +2194,35 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2186,6 +2194,35 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.err.println(" Error code: " + ex.getErrorCode()); System.err.println(" Error code: " + ex.getErrorCode());
ex = ex.getNextException(); ex = ex.getNextException();
} }
*/
//CHANGES --by-monika-30-maY-2019
try
{
conn.rollback();
int [] updateCounts = buex.getUpdateCounts();
for ( i = 0; i < updateCounts.length; i++)
{
System.err.println(" Statement " + i + ":" + updateCounts[i]);
}
System.err.println(" Message: " + buex.getMessage());
System.err.println(" SQLSTATE: " + buex.getSQLState());
System.err.println(" Error code: " + buex.getErrorCode());
SQLException ex = buex.getNextException();
while (ex != null)
{
System.err.println("SQL exception:");
System.err.println(" Message: " + ex.getMessage());
System.err.println(" SQLSTATE: " + ex.getSQLState());
System.err.println(" Error code: " + ex.getErrorCode());
ex = ex.getNextException();
}
}
catch ( Exception e)
{
e.printStackTrace();
}
throw new ITMException(buex);
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -2194,6 +2231,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2194,6 +2231,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally
{
try
{
}
catch(Exception ex)
{
ex.printStackTrace();
}
}
return errString; return errString;
} }
// 26/09/13 manoharan to find existing detail // 26/09/13 manoharan to find existing detail
...@@ -2330,7 +2381,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2330,7 +2381,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("Max Line:--"+maxline); System.out.println("Max Line:--"+maxline);
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,AMOUNT,EXCH_RATE,EFFECT_PARTY,AMOUNT__BC,EFF_BANK,CURR_CODE) values (?,?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,AMOUNT,EXCH_RATE,EFFECT_PARTY,AMOUNT__BC,EFF_BANK,CURR_CODE) values (?,?,?,?,?,?,?,?,?,?)";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
sql =" select ACCT_CODE,CCTR_CODE, case when sum(tax_amt) is null then 0 else sum(tax_amt) end as taxAmt " sql =" select ACCT_CODE,CCTR_CODE, case when sum(tax_amt) is null then 0 else sum(tax_amt) end as taxAmt "
...@@ -2356,10 +2407,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2356,10 +2407,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt1.setInt(2,maxline); pstmt1.setInt(2,maxline);
pstmt1.setString(3,acctCode); pstmt1.setString(3,acctCode);
pstmt1.setString(4,cctrCode==null?"":cctrCode); pstmt1.setString(4,cctrCode==null?"":cctrCode);
pstmt1.setDouble(5, -1 * amount); pstmt1.setDouble(5, amount);
pstmt1.setDouble(6,exchRate); pstmt1.setDouble(6,exchRate);
pstmt1.setString(7,effectParty); pstmt1.setString(7,effectParty);
pstmt1.setDouble(8, -1 * amount); pstmt1.setDouble(8, amount);
pstmt1.setString(9,effectbank); pstmt1.setString(9,effectbank);
pstmt1.setString(10,curr_code); pstmt1.setString(10,curr_code);
pstmt1.addBatch(); pstmt1.addBatch();
...@@ -2373,7 +2424,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2373,7 +2424,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt1=null; pstmt1=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
System.out.println("netAmountBc+taxAmt amount --------->"+netAmount); // System.out.println("netAmountBc+taxAmt amount --------->"+netAmount);
System.out.println("netAmountBc+taxAmt amount --------->"+amount);
//end //end
if(! isPreview)//if isPreview is false if(! isPreview)//if isPreview is false
{ {
......
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