Commit c208dc51 authored by asikarwar's avatar asikarwar

change for accounting effect is coming wrong .


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93356 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d95e71e6
...@@ -562,7 +562,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -562,7 +562,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(cnt==0) if(cnt==0)
{ {
/* //CLOSE INSERT
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -579,7 +579,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -579,7 +579,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null;*///open pstmt = null;
} }
else else
...@@ -1306,7 +1306,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1306,7 +1306,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
total = total + (Double)RcpHdrMap.get("net_amt"); total = total + (Double)RcpHdrMap.get("net_amt");
totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc"); totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc");
System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
System.out.println("DDDDDDDDDDDDDDDDDDd"+total); System.out.println("DDDDDDDDDDDDDDDDDDd"+total);
if(bdFluctuationCf.equalsIgnoreCase("N")) if(bdFluctuationCf.equalsIgnoreCase("N"))
{ {
totBc = totBc +totbdDiff; totBc = totBc +totbdDiff;
...@@ -1360,6 +1363,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1360,6 +1363,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
conn.rollback(); conn.rollback();
} }
RcpHdrMap.put("net_amt", total);
RcpHdrMap.put("net_amt__bc", totBc);
System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
if(errString == null || errString.trim().length() == 0) if(errString == null || errString.trim().length() == 0)
{ {
errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList, conn); errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList, conn);
...@@ -1380,8 +1388,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1380,8 +1388,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
RcpHdrMap.put("net_amt", total);
RcpHdrMap.put("net_amt__bc", totBc);
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1458,9 +1469,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1458,9 +1469,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// header posting // header posting
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DetList,conn); errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DetList,conn);
System.out.println("ERROR......................"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; //return errString;
} }
else else
{ {
...@@ -1655,6 +1667,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1655,6 +1667,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn);
} }
System.out.println("net_amt AND net_amt__bc 1"+RcpHdrMap.get("net_amt")+""+RcpHdrMap.get("net_amt__bc"));
tranId = (String)RcpHdrMap.get("tran_id"); tranId = (String)RcpHdrMap.get("tran_id");
tranType = (String)RcpHdrMap.get("tran_type"); tranType = (String)RcpHdrMap.get("tran_type");
if(tranType.equalsIgnoreCase("J")) if(tranType.equalsIgnoreCase("J"))
...@@ -2224,9 +2237,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2224,9 +2237,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString; return errString;
} }
private String gbfPostRcpdet(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DetList , ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList,Connection conn)throws RemoteException,ITMException private String gbfPostRcpdet(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DetList, ArrayList RcpDetList ,ArrayList ADetList,ArrayList EpcAdjList,Connection conn)throws RemoteException,ITMException
{ {
System.out.println("gbfPostRcpdet called.............."); System.out.println("gbfPostRcpdet called.............."+RcpDetList);
String errString = ""; String errString = "";
String currCode = ""; String currCode = "";
String siteCode = ""; String siteCode = "";
...@@ -2545,7 +2558,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2545,7 +2558,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
// do the advance adjustment // do the advance adjustmentopen
for (int ctr =0; ctr < ADetList.size(); ctr++) for (int ctr =0; ctr < ADetList.size(); ctr++)
{ {
......
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