Skip to content

B
business-java
Commit 85c104c8 authored by vdhoble's avatar vdhoble
Browse files
Options

change by vishakha for F14ISUN006 07-APR-15 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97779 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9ecff43b
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 81 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscDrCrRcpConf.java
View file @ 85c104c8
...@@ -27,16 +27,16 @@ import ibase.webitm.utility.TransIDGenerator; ...@@ -27,16 +27,16 @@ import ibase.webitm.utility.TransIDGenerator;
public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConfLocal ,MiscDrCrRcpConfRemote { public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConfLocal ,MiscDrCrRcpConfRemote {
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException
{ { boolean isPreview = false;
Connection conn=null; Connection conn=null;
String errString=""; String errString="";
errString=confirm(tranId,xtraParams,forcedFlag,conn); errString=confirm(tranId,xtraParams,forcedFlag,conn,isPreview);
System.out.println("errString----"+errString); System.out.println("errString----"+errString);
return errString; return errString;
} }
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn) throws RemoteException,ITMException public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn,boolean isPreview) throws RemoteException,ITMException
{ {
//Connection conn = null; //Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -78,6 +78,11 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -78,6 +78,11 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(isPreview != false)//if isPreview is true
{
errString = gbfRetrieveMiscDrcrRcp(tranId,xtraParams,conn,isPreview);
}
else{
if(confirm != null && "Y".equalsIgnoreCase(confirm)) if(confirm != null && "Y".equalsIgnoreCase(confirm))
{ {
System.out.println("The Selected transaction is already confirmed"); System.out.println("The Selected transaction is already confirmed");
...@@ -118,6 +123,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -118,6 +123,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
} }
} }
} }
}
} //end of try } //end of try
catch(Exception e) catch(Exception e)
{ {
...@@ -214,8 +220,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -214,8 +220,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
return errString; return errString;
} }
private String gbfRetrieveMiscDrcrRcp(String tranId,String xtraParams,Connection conn)throws RemoteException,ITMException private String gbfRetrieveMiscDrcrRcp(String tranId,String xtraParams,Connection conn)throws RemoteException,ITMException
{
String errString = gbfRetrieveMiscDrcrRcp(tranId,xtraParams,conn, false);
return errString;
}
private String gbfRetrieveMiscDrcrRcp(String tranId,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
PreparedStatement pstmtInsert = null; PreparedStatement pstmtInsert = null;
...@@ -618,8 +631,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -618,8 +631,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
//if(rs.next()) if(rs.next())
while(rs.next()) //condition changed by sagar on 13/02/15
{ {
adjLineNo = rs.getString("line_no"); adjLineNo = rs.getString("line_no");
adjRefSer = rs.getString("ref_ser"); adjRefSer = rs.getString("ref_ser");
...@@ -627,8 +639,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -627,8 +639,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
adjAmt = rs.getDouble("adj_amt"); adjAmt = rs.getDouble("adj_amt");
refBalAmt = rs.getDouble("ref_bal_amt"); refBalAmt = rs.getDouble("ref_bal_amt");
mrpValueAdj = rs.getDouble("mrp_value__adj"); mrpValueAdj = rs.getDouble("mrp_value__adj");
System.out.println(">>>>>>>>>>>>>>>>>in while misc_drcr_rcpinv adjLineNo:"+adjLineNo);
System.out.println(">>>>>>>>>>>>>>>>>in while misc_drcr_rcpinv adjAmt:"+adjAmt);
miscRcpInvMap = new HashMap(); miscRcpInvMap = new HashMap();
miscRcpInvMap.put("line_no",adjLineNo); miscRcpInvMap.put("line_no",adjLineNo);
miscRcpInvMap.put("ref_ser",adjRefSer); miscRcpInvMap.put("ref_ser",adjRefSer);
...@@ -692,6 +703,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -692,6 +703,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
//pstmt.setTimestamp(1,tranDate); //pstmt.setTimestamp(1,tranDate);
pstmt.setTimestamp(1,toDay);//change done by kunal on 10/jun/14 pstmt.setTimestamp(1,toDay);//change done by kunal on 10/jun/14
pstmt.setString(2,tranId); pstmt.setString(2,tranId);
if(!isPreview){//avoiding update****Vishakha
upd = pstmt.executeUpdate(); upd = pstmt.executeUpdate();
if(upd <1 ) if(upd <1 )
{ {
...@@ -700,7 +712,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -700,7 +712,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//} //}
}
} }
if(!isPreview){ //if isPreview is true
if(("null".equals(roundAdj)) || (roundAdj == 0)) if(("null".equals(roundAdj)) || (roundAdj == 0))
{ {
amthdr1 = amount ; amthdr1 = amount ;
...@@ -734,7 +749,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -734,7 +749,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
miscRcpMap.put("amount__bc",(amount * exchRate)); miscRcpMap.put("amount__bc",(amount * exchRate));
} }
} }
}//ending isPreview Condition
//insert into misc_drcr_rdet //insert into misc_drcr_rdet
// sqlInsert =" insert into misc_drcr_rdet " // sqlInsert =" insert into misc_drcr_rdet "
...@@ -776,6 +791,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -776,6 +791,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
// lineNo = (String) miscRdetListMap.get("line_no"); // lineNo = (String) miscRdetListMap.get("line_no");
for (int ctr =0; ctr < miscRdetList.size(); ctr++) for (int ctr =0; ctr < miscRdetList.size(); ctr++)
{ {
System.out.println("Detail List Size********1****"+miscRdetList.size());
miscRdetListMap = new HashMap(); miscRdetListMap = new HashMap();
miscRdetListMap = (HashMap) miscRdetList.get(ctr); miscRdetListMap = (HashMap) miscRdetList.get(ctr);
...@@ -789,10 +806,13 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -789,10 +806,13 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
System.out.println(" Search acctCode & cctrCode Record found @ line no " +lineNo); System.out.println(" Search acctCode & cctrCode Record found @ line no " +lineNo);
status=true; status=true;
foundAt=ctr; foundAt=ctr;
System.out.println("Status***value****"+status);
break; break;
} }
}if(!status) }
if(!status)
{ {
// } // }
...@@ -836,6 +856,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -836,6 +856,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
//end //end
if(!isPreview)
{ //if isPreview is true
upd = pstmtInsert.executeUpdate(); upd = pstmtInsert.executeUpdate();
pstmtInsert.close(); pstmtInsert.close();
pstmtInsert=null; pstmtInsert=null;
...@@ -853,12 +875,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -853,12 +875,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmtInner.setDouble(1,amountRadj); pstmtInner.setDouble(1,amountRadj);
pstmtInner.setString(2,tranId); pstmtInner.setString(2,tranId);
pstmtInner.setString(3,lineNo); pstmtInner.setString(3,lineNo);
if(!isPreview)
{ //if isPreview is true
updCnt = pstmtInner.executeUpdate(); updCnt = pstmtInner.executeUpdate();
if(updCnt <1) if(updCnt <1)
{ {
throw new ITMException(new Exception("updateFail")); throw new ITMException(new Exception("updateFail"));
} }
pstmtInner.close(); pstmtInner.close();
}
pstmtInner = null; pstmtInner = null;
// modify Map for these new values // modify Map for these new values
miscRdetListMap = new HashMap(); miscRdetListMap = new HashMap();
...@@ -892,9 +917,11 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -892,9 +917,11 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
//end //end
} }
}
// } // }
} // end of amountRadj !=0 } // end of amountRadj !=0
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, "
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount " +" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount "
+" from taxtran where tran_code= ? and " +" from taxtran where tran_code= ? and "
...@@ -989,6 +1016,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -989,6 +1016,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
// } // }
// } // }
}// end while }// end while
if(!isPreview)
{
if(pstmtInsert!=null) if(pstmtInsert!=null)
{ {
batchCount =pstmtInsert.executeBatch(); batchCount =pstmtInsert.executeBatch();
...@@ -1002,8 +1031,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1002,8 +1031,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//taking reco_amount }//end of isPreview
//taking reco_amount
sql =" select line_no, acct_code__reco,cctr_code__reco, " sql =" select line_no, acct_code__reco,cctr_code__reco, "
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount " +" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount "
+" from taxtran where tran_code= ? and " +" from taxtran where tran_code= ? and "
...@@ -1132,6 +1163,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1132,6 +1163,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
} }
} }
if(!isPreview){ //if isPreview
if(!status) if(!status)
// if(!(acctCodeReco.equalsIgnoreCase(acctCode)) &&(cctrCodeReco.equalsIgnoreCase(cctrCode))) // if(!(acctCodeReco.equalsIgnoreCase(acctCode)) &&(cctrCodeReco.equalsIgnoreCase(cctrCode)))
{ {
...@@ -1179,6 +1213,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1179,6 +1213,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
} }
else else
{ {
// sqlInner =" update MISC_DRCR_RDET set amount = ? where tran_id = ? and line_no = ? "; // sqlInner =" update MISC_DRCR_RDET set amount = ? where tran_id = ? and line_no = ? ";
sqlInner =" update MISC_DRCR_RDET set amount = amount + ? where tran_id = ? and line_no = ? "; sqlInner =" update MISC_DRCR_RDET set amount = amount + ? where tran_id = ? and line_no = ? ";
...@@ -1187,12 +1222,14 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1187,12 +1222,14 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmtInner.setDouble(1,recoAmt); pstmtInner.setDouble(1,recoAmt);
pstmtInner.setString(2,tranId); pstmtInner.setString(2,tranId);
pstmtInner.setString(3,lineNo); pstmtInner.setString(3,lineNo);
updCnt = pstmtInner.executeUpdate(); updCnt = pstmtInner.executeUpdate();
if(updCnt <1) if(updCnt <1)
{ {
throw new Exception("UpdateFail"); throw new Exception("UpdateFail");
} }
pstmtInner.close(); pstmtInner.close();
pstmtInner = null; pstmtInner = null;
// modify Map for these new values // modify Map for these new values
miscRdetListMap = new HashMap(); miscRdetListMap = new HashMap();
...@@ -1228,9 +1265,12 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1228,9 +1265,12 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
} }
}//end of isPreview condition
// } // }
}// end while }// end while
if(pstmtInsert !=null)
if(!isPreview){
if(pstmtInsert !=null)
{ {
batchCount =pstmtInsert.executeBatch(); batchCount =pstmtInsert.executeBatch();
System.out.println("nos of row inserted "+batchCount.length); System.out.println("nos of row inserted "+batchCount.length);
...@@ -1243,6 +1283,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1243,6 +1283,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}
if(!isPreview)
{
if(("C".equalsIgnoreCase(sundryType)) && (adjMiscCrn != null)) if(("C".equalsIgnoreCase(sundryType)) && (adjMiscCrn != null))
{ {
if(("AI".equalsIgnoreCase(adjMiscCrn.trim())) || ("AC".equalsIgnoreCase(adjMiscCrn.trim()))) if(("AI".equalsIgnoreCase(adjMiscCrn.trim())) || ("AC".equalsIgnoreCase(adjMiscCrn.trim())))
...@@ -1379,18 +1422,25 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1379,18 +1422,25 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
} }
} // end of MI or MC } // end of MI or MC
}// end of C is sundry Type }// end of C is sundry Type
}//end of isPreview
if(errString.length() == 0) if(errString.length() == 0)
{ {
errString = this.gbfPostMiscDrcrRcp(tranId,miscRcpMap,miscRdetList,miscRcpInvList,xtraParams,conn); errString = this.gbfPostMiscDrcrRcp(tranId,miscRcpMap,miscRdetList,miscRcpInvList,xtraParams,conn,isPreview);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
} }
} }
}
}catch(Exception e)
catch(Exception e)
{ {
System.out.println("Exception :MiscDrcrConfirm :gbfRetrieveMiscDrcrRcp :SQLException :==>\n"+e.getMessage()); System.out.println("Exception :MiscDrcrConfirm :gbfRetrieveMiscDrcrRcp :SQLException :==>\n"+e.getMessage());
e.printStackTrace(); e.printStackTrace();
...@@ -1588,8 +1638,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1588,8 +1638,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
return errString; return errString;
} }
// migration gbf_post_misc_drcr_rcphdr // migration gbf_post_misc_drcr_rcphdr
private String gbfPostMiscDrcrRcphdr(String tranId,HashMap miscRcpMap,String xtraParams,Connection conn)throws RemoteException,ITMException private String gbfPostMiscDrcrRcphdr(String tranId,HashMap miscRcpMap,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("Inside gbfPostMiscDrcrRcphdr......value of Ispreview****"+isPreview);
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",errString = "" ; String sql = "",errString = "" ;
...@@ -1675,14 +1726,16 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1675,14 +1726,16 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
glTraceMap.put("ref_ser",(miscRcpMap.get("tran_ser"))); glTraceMap.put("ref_ser",(miscRcpMap.get("tran_ser")));
glTraceMap.put("remarks",(miscRcpMap.get("remarks"))); glTraceMap.put("remarks",(miscRcpMap.get("remarks")));
System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: glTraceUpdate"); System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: glTraceUpdate");
errString = Fcommon.glTraceUpdate(glTraceMap,conn); errString = Fcommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: glTraceUpdate errString" +errString); System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: glTraceUpdate errString" +errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
String sundryTypeGl = (String)glTraceMap.get("sundry_type"); String sundryTypeGl = (String)glTraceMap.get("sundry_type");
if(!isPreview)
{
if(!("O".equalsIgnoreCase(sundryTypeGl))) if(!("O".equalsIgnoreCase(sundryTypeGl)))
{ {
sundryBalMap.put("tran_date",miscRcpMap.get("tran_date")); sundryBalMap.put("tran_date",miscRcpMap.get("tran_date"));
...@@ -1729,6 +1782,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1729,6 +1782,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
return errString; return errString;
} }
} }
}
////genrating key for receivables ////genrating key for receivables
////insert into receivables 33 ////insert into receivables 33
// sql="insert into receivables (tran_id, tran_ser, tran_date, ref_no, ref_date, " + // sql="insert into receivables (tran_id, tran_ser, tran_date, ref_no, ref_date, " +
...@@ -1812,14 +1867,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1812,14 +1867,15 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
// miscRcpMap.put("ref_no",tranId); // miscRcpMap.put("ref_no",tranId);
if(!isPreview)
{//if isPreview is true
errString = Fcommon.gbfReceivablesUpd(miscRcpMap,conn); errString = Fcommon.gbfReceivablesUpd(miscRcpMap,conn);
System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: gbfReceivablesUpd errString"+errString); System.out.println("<!@#>going gbfPostMiscDrcrRcphdr::::::::::: gbfReceivablesUpd errString"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
// //
// as per discussion with Shri Mam // as per discussion with Shri Mam
// confirm = (String)miscRcpMap.get("confirmed"); // confirm = (String)miscRcpMap.get("confirmed");
...@@ -1843,7 +1899,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1843,7 +1899,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}//end of isPreview Condition
// } // }
// the window for cr/dr are now seperate, to take respective values as per tran_ser // the window for cr/dr are now seperate, to take respective values as per tran_ser
// tranSer =(String)miscRcpMap.get("tran_ser"); // tranSer =(String)miscRcpMap.get("tran_ser");
...@@ -1896,7 +1952,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1896,7 +1952,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
//migration gbf_post_misc_drcr_rcp_det //migration gbf_post_misc_drcr_rcp_det
private String gbfPostMiscDrcrRcpdet(String tranId,HashMap miscRcpMap,ArrayList miscRdetList,String xtraParams,Connection conn)throws RemoteException,ITMException private String gbfPostMiscDrcrRcpdet(String tranId,HashMap miscRcpMap,ArrayList miscRdetList,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -1914,12 +1970,13 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1914,12 +1970,13 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
try try
{ {
System.out.println("<!@#> In gbfPostMiscDrcrRcpdet :::::::::::::::::::::::::::::::"); System.out.println("<!@#> In gbfPostMiscDrcrRcpdet ::::::::::::::::::::::::::::isPreview value:::"+isPreview);
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
tDay = new java.sql.Timestamp(toDay.getTime()); tDay = new java.sql.Timestamp(toDay.getTime());
glTraceMap = new HashMap(); glTraceMap = new HashMap();
drcrFlag = (String)miscRcpMap.get("drcr_flag"); drcrFlag = (String)miscRcpMap.get("drcr_flag");
System.out.println("DetailList Size *****"+miscRdetList.size());
for (int ctr =0; ctr < miscRdetList.size(); ctr++) for (int ctr =0; ctr < miscRdetList.size(); ctr++)
{ {
miscRdetListMap = new HashMap(); miscRdetListMap = new HashMap();
...@@ -1992,7 +2049,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1992,7 +2049,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
glTraceMap.put("analysis3",anal3); glTraceMap.put("analysis3",anal3);
System.out.println("<!@#> In gbfPostMiscDrcrRcpdet :::::::::::::::::::::::glTraceUpdate"); System.out.println("<!@#> In gbfPostMiscDrcrRcpdet :::::::::::::::::::::::glTraceUpdate");
errString = Fcommon.glTraceUpdate(glTraceMap,conn); errString = Fcommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("<!@#> In gbfPostMiscDrcrRcpdet :::::::::::::::::::::::glTraceUpdate errString "+errString); System.out.println("<!@#> In gbfPostMiscDrcrRcpdet :::::::::::::::::::::::glTraceUpdate errString "+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -2046,7 +2103,6 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2046,7 +2103,6 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
String refSerHdr="",cust="",refSer="",refNo=""; String refSerHdr="",cust="",refSer="",refNo="";
double totAdjAmt=0,amount=0,mrpValueAdj=0,adjAmt=0,totAmt=0; double totAdjAmt=0,amount=0,mrpValueAdj=0,adjAmt=0,totAmt=0;
double totAdjAmtDet=0.0;
try try
{ {
System.out.println("<!@#> In gbfPostMiscDrcrAdjdet :::::::::::::::::::::::::::::::"); System.out.println("<!@#> In gbfPostMiscDrcrAdjdet :::::::::::::::::::::::::::::::");
...@@ -2065,8 +2121,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2065,8 +2121,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
mrpValueAdj = (Double)advListMap.get("mrp_value__adj"); mrpValueAdj = (Double)advListMap.get("mrp_value__adj");
totAdjAmt = amount; totAdjAmt = amount;
totAdjAmtDet= totAdjAmtDet + amount; //added by sagar on 13/02/15
System.out.println(">>>>>>In gbfPostMiscDrcrAdjdet amount:"+amount);
sql =" update receivables " sql =" update receivables "
+" set adj_amt = case when adj_amt is null then 0 else adj_amt end + ? , " +" set adj_amt = case when adj_amt is null then 0 else adj_amt end + ? , "
+" mrp_value = case when mrp_value is null then 0 else mrp_value end - ? " +" mrp_value = case when mrp_value is null then 0 else mrp_value end - ? "
...@@ -2076,7 +2131,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2076,7 +2131,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt.setDouble(1,amount); pstmt.setDouble(1,amount);
pstmt.setDouble(2,mrpValueAdj); pstmt.setDouble(2,mrpValueAdj);
pstmt.setString(3,refSer); pstmt.setString(3,refSer);
pstmt.setString(4,refNo); // code changed by sagar on 13/02/15 pstmt.setString(4,refNo);
upd = pstmt.executeUpdate(); upd = pstmt.executeUpdate();
if(upd <1) if(upd <1)
{ {
...@@ -2119,15 +2174,12 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2119,15 +2174,12 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
pstmt = null; pstmt = null;
} }
}//end of for }//end of for
System.out.println(">>>>>In MiscDrCrRcpConf fianl totAdjAmtDet:"+totAdjAmtDet);
sql =" update receivables set adj_amt = case when adj_amt is null then 0 else adj_amt end + -1 * ? " sql =" update receivables set adj_amt = case when adj_amt is null then 0 else adj_amt end + -1 * ? "
+" where tran_ser = ? and ref_no = ? "; +" where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//pstmt.setDouble(1,totAdjAmt); //comment added by sagar on 13/02/15 pstmt.setDouble(1,totAdjAmt);
pstmt.setDouble(1,totAdjAmtDet);
pstmt.setString(2,refSerHdr); pstmt.setString(2,refSerHdr);
pstmt.setString(3,tranId); pstmt.setString(3,tranId);
upd = pstmt.executeUpdate(); upd = pstmt.executeUpdate();
...@@ -2220,8 +2272,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2220,8 +2272,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
}//end of adj method }//end of adj method
//migration gbf_post_misc_drcr_rcp //migration gbf_post_misc_drcr_rcp
//migration gbf_post_misc_drcr_rcp //migration gbf_post_misc_drcr_rcp
private String gbfPostMiscDrcrRcp(String tranId,HashMap miscRcpMap,ArrayList miscRdetList,ArrayList miscRcpInvList,String xtraParams,Connection conn)throws RemoteException,ITMException private String gbfPostMiscDrcrRcp(String tranId,HashMap miscRcpMap,ArrayList miscRdetList,ArrayList miscRcpInvList,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("Inside gbfPostMiscDrcrRcp....... Value of isPreview*******"+isPreview);
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
PreparedStatement pstmtIn = null; PreparedStatement pstmtIn = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -2259,20 +2312,21 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2259,20 +2312,21 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
chgUser = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginCode"); chgUser = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginCode");
chgTerm = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"termId"); chgTerm = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"termId");
System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrRcphdr:::"); System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrRcphdr:::");
errString = this.gbfPostMiscDrcrRcphdr(tranId,miscRcpMap,xtraParams,conn); errString = this.gbfPostMiscDrcrRcphdr(tranId,miscRcpMap,xtraParams,conn,isPreview);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
System.out.println("<!@#> In gbfPostMiscDrcrRcp returning from gbfPostMiscDrcrRcphdr errString:::" +errString); System.out.println("<!@#> In gbfPostMiscDrcrRcp returning from gbfPostMiscDrcrRcphdr errString:::" +errString);
System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrRcpdet:::"); System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrRcpdet:::");
errString = this.gbfPostMiscDrcrRcpdet(tranId,miscRcpMap,miscRdetList,xtraParams,conn); errString = this.gbfPostMiscDrcrRcpdet(tranId,miscRcpMap,miscRdetList,xtraParams,conn,isPreview);
System.out.println("<!@#> In gbfPostMiscDrcrRcp returning from gbfPostMiscDrcrRcpdet errString:::" +errString); System.out.println("<!@#> In gbfPostMiscDrcrRcp returning from gbfPostMiscDrcrRcpdet errString:::" +errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
// ask to pravin // ask to pravin
if(!isPreview){ //if isPreview is true
System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrAdjdet:::"); System.out.println("<!@#> In gbfPostMiscDrcrRcp going into gbfPostMiscDrcrAdjdet:::");
errString = this.gbfPostMiscDrcrAdjdet(tranId,miscRcpMap,miscRcpInvList,xtraParams,conn); errString = this.gbfPostMiscDrcrAdjdet(tranId,miscRcpMap,miscRcpInvList,xtraParams,conn);
...@@ -2654,7 +2708,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -2654,7 +2708,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
// errString = itmDBAccessEJB.getErrorString("","CONFSUCCES",""); // errString = itmDBAccessEJB.getErrorString("","CONFSUCCES","");
errString = itmDBAccessEJB.getErrorString("","CONFSUCCES","","",conn); errString = itmDBAccessEJB.getErrorString("","CONFSUCCES","","",conn);
System.out.println("Misc Drcr Confirmed .."+errString); System.out.println("Misc Drcr Confirmed .."+errString);
}// end of try
}//end of isPreview Condition
}// end of try
catch(SQLException e) catch(SQLException e)
{ {
System.out.println("Exception :MiscDrCrRcpConf :gbfPostMiscDrcrRcp :SQLException :==>\n"+e.getMessage()); System.out.println("Exception :MiscDrCrRcpConf :gbfPostMiscDrcrRcp :SQLException :==>\n"+e.getMessage());
......
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ 85c104c8
...@@ -37,10 +37,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -37,10 +37,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
String retString = ""; String retString = "";
boolean isConn= false; boolean isConn= false;
Connection conn = null; Connection conn = null;
boolean isPreview = false;
try try
{ {
retString = confirm( tranID, xtraParams, forcedFlag, conn ); retString = confirm( tranID, xtraParams, forcedFlag, conn ,isPreview);
if ( retString != null && retString.length() > 0 ) if ( retString != null && retString.length() > 0 )
{ {
...@@ -54,7 +54,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -54,7 +54,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return retString; return retString;
} }
public String confirm(String tranId,String xtraParams,String forcedFlag, Connection conn) throws RemoteException,ITMException public String confirm(String tranId,String xtraParams,String forcedFlag, Connection conn, boolean isPreview) throws RemoteException,ITMException
{ {
System.out.println("confirm called........"); System.out.println("confirm called........");
String sql = ""; String sql = "";
...@@ -134,6 +134,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -134,6 +134,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("Printing loginEmpCode---2-----"+loginEmpCode+"--"); System.out.println("Printing loginEmpCode---2-----"+loginEmpCode+"--");
} }
if(isPreview != false){
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn,isPreview);
}
else{
if(confirm != null && confirm.equalsIgnoreCase("N")) if(confirm != null && confirm.equalsIgnoreCase("N"))
{ {
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn); errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
...@@ -200,6 +206,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -200,6 +206,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
System.out.println("115 err String from confirm method....."); System.out.println("115 err String from confirm method.....");
} }
}
catch( Exception e) catch( Exception e)
{ {
if(conn!=null) if(conn!=null)
...@@ -261,8 +268,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -261,8 +268,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
return errString; return errString;
} //end of confirm method } //end of confirm method
//vishakha
private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn)throws RemoteException,ITMException private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn)throws RemoteException,ITMException
{
String errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn,false);
return errString;
}
private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("gdf Retrieve Receipt Called..........."); System.out.println("gdf Retrieve Receipt Called...........");
String errString = ""; String errString = "";
...@@ -420,7 +434,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -420,7 +434,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString; return errString;
} }
System.out.println("rcpClubPost>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+rcpClubPost);
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -552,6 +566,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -552,6 +566,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// populate rcpacct // populate rcpacct
// 29/01/14 manoharan effect_party considered // 29/01/14 manoharan effect_party considered
if(!isPreview){
sql = "select sundry_type,sundry_code,acct_code,cctr_code,emp_code, anal_code,curr_code ,exch_rate,amount,party_doc_ref,case when effect_party is null then 'N' else effect_party end as effect_party,case when eff_bank is null then 'N' else eff_bank end as eff_bank from rcpacct where tran_id = ?"; sql = "select sundry_type,sundry_code,acct_code,cctr_code,emp_code, anal_code,curr_code ,exch_rate,amount,party_doc_ref,case when effect_party is null then 'N' else effect_party end as effect_party,case when eff_bank is null then 'N' else eff_bank end as eff_bank from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
...@@ -580,7 +595,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -580,7 +595,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
detListSize = DetList.size(); detListSize = DetList.size();
}
sql = "select ref_ser, ref_no,adj_amt,acct_code,cctr_code,exch_rate__vouch from rcpadv where tran_id = ?"; sql = "select ref_ser, ref_no,adj_amt,acct_code,cctr_code,exch_rate__vouch from rcpadv where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
...@@ -756,6 +771,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -756,6 +771,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
findIndex = -1; findIndex = -1;
} }
// System.out.println("findIndex>>>>>>>>>>>>>>>>>>>>>>>>>>>>773"+findIndex);
if (findIndex > -1) if (findIndex > -1)
{ {
detMap = (HashMap) DetList.get(findIndex); detMap = (HashMap) DetList.get(findIndex);
...@@ -763,7 +779,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -763,7 +779,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detAmount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt")); detAmount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt"));
detMap.put("amount", amountMap + detAmount ); detMap.put("amount", amountMap + detAmount );
DetList.set(findIndex, detMap); DetList.set(findIndex, detMap);
// System.out.println("amount>>>>>>>>>>>>>>>>>>>>>>>>>>>>781"+(amountMap + detAmount));
} }
else else
{ {
detMap = new HashMap(); detMap = new HashMap();
...@@ -781,7 +799,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -781,7 +799,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("party_doc_ref", partyDocRef); detMap.put("party_doc_ref", partyDocRef);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap); DetList.add(detMap);
} }
} }
...@@ -790,7 +807,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -790,7 +807,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
// populate bill if bill is discounted // populate bill if bill is discounted
// then credit the amount to the BD // then credit the amount to the BD
System.out.println("DetList*****************************811******************"+DetList.toString());
for(i=0 ; i<RcpDetList.size() ; i++) for(i=0 ; i<RcpDetList.size() ; i++)
{ {
//RcpDetMap = new HashMap(); //RcpDetMap = new HashMap();
...@@ -963,7 +980,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -963,7 +980,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
} }
System.out.println("DetList*****************984******************************"+DetList.toString());
//adjust for advances adjusted //adjust for advances adjusted
for(i=0 ; i<ADetList.size() ; i++) for(i=0 ; i<ADetList.size() ; i++)
...@@ -1081,6 +1098,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1081,6 +1098,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
}*/ }*/
} }
// System.out.println("DetList****************************1102*******************"+DetList.toString());
// insert data for finchg // insert data for finchg
//take but det and insert //take but det and insert
...@@ -1209,9 +1228,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1209,9 +1228,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
// System.out.println("DetList**************************1231*********************"+DetList.toString());
// insert data for advance // insert data for advance
advAmt = (double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")); advAmt = (double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"));
System.out.println("ADVAMT*********"+advAmt);
if(advAmt!= 0) if(advAmt!= 0)
{ {
total = total + advAmt; total = total + advAmt;
...@@ -1225,6 +1246,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1225,6 +1246,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(rcpClubPost.equals("Y")) if(rcpClubPost.equals("Y"))
{ {
findIndex = findExistingIndex(DetList, acct, cctr, exch); findIndex = findExistingIndex(DetList, acct, cctr, exch);
System.out.println("FINDINDEX>>>>>>>1243>>>>>"+findIndex);
} }
else else
{ {
...@@ -1240,6 +1262,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1240,6 +1262,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
else else
{ {
System.out.println("Into Else part of findIndex > -1>>>>");
detMap = new HashMap(); detMap = new HashMap();
sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'"; sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -1254,7 +1277,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1254,7 +1277,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs=null; rs=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
detMap.put("sundry_type", "C"); detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code")); detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct); detMap.put("acct_code", acct);
...@@ -1400,7 +1422,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1400,7 +1422,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetList.add(detMap); DetList.add(detMap);
} }
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?"; /*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acctCode); pstmt.setString(1,acctCode);
...@@ -1623,7 +1644,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1623,7 +1644,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("badDebtAmt>>>>>>1642>>>>>>>"+badDebtAmt);
if(badDebtAmt > 0) if(badDebtAmt > 0)
{ {
sql = "select tran_id, acct_code__dr,cctr_code__dr, acct_code__cr, cctr_code__cr, amt_prov, case when amt_revrsed is null then 0 else amt_revrsed end from bad_debts_prov where tran_ser = ? and ref_no = ? and amt_prov <> 0 order by tran_date"; sql = "select tran_id, acct_code__dr,cctr_code__dr, acct_code__cr, cctr_code__cr, amt_prov, case when amt_revrsed is null then 0 else amt_revrsed end from bad_debts_prov where tran_ser = ? and ref_no = ? and amt_prov <> 0 order by tran_date";
...@@ -1655,12 +1676,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1655,12 +1676,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
findIndex = -1; findIndex = -1;
} }
if (findIndex > -1) if (findIndex > -1)
{ {
detMap = (HashMap) DetList.get(findIndex); detMap = (HashMap) DetList.get(findIndex);
amountMap = (double) Double.parseDouble( "" + detMap.get("amount")); amountMap = (double) Double.parseDouble( "" + detMap.get("amount"));
detMap.put("amount", amountMap + (amtRev * -1) ); detMap.put("amount", amountMap + (amtRev * -1) );
DetList.set(findIndex, detMap); DetList.set(findIndex, detMap);
} }
else else
{ {
...@@ -1742,10 +1765,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1742,10 +1765,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
if (findIndex > -1) if (findIndex > -1)
{ {
detMap = (HashMap) DetList.get(findIndex); detMap = (HashMap) DetList.get(findIndex);
amountMap = (double) Double.parseDouble( "" + detMap.get("amount")); amountMap = (double) Double.parseDouble( "" + detMap.get("amount"));
detMap.put("amount", amountMap + amtRev ); detMap.put("amount", amountMap + amtRev );
DetList.set(findIndex, detMap); DetList.set(findIndex, detMap);
} }
else else
{ {
...@@ -1764,6 +1789,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1764,6 +1789,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("effect_party", "N"); // 29/01/14 manoharan detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap); DetList.add(detMap);
} }
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?"; /*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
...@@ -1814,7 +1840,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1814,7 +1840,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
} }
*/ */
if(!isPreview){ //if is preview is false****added by vishakha
sql = "update bad_debts_prov set amt_prov = amt_prov - ?, amt_revrsed = amt_revrsed + ? where tran_id = ?"; sql = "update bad_debts_prov set amt_prov = amt_prov - ?, amt_revrsed = amt_revrsed + ? where tran_id = ?";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,amtRev); pstmt1.setDouble(1,amtRev);
...@@ -1823,7 +1849,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1823,7 +1849,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt1.executeUpdate(); pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
}
badDebtAmt = badDebtAmt - amtRev; badDebtAmt = badDebtAmt - amtRev;
if (badDebtAmt == 0) if (badDebtAmt == 0)
{ {
...@@ -1835,8 +1861,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1835,8 +1861,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(!isPreview){
sql = " update receivables set bad_debt_amt = bad_debt_amt - ? where tran_ser = ? and ref_no = ? and line_no__ref = ?"; sql = " update receivables set bad_debt_amt = bad_debt_amt - ? where tran_ser = ? and ref_no = ? and line_no__ref = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, totBad); pstmt.setDouble(1, totBad);
...@@ -1847,6 +1874,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1847,6 +1874,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
totBad = 0; totBad = 0;
}
//System.out.println("aaaaaaaaaaaa"+total); //System.out.println("aaaaaaaaaaaa"+total);
//System.out.println("BBBBBBBBBBB"+total); //System.out.println("BBBBBBBBBBB"+total);
...@@ -1938,7 +1966,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1938,7 +1966,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("Max Line>>>"+maxline);
if(!isPreview )
{
System.out.println(" >>>>>>>>>>>>>"+isPreview);
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);
for(i = detListSize ; i<DetList.size() ; i++) for(i = detListSize ; i<DetList.size() ; i++)
...@@ -1988,18 +2019,19 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1988,18 +2019,19 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.addBatch(); pstmt.addBatch();
pstmt.clearParameters(); pstmt.clearParameters();
} }
if (DetList.size() > 0) if (DetList.size() > 0)
{ {
pstmt.executeBatch(); pstmt.executeBatch();
} }
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}
// end 14/01/14 manoharan // end 14/01/14 manoharan
if(errString == null || errString.trim().length() == 0) if(errString == null || errString.trim().length() == 0)
{ {
errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList,amtNoBankEffect, conn); errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList,amtNoBankEffect, conn,isPreview);
} }
else else
{ {
...@@ -2062,7 +2094,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2062,7 +2094,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
private String gbfPostReceipt(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DDetList, ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList,double amtNoBankEffect, Connection conn)throws RemoteException,ITMException private String gbfPostReceipt(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DDetList, ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList,double amtNoBankEffect, Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("gbfPostReceipt Called.........."); System.out.println("gbfPostReceipt Called..........");
String errString = ""; String errString = "";
...@@ -2124,7 +2156,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2124,7 +2156,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
*/ */
// header posting // header posting
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,amtNoBankEffect,conn); errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,amtNoBankEffect,conn,isPreview);
System.out.println("ERROR......................"+errString); System.out.println("ERROR......................"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -2132,14 +2164,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2132,14 +2164,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
else else
{ {
errString=gbfPostRcpdet(tranId,xtraParams,RcpHdrMap,DDetList,RcpDetList,ADetList,EpcAdjList,conn);//Changed by Manoj dtd 15/01/2014 to return errString from method errString=gbfPostRcpdet(tranId,xtraParams,RcpHdrMap,DDetList,RcpDetList,ADetList,EpcAdjList,conn,isPreview);//Changed by Manoj dtd 15/01/2014 to return errString from method
System.out.println("errString while posting rcpdet......................"+errString); System.out.println("errString while posting rcpdet......................"+errString);
} }
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
if(! isPreview)//if isPreview is false
{
sql = "SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?"; sql = "SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
...@@ -2235,6 +2268,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2235,6 +2268,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
}//end of isPreview condition**vishakha
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -2247,7 +2281,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2247,7 +2281,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString; return errString;
} }
private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn)throws RemoteException,ITMException private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("gbfPostRcphdr called........"); System.out.println("gbfPostRcphdr called........");
String errString = ""; String errString = "";
...@@ -2545,13 +2579,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2545,13 +2579,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
glTraceMap.put("proj_code", projectCode); glTraceMap.put("proj_code", projectCode);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace) //ls_errcode = gbf_gltrace_upd(lstr_gltrace)
System.out.println("1766 glTraceUpdate Called.............."); System.out.println("1766 glTraceUpdate Called........isPreview value......"+isPreview);
errString = finCommon.glTraceUpdate(glTraceMap,conn); System.out.println("the vslue for CR AMT**********************"+glTraceMap.get("cr_amt"));
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
debit = debit + (double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")); debit = debit + (double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"));
credit = credit + (double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")); credit = credit + (double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"));
...@@ -2605,7 +2642,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2605,7 +2642,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if (chqAmt != 0 || advAmt > 0 ) if (chqAmt != 0 || advAmt > 0 )
{ {
System.out.println("In 1826 SUNDRY-BAL !!!!!!!!!!!!!!!!!!!!!!!!!!"); System.out.println("In 1826 SUNDRY-BAL !!!!!!!!!!!!!!!!!!!!!!!!!!");
if (! isPreview)//if isPreview is false *****vishakha
{
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
}
} }
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -2613,7 +2653,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2613,7 +2653,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
//if chq amt is zero then should not be entered into banktran_log //if chq amt is zero then should not be entered into banktran_log
if (chqAmt != 0 ) if (chqAmt != 0 && (! isPreview ))//if isPreview is false *** vishakha
{ {
// update banktran_log // update banktran_log
bankTranLogMap = new HashMap(); bankTranLogMap = new HashMap();
...@@ -2720,12 +2760,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2720,12 +2760,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("proj_code", projectCode); glTraceMap.put("proj_code", projectCode);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace) //ls_errcode = gbf_gltrace_upd(lstr_gltrace)
System.out.println("1938 glTraceUpdate Called.............."); System.out.println("1938 glTraceUpdate Called..............");
errString = finCommon.glTraceUpdate(glTraceMap,conn); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
} }
debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"))); debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
...@@ -2735,7 +2775,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2735,7 +2775,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// insert into receivables for advance amount // insert into receivables for advance amount
if((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")) > 0) if((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")) > 0 && (! isPreview))//if isPreview is False **** vishakha
{ {
sql = "select sales_pers from customer where cust_code = ?"; sql = "select sales_pers from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2946,7 +2986,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2946,7 +2986,7 @@ 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,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("gbfPostRcpdet called.............."+RcpDetList); System.out.println("gbfPostRcpdet called.............."+RcpDetList);
String errString = ""; String errString = "";
...@@ -3108,7 +3148,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3108,7 +3148,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("remarks",remarks); glTraceMap.put("remarks",remarks);
glTraceMap.put("party_doc_ref",partyDocRef); glTraceMap.put("party_doc_ref",partyDocRef);
System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]"); System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]");
errString = finCommon.glTraceUpdate(glTraceMap,conn); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
System.out.println("ERROR IN GLTRACE ........... errString [" + errString + "]"); System.out.println("ERROR IN GLTRACE ........... errString [" + errString + "]");
...@@ -3116,11 +3156,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3116,11 +3156,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString; return errString;
} }
debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"))); debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
credit = credit + ((double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"))); credit = credit + ((double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
/// update sundrybal for customer code /// update sundrybal for customer code
if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O")) if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O") && (! isPreview))//if is Preview is false **vishakha
{ {
System.out.println("COMES INTO CONDITION ..........."); System.out.println("COMES INTO CONDITION ...........");
...@@ -3131,16 +3172,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3131,16 +3172,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("fin_entity", finEntity); sundryBalMap.put("fin_entity", finEntity);
sundryBalMap.put("site_code", siteCode); sundryBalMap.put("site_code", siteCode);
sundryBalMap.put("sundry_type", (String)glTraceMap.get("sundry_type")); sundryBalMap.put("sundry_type", (String)glTraceMap.get("sundry_type"));
//sundryBalMap.put("sundry_code", sundryCode); sundryBalMap.put("sundry_code", sundryCode);
//Added By Priyanka Das
sundryBalMap.put("sundry_code", (String)DetMap.get("cust_code")==null?sundryCode:(String)DetMap.get("cust_code"));
sundryBalMap.put("acct_code", (String)DetMap.get("acct_code")); sundryBalMap.put("acct_code", (String)DetMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code")); sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code"));
sundryBalMap.put("curr_code", (String)DetMap.get("curr_code")==null?hcurrCode:(String)DetMap.get("curr_code")); sundryBalMap.put("curr_code", (String)DetMap.get("curr_code")==null?hcurrCode:(String)DetMap.get("curr_code"));
sundryBalMap.put("exch_rate", (double) Double.parseDouble( "" + DetMap.get("exch_rate"))); sundryBalMap.put("exch_rate", (double) Double.parseDouble( "" + DetMap.get("exch_rate")));
String code_cust = (String) sundryBalMap.get("cust_code");
System.out.println("Value of sundry code if it is present"+ code_cust);
System.out.println("Value of sundry code If sundry code is null"+sundryCode);
amount = (double) Double.parseDouble( "" + DetMap.get("amount")); amount = (double) Double.parseDouble( "" + DetMap.get("amount"));
if(amount > 0) if(amount > 0)
...@@ -3169,7 +3205,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3169,7 +3205,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("last ..........."); System.out.println("last ...........");
} }
if(! isPreview) // if isPreview is false ****vishakha
{
for (int ctr =0; ctr < RcpDetList.size(); ctr++) for (int ctr =0; ctr < RcpDetList.size(); ctr++)
{ {
RcpDetMap = new HashMap(); RcpDetMap = new HashMap();
...@@ -3442,6 +3479,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3442,6 +3479,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("error is taxPost ..........."+errString); System.out.println("error is taxPost ..........."+errString);
return errString; return errString;
} }
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -3483,7 +3522,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3483,7 +3522,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = new ValidatorEJB(); ValidatorEJB validatorEJB = new ValidatorEJB();
GenericUtility genericUtility = new GenericUtility(); GenericUtility genericUtility = new GenericUtility();
boolean isPreview = false;
try try
{ {
finCommon = new FinCommon(); finCommon = new FinCommon();
...@@ -3550,7 +3589,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3550,7 +3589,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("glTraceUpdate before update "+glTraceMap); System.out.println("glTraceUpdate before update "+glTraceMap);
errString = finCommon.glTraceUpdate(glTraceMap,conn); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("glTraceUpdate errString "+errString); System.out.println("glTraceUpdate errString "+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
......
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