Skip to content

B
business-java
Commit 56cfa149 authored by kshinde's avatar kshinde
Browse files
Options

Bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185538 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7835584d
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 130 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/LcVouchConf.java
View file @ 56cfa149
...@@ -127,14 +127,14 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -127,14 +127,14 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
int updcnt=0; int updcnt=0;
String status="",lsSite="",lsSiteFor="",lsLink="",lsCustFor=""; String status="",lsSite="",lsSiteFor="",lsLink="",lsCustFor="",genCodeVal="";
long impVal=0; long impVal=0;
Timestamp today=null; Timestamp today=null;
boolean lbSameSite=false,lbCustFor=false; boolean lbSameSite=false,lbCustFor=false,NoacctEffect=false;
Document ediDataDom=null; Document ediDataDom=null;
String linkType="",siteCode="",siteCodeFor="",custCodeFor="",finEntity="",acctCodeLc="",cctrCodeLc="",currCode="",remarks="",purcOrder="",bankCode="",acctCodeBc="",cctrCodeBc="",finEntityFor="", String linkType="",tranType="",siteCode="",siteCodeFor="",custCodeFor="",finEntity="",acctCodeLc="",cctrCodeLc="",currCode="",remarks="",purcOrder="",bankCode="",acctCodeBc="",cctrCodeBc="",finEntityFor="",
currCodeBc="",bankChrgType="",acctCodeMargin="",cctrCodeMargin="",currCodeMar="",acctCodeIss="",cctrCodeIss="",acctCodeAp="",cctrCodeAp="",acctCodeRcp="",cctrCodeRcp="",acctCodeBal="",cctrCodeBal="",suppCode=""; currCodeBc="",bankChrgType="",acctCodeMargin="",cctrCodeMargin="",currCodeMar="",acctCodeIss="",cctrCodeIss="",acctCodeAp="",cctrCodeAp="",acctCodeRcp="",cctrCodeRcp="",acctCodeBal="",cctrCodeBal="",suppCode="";
double exchRate=0,lcAmt=0,exchRateBc=0,bankCharges=0,marginAmt=0,exchRateMar=0,othCharges=0,lcBkchgTot=0; double exchRate=0,lcAmt=0,exchRateBc=0,bankCharges=0,marginAmt=0,exchRateMar=0,othCharges=0,lcBkchgTot=0;
Timestamp tranDate=null,effDate=null,dueDate=null,dueDateAct=null; Timestamp tranDate=null,effDate=null,dueDate=null,dueDateAct=null;
...@@ -151,7 +151,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -151,7 +151,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
//Getting data from lc_voucher //Getting data from lc_voucher
sql="Select LINK_TYPE,SITE_CODE,SITE_CODE__FOR,SUPP_CODE,CUST_CODE__FOR,TRAN_DATE,EFF_DATE,DUE_DATE,DUE_DATE__ACT,FIN_ENTITY," sql="Select LINK_TYPE,TRAN_TYPE,SITE_CODE,SITE_CODE__FOR,SUPP_CODE,CUST_CODE__FOR,TRAN_DATE,EFF_DATE,DUE_DATE,DUE_DATE__ACT,FIN_ENTITY,"
+ "FIN_ENTITY__FOR,ACCT_CODE__LC,CCTR_CODE__LC,CURR_CODE,EXCH_RATE,LC_AMT,REMARKS,PURC_ORDER," + "FIN_ENTITY__FOR,ACCT_CODE__LC,CCTR_CODE__LC,CURR_CODE,EXCH_RATE,LC_AMT,REMARKS,PURC_ORDER,"
+ "BANK_CODE,ACCT_CODE__BC,CCTR_CODE__BC,ACCT_CODE__BAL,CCTR_CODE__BAL,CURR_CODE__BC,EXCH_RATE__BC,BANK_CHARGES_TYPE,BANK_CHARGES,OTHER_CHARGES," + "BANK_CODE,ACCT_CODE__BC,CCTR_CODE__BC,ACCT_CODE__BAL,CCTR_CODE__BAL,CURR_CODE__BC,EXCH_RATE__BC,BANK_CHARGES_TYPE,BANK_CHARGES,OTHER_CHARGES,"
+ "MARGIN_AMT,ACCT_CODE__MAR,CCTR_CODE__MAR,CURR_CODE__MAR,EXCH_RATE__MAR,ACCT_CODE__ISS,CCTR_CODE__ISS," + "MARGIN_AMT,ACCT_CODE__MAR,CCTR_CODE__MAR,CURR_CODE__MAR,EXCH_RATE__MAR,ACCT_CODE__ISS,CCTR_CODE__ISS,"
...@@ -163,6 +163,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -163,6 +163,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
if(rs.next()) if(rs.next())
{ {
linkType=checkNull(rs.getString("LINK_TYPE")); linkType=checkNull(rs.getString("LINK_TYPE"));
tranType=checkNull(rs.getString("TRAN_TYPE"));
siteCode=checkNull(rs.getString("SITE_CODE")); siteCode=checkNull(rs.getString("SITE_CODE"));
siteCodeFor = checkNull(rs.getString("SITE_CODE__FOR")); siteCodeFor = checkNull(rs.getString("SITE_CODE__FOR"));
custCodeFor=checkNull(rs.getString("CUST_CODE__FOR")); custCodeFor=checkNull(rs.getString("CUST_CODE__FOR"));
...@@ -248,6 +249,19 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -248,6 +249,19 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;
sql = "SELECT UDF_STR1 FROM GENCODES WHERE FLD_NAME = 'TRAN_TYPE' AND (MOD_NAME = 'W_LC_VOUCHER' OR MOD_NAME = 'X')"
+ "AND RTRIM(FLD_VALUE) = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, tranType);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
genCodeVal=rs.getString(1); ////gencode val if Y then boolean true
}
if(genCodeVal.equalsIgnoreCase("N"))
{
NoacctEffect=true; //No accounting effect boolean
}
//Initializing HashMaps //Initializing HashMaps
HashMap glTraceUpd=new HashMap(); HashMap glTraceUpd=new HashMap();
...@@ -265,10 +279,14 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -265,10 +279,14 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
lbSameSite=true; lbSameSite=true;
} }
if(!("R".equalsIgnoreCase(linkType) || "C".equalsIgnoreCase(linkType))) if(!("R".equalsIgnoreCase(linkType) || "C".equalsIgnoreCase(linkType))) //
{ {
if (!lbCustFor)
if(!NoacctEffect)//No accounting effect
{ {
if (!lbCustFor)
{
//HashMap glTraceUpd=new HashMap(); //HashMap glTraceUpd=new HashMap();
glTraceUpd.put("tran_date", tranDate); glTraceUpd.put("tran_date", tranDate);
glTraceUpd.put("eff_date", effDate); glTraceUpd.put("eff_date", effDate);
...@@ -276,8 +294,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -276,8 +294,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "O"); glTraceUpd.put("sundry_type", "O");
glTraceUpd.put("sundry_code", " "); glTraceUpd.put("sundry_code", " ");
glTraceUpd.put("acct_code__lc", acctCodeLc); glTraceUpd.put("acct_code", acctCodeLc);
glTraceUpd.put("cctr_code__lc", cctrCodeLc); glTraceUpd.put("cctr_code", cctrCodeLc);
glTraceUpd.put("curr_code", currCode); glTraceUpd.put("curr_code", currCode);
glTraceUpd.put("exch_rate", exchRate); glTraceUpd.put("exch_rate", exchRate);
if(lcAmt>0) if(lcAmt>0)
...@@ -317,11 +335,11 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -317,11 +335,11 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
miscPayUpd.put("tran_id",tranId); miscPayUpd.put("tran_id",tranId);
miscPayUpd.put("bill_no"," "); miscPayUpd.put("bill_no"," ");
miscPayUpd.put("curr_code",currCode); miscPayUpd.put("curr_code",currCode);
miscPayUpd.put("exchrate",exchRate); miscPayUpd.put("exch_rate",exchRate);
miscPayUpd.put("sundry_type","O"); miscPayUpd.put("sundry_type","O");
miscPayUpd.put("sundry_code"," "); miscPayUpd.put("sundry_code"," ");
miscPayUpd.put("acct_code_lc",acctCodeLc); miscPayUpd.put("acct_code",acctCodeLc);
miscPayUpd.put("cctr_code_lc",cctrCodeLc); miscPayUpd.put("cctr_code",cctrCodeLc);
miscPayUpd.put("due_date",dueDate); miscPayUpd.put("due_date",dueDate);
miscPayUpd.put("site_code",siteCode); miscPayUpd.put("site_code",siteCode);
miscPayUpd.put("fin_entity",finEntity); miscPayUpd.put("fin_entity",finEntity);
...@@ -349,10 +367,10 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -349,10 +367,10 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "O"); glTraceUpd.put("sundry_type", "O");
glTraceUpd.put("sundry_code", " "); glTraceUpd.put("sundry_code", " ");
glTraceUpd.put("acct_code__bc", acctCodeBc); glTraceUpd.put("acct_code", acctCodeBc);
glTraceUpd.put("cctr_code__bc", cctrCodeBc); glTraceUpd.put("cctr_code", cctrCodeBc);
glTraceUpd.put("curr_code__bc", currCodeBc); glTraceUpd.put("curr_code", currCodeBc);
glTraceUpd.put("exch_rate__bc", exchRateBc); glTraceUpd.put("exch_rate", exchRateBc);
if("F".equalsIgnoreCase(bankChrgType)) if("F".equalsIgnoreCase(bankChrgType))
{ {
lcBkchgTot=bankCharges; lcBkchgTot=bankCharges;
...@@ -386,7 +404,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -386,7 +404,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put( "ref_id",tranId); glTraceUpd.put( "ref_id",tranId);
glTraceUpd.put( "remarks",remarks); glTraceUpd.put( "remarks",remarks);
errCode=Fcommon.glTraceUpdate(glTraceUpd, conn); errString=Fcommon.glTraceUpdate(glTraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
{ {
return errString; return errString;
...@@ -399,8 +417,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -399,8 +417,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "B"); glTraceUpd.put("sundry_type", "B");
glTraceUpd.put("sundry_code", bankCode); glTraceUpd.put("sundry_code", bankCode);
glTraceUpd.put("acct_code__bal", acctCodeBal); glTraceUpd.put("acct_code", acctCodeBal);
glTraceUpd.put("cctr_code__bal", cctrCodeBal); glTraceUpd.put("cctr_code", cctrCodeBal);
glTraceUpd.put("emp_code", " "); glTraceUpd.put("emp_code", " ");
glTraceUpd.put("anal_code", " "); glTraceUpd.put("anal_code", " ");
glTraceUpd.put("curr_code__bc", currCodeBc); glTraceUpd.put("curr_code__bc", currCodeBc);
...@@ -452,10 +470,10 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -452,10 +470,10 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
sundryBalUpd.put("site_code", siteCode); sundryBalUpd.put("site_code", siteCode);
sundryBalUpd.put("sundry_type", "B"); sundryBalUpd.put("sundry_type", "B");
sundryBalUpd.put("sundry_code", bankCode); sundryBalUpd.put("sundry_code", bankCode);
sundryBalUpd.put("acct_code__bal", acctCodeBal); sundryBalUpd.put("acct_code", acctCodeBal);
sundryBalUpd.put("cctr_code__bal", cctrCodeBal); sundryBalUpd.put("cctr_code", cctrCodeBal);
sundryBalUpd.put("curr_code__bc", currCodeBc); sundryBalUpd.put("curr_code", currCodeBc);
sundryBalUpd.put("exch_rate__bc", exchRateBc); sundryBalUpd.put("exch_rate", exchRateBc);
if("F".equalsIgnoreCase(bankChrgType)) if("F".equalsIgnoreCase(bankChrgType))
{ {
...@@ -505,8 +523,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -505,8 +523,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
bankTranLogUpd.put("tran_type", "P"); bankTranLogUpd.put("tran_type", "P");
bankTranLogUpd.put("site_code", siteCode); bankTranLogUpd.put("site_code", siteCode);
bankTranLogUpd.put("tran_type", "P"); bankTranLogUpd.put("tran_type", "P");
bankTranLogUpd.put("acct_code__bal", acctCodeBal); bankTranLogUpd.put("acct_code", acctCodeBal);
bankTranLogUpd.put("cctr_code__bal", cctrCodeBal); bankTranLogUpd.put("cctr_code", cctrCodeBal);
bankTranLogUpd.put("sundry_type", "S"); bankTranLogUpd.put("sundry_type", "S");
bankTranLogUpd.put("sundry_code", suppCode); bankTranLogUpd.put("sundry_code", suppCode);
bankTranLogUpd.put("remarks", remarks); bankTranLogUpd.put("remarks", remarks);
...@@ -529,11 +547,11 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -529,11 +547,11 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "O"); glTraceUpd.put("sundry_type", "O");
glTraceUpd.put("sundry_code", " "); glTraceUpd.put("sundry_code", " ");
glTraceUpd.put("acct_code__mar", acctCodeMargin); glTraceUpd.put("acct_code", acctCodeMargin);
glTraceUpd.put("cctr_code__mar", cctrCodeMargin); glTraceUpd.put("cctr_code", cctrCodeMargin);
glTraceUpd.put("emp_code", " "); glTraceUpd.put("emp_code", " ");
glTraceUpd.put("anal_code", " "); glTraceUpd.put("anal_code", " ");
glTraceUpd.put("curr_code__mar", currCodeMar); glTraceUpd.put("curr_code", currCodeMar);
glTraceUpd.put("exch_rate__bc", exchRateMar); glTraceUpd.put("exch_rate__bc", exchRateMar);
if(marginAmt>0) if(marginAmt>0)
{ {
...@@ -563,8 +581,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -563,8 +581,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "B"); glTraceUpd.put("sundry_type", "B");
glTraceUpd.put("sundry_code", bankCode); glTraceUpd.put("sundry_code", bankCode);
glTraceUpd.put("acct_code__bal", acctCodeBal); glTraceUpd.put("acct_code", acctCodeBal);
glTraceUpd.put("cctr_code__bal", cctrCodeBal); glTraceUpd.put("cctr_code", cctrCodeBal);
glTraceUpd.put("emp_code", " "); glTraceUpd.put("emp_code", " ");
glTraceUpd.put("anal_code", " "); glTraceUpd.put("anal_code", " ");
glTraceUpd.put("curr_code", currCodeMar); glTraceUpd.put("curr_code", currCodeMar);
...@@ -596,8 +614,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -596,8 +614,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
sundryBalUpd.put("site_code", siteCode); sundryBalUpd.put("site_code", siteCode);
sundryBalUpd.put("sundry_type", "B"); sundryBalUpd.put("sundry_type", "B");
sundryBalUpd.put("sundry_code", bankCode); sundryBalUpd.put("sundry_code", bankCode);
sundryBalUpd.put("acct_code__bal", acctCodeBal); sundryBalUpd.put("acct_code", acctCodeBal);
sundryBalUpd.put("cctr_code__bal", cctrCodeBal); sundryBalUpd.put("cctr_code", cctrCodeBal);
sundryBalUpd.put("curr_code__mar", currCodeMar); sundryBalUpd.put("curr_code__mar", currCodeMar);
sundryBalUpd.put("exch_rate__mar", exchRateMar); sundryBalUpd.put("exch_rate__mar", exchRateMar);
//lcBkchgTot=bankCharges; //lcBkchgTot=bankCharges;
...@@ -631,8 +649,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -631,8 +649,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
bankTranLogUpd.put("tran_type", "P"); bankTranLogUpd.put("tran_type", "P");
bankTranLogUpd.put("site_code", siteCode); bankTranLogUpd.put("site_code", siteCode);
bankTranLogUpd.put("tran_type", "P"); bankTranLogUpd.put("tran_type", "P");
bankTranLogUpd.put("acct_code__bal", acctCodeBal); bankTranLogUpd.put("acct_code", acctCodeBal);
bankTranLogUpd.put("cctr_code__bal", cctrCodeBal); bankTranLogUpd.put("cctr_code", cctrCodeBal);
bankTranLogUpd.put("sundry_type", "O"); bankTranLogUpd.put("sundry_type", "O");
bankTranLogUpd.put("sundry_code", " "); bankTranLogUpd.put("sundry_code", " ");
bankTranLogUpd.put("remarks", remarks); bankTranLogUpd.put("remarks", remarks);
...@@ -647,10 +665,13 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -647,10 +665,13 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
} }
} }
}
//debit supplier /site dr -start //debit supplier /site dr -start
//debit supplier / site a/c dr -start //debit supplier / site a/c dr -start
if(!NoacctEffect) //No accounting effect
{
if(!lbCustFor) if(!lbCustFor)
{ //HashMap glTraceUpd=new HashMap(); { //HashMap glTraceUpd=new HashMap();
if(lbSameSite || ("R".equalsIgnoreCase(lsLink) || "C".equalsIgnoreCase(lsLink)) ) if(lbSameSite || ("R".equalsIgnoreCase(lsLink) || "C".equalsIgnoreCase(lsLink)) )
...@@ -659,8 +680,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -659,8 +680,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("sundry_type", "S"); glTraceUpd.put("sundry_type", "S");
glTraceUpd.put("sundry_code", suppCode); glTraceUpd.put("sundry_code", suppCode);
glTraceUpd.put("acct_code__ap", acctCodeAp); glTraceUpd.put("acct_code", acctCodeAp);
glTraceUpd.put("cctr_code__ap", cctrCodeAp); glTraceUpd.put("cctr_code", cctrCodeAp);
if("R".equalsIgnoreCase(lsLink) || "C".equalsIgnoreCase(lsLink)) if("R".equalsIgnoreCase(lsLink) || "C".equalsIgnoreCase(lsLink))
{ {
glTraceUpd.put("fin_entity__for", finEntityFor); glTraceUpd.put("fin_entity__for", finEntityFor);
...@@ -680,8 +701,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -680,8 +701,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
} }
else else
{ {
glTraceUpd.put("acct_code__iss", acctCodeIss); glTraceUpd.put("acct_code", acctCodeIss);
glTraceUpd.put("cctr_code__iss", cctrCodeIss); glTraceUpd.put("cctr_code", cctrCodeIss);
glTraceUpd.put("fin_entity", finEntity); glTraceUpd.put("fin_entity", finEntity);
glTraceUpd.put("site_code", siteCode); glTraceUpd.put("site_code", siteCode);
glTraceUpd.put("sundry_type", "O"); glTraceUpd.put("sundry_type", "O");
...@@ -722,8 +743,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -722,8 +743,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
sundryBalUpd.put("sundry_code", glTraceUpd.get("sundry_code")); sundryBalUpd.put("sundry_code", glTraceUpd.get("sundry_code"));
sundryBalUpd.put("tran_date", tranDate); sundryBalUpd.put("tran_date", tranDate);
sundryBalUpd.put("eff_date", effDate); sundryBalUpd.put("eff_date", effDate);
sundryBalUpd.put("acct_code__ap", acctCodeAp); sundryBalUpd.put("acct_code", acctCodeAp);
sundryBalUpd.put("cctr_code__ap", cctrCodeAp); sundryBalUpd.put("cctr_code", cctrCodeAp);
sundryBalUpd.put("curr_code", currCode); sundryBalUpd.put("curr_code", currCode);
sundryBalUpd.put("exch_rate", exchRate); sundryBalUpd.put("exch_rate", exchRate);
//lcBkchgTot=bankCharges; //lcBkchgTot=bankCharges;
...@@ -758,8 +779,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -758,8 +779,8 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
glTraceUpd.put("exch_rate", exchRate); glTraceUpd.put("exch_rate", exchRate);
glTraceUpd.put("sundry_type", "O"); glTraceUpd.put("sundry_type", "O");
glTraceUpd.put("sundry_code", " "); glTraceUpd.put("sundry_code", " ");
glTraceUpd.put("acct_code__rcp", acctCodeRcp); glTraceUpd.put("acct_code", acctCodeRcp);
glTraceUpd.put("cctr_code__rcp", cctrCodeRcp); glTraceUpd.put("cctr_code", cctrCodeRcp);
if(lcAmt>0) if(lcAmt>0)
{ {
glTraceUpd.put("dr_amt", 0); glTraceUpd.put("dr_amt", 0);
...@@ -832,6 +853,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L ...@@ -832,6 +853,7 @@ public class LcVouchConf extends ActionHandlerEJB implements LcVouchConfLocal, L
} }
} }
}
//payable - dr effect for supp_code/cust_code__for -end //payable - dr effect for supp_code/cust_code__for -end
if ("P".equalsIgnoreCase(lsLink)) if ("P".equalsIgnoreCase(lsLink))
{ {
......
webitm-fin/ibase/webitm/ejb/fin/adv/LoanConf.java
View file @ 56cfa149
...@@ -18,8 +18,6 @@ import org.apache.axis.client.Service; ...@@ -18,8 +18,6 @@ import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType; import org.apache.axis.encoding.XMLType;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.adv.JvConfirm;
import ibase.webitm.ejb.fin.adv.PayIbcaConf;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
...@@ -182,11 +180,10 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -182,11 +180,10 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
java.sql.Timestamp dueDate = null; java.sql.Timestamp dueDate = null;
java.sql.Timestamp resiDate = null; java.sql.Timestamp resiDate = null;
java.sql.Timestamp relieveDate = null; java.sql.Timestamp relieveDate = null;
HashMap mischdrMap=null,miscdetMap=null,miscAdvMap=null,miscAcctMap =null,miscdetListMap=null; HashMap loanDetMap=null;
ArrayList miscdetList = new ArrayList(); ArrayList<HashMap> loanDetList = new ArrayList<HashMap>();
ArrayList miscAcctList = new ArrayList();
ArrayList miscAdvList = new ArrayList();
double taxAmt=0,rndTo=0,totAmt=0,netAmt=0,advAmt=0,netAmtBc=0,diffAmtExch=0,suppBillAmt=0,exchRate=0,rndAmt=0,billAmt=0; double taxAmt=0,rndTo=0,totAmt=0,netAmt=0,advAmt=0,netAmtBc=0,diffAmtExch=0,suppBillAmt=0,exchRate=0,rndAmt=0,billAmt=0;
String siteCodehdr="",loanType="",tranType="",loanPartyhdr="",bankCode="", String siteCodehdr="",loanType="",tranType="",loanPartyhdr="",bankCode="",
...@@ -241,7 +238,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -241,7 +238,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
+ "FROM LOAN_DET L,MISC_VOUCHER M WHERE L.tran_id = ? and M.tran_id=L.ref_no"; + "FROM LOAN_DET L,MISC_VOUCHER M WHERE L.tran_id = ? and M.tran_id=L.ref_no";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) while(rs.next())
{ {
lineNoDet=rs.getString("LINE_NO"); lineNoDet=rs.getString("LINE_NO");
refSerDet=rs.getString("REF_SER"); refSerDet=rs.getString("REF_SER");
...@@ -253,6 +250,19 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -253,6 +250,19 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
sundryTypeDet=rs.getString("SUNDRY_TYPE"); sundryTypeDet=rs.getString("SUNDRY_TYPE");
currCodeDet=rs.getString("CURR_CODE"); currCodeDet=rs.getString("CURR_CODE");
exchRateDet=rs.getString("EXCH_RATE"); exchRateDet=rs.getString("EXCH_RATE");
loanDetMap=new HashMap();
loanDetMap.put("LINE_NO", lineNoDet);
loanDetMap.put("REF_SER", refSerDet);
loanDetMap.put("REF_NO", refNoDet);
loanDetMap.put("ACCT_CODE", AcctCodeDet);
loanDetMap.put("CCTR_CODE", cctrCodeDet);
loanDetMap.put("AMOUNT_PAID", amountPaid);
loanDetMap.put("SUNDRY_CODE", sundryCodeDet);
loanDetMap.put("CURR_CODE", currCodeDet);
loanDetMap.put("EXCH_RATE", exchRateDet);
loanDetList.add(loanDetMap);
} }
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
...@@ -274,10 +284,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -274,10 +284,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
rs=null; rs=null;
HashMap sundryBalUpd=new HashMap(); HashMap sundryBalUpd=new HashMap();
HashMap miscPayUpd= new HashMap(); HashMap miscPayUpd= new HashMap();
HashMap glTraceUpd=new HashMap();
//New buyers Credit //New buyers Credit OR New Term Loan
if("0".equalsIgnoreCase(loanType)) if("0".equalsIgnoreCase(loanType) || "1".equalsIgnoreCase(loanType))
{ {
//creating misc receipt entry //creating misc receipt entry
StringBuffer xmlBuff= new StringBuffer(); StringBuffer xmlBuff= new StringBuffer();
...@@ -318,7 +329,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -318,7 +329,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
xmlBuff.append("<sundry_type><![CDATA[" + ("L") + "]]></sundry_type>"); xmlBuff.append("<sundry_type><![CDATA[" + ("L") + "]]></sundry_type>");
xmlBuff.append("</Detail1>"); xmlBuff.append("</Detail1>");
xmlBuff.append("<Detail2 dbID=\"\" domID=\'1\' objName=\"misc_rcp\" objContext=\"3\">"); xmlBuff.append("<Detail2 dbID=\"\" domID=\'1\' objName=\"misc_rcp\" objContext=\"2\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />"); xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuff.append("<tran_id/>"); xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no>"+("1")+"</line_no>"); xmlBuff.append("<line_no>"+("1")+"</line_no>");
...@@ -328,7 +339,6 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -328,7 +339,6 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
xmlBuff.append("<anal_code><![CDATA[" +null+ "]]></anal_code>"); xmlBuff.append("<anal_code><![CDATA[" +null+ "]]></anal_code>");
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
//save data
errString=saveData(xtraParams,siteCodehdr, xmlBuff.toString(), conn); errString=saveData(xtraParams,siteCodehdr, xmlBuff.toString(), conn);
if( errString.indexOf("Success") == -1 ) if( errString.indexOf("Success") == -1 )
{ {
...@@ -360,8 +370,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -360,8 +370,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
miscPayUpd.put("exchrate",exchRate); miscPayUpd.put("exchrate",exchRate);
miscPayUpd.put("sundry_type","L"); miscPayUpd.put("sundry_type","L");
miscPayUpd.put("sundry_code",loanPartyhdr); miscPayUpd.put("sundry_code",loanPartyhdr);
miscPayUpd.put("acct_code",acctCodePay); miscPayUpd.put("acct_code_lc",acctCodePay);
miscPayUpd.put("cctr_code",cctrCodePay); miscPayUpd.put("cctr_code_lc",cctrCodePay);
//miscPayUpd.put("due_date",dueDate); //miscPayUpd.put("due_date",dueDate);
miscPayUpd.put("site_code",siteCodehdr); miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",loanAmthdr); miscPayUpd.put("tot_amt",loanAmthdr);
...@@ -379,86 +389,92 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -379,86 +389,92 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
} }
//--Generating payable against loanParty end //--Generating payable against loanParty end
}
else if("1".equalsIgnoreCase(loanType)) //New TermLoan
{
} }
else //convert buyers credit to Term Loan(Type 2) else //convert buyers credit to Term Loan(Type 2)
{ {
//--Negative payables towards detail loan party start //Loan detail list
for(HashMap detailmap: loanDetList)
miscPayUpd.put("tran_ser","");
miscPayUpd.put("tran_date",tranDate);
miscPayUpd.put("ref_no",refNoDet);
miscPayUpd.put("bill_no"," ");
miscPayUpd.put("curr_code",currCodeDet);
miscPayUpd.put("exchrate",exchRateDet);
miscPayUpd.put("sundry_type",sundryTypeDet);
miscPayUpd.put("sundry_code",sundryCodeDet);
miscPayUpd.put("acct_code",AcctCodeDet);
miscPayUpd.put("cctr_code",cctrCodeDet);
//miscPayUpd.put("due_date",dueDate);
miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",-amountPaid);
miscPayUpd.put("bank_code",bankCode);
miscPayUpd.put("auto_pay","N");
miscPayUpd.put("pay_mode","T");
miscPayUpd.put("paid","N");
miscPayUpd.put("adv_amt",0);
errString=Fcommon.gbfMiscPayUpd(miscPayUpd, conn);
if(errString!=null && errString.trim().length()>0)
{ {
return errString; sql="Update misc_payables set adj_amt = ? where ref_no = ? ";
} pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1,(Double) detailmap.get("AMOUNT_PAID"));
pstmt.setString(2, detailmap.get("REF_NO").toString());
pstmt.executeUpdate();
//Gltrace debit note to sundry code
HashMap glTraceUpd=new HashMap();
glTraceUpd.put("tran_date", tranDate);
glTraceUpd.put("eff_date", tranDate);
glTraceUpd.put("fin_entity", "");
glTraceUpd.put("site_code", siteCodehdr);
glTraceUpd.put("sundry_type", sundryTypeDet);
glTraceUpd.put("sundry_code", sundryCodeDet);
glTraceUpd.put("acct_code", AcctCodeDet);
glTraceUpd.put("cctr_code", cctrCodeDet);
glTraceUpd.put("curr_code", currCodeDet);
glTraceUpd.put("exch_rate", exchRateDet);
glTraceUpd.put("dr_amt", amountPaid);
glTraceUpd.put("cr_amt", 0);
//glTraceUpd.put("ref_type", "D");
glTraceUpd.put( "ref_id",tranId);
errString=Fcommon.glTraceUpdate(glTraceUpd, conn);
if(errString!=null && errString.trim().length()>0)
{
return errString;
}
//SundryBal debit to sundry code //--Negative payables towards detail loan party start
sundryBalUpd.put("tran_date", tranDate); miscPayUpd.put("tran_ser","");
//sundryBalUpd.put("eff_date", effDate); miscPayUpd.put("tran_date",tranDate);
sundryBalUpd.put("fin_entity", finEnt); miscPayUpd.put("ref_no",refNoDet);
sundryBalUpd.put("site_code", siteCodehdr); miscPayUpd.put("bill_no"," ");
sundryBalUpd.put("sundry_type", sundryTypeDet); miscPayUpd.put("curr_code",currCode);
sundryBalUpd.put("sundry_code", sundryCodeDet); miscPayUpd.put("exchrate",exchRate);
sundryBalUpd.put("acct_code", AcctCodeDet); miscPayUpd.put("sundry_type",sundryTypeDet);
sundryBalUpd.put("cctr_code", cctrCodeDet); miscPayUpd.put("sundry_code",sundryCodeDet);
sundryBalUpd.put("curr_code", currCodeDet); miscPayUpd.put("acct_code",AcctCodeDet);
sundryBalUpd.put("exch_rate", exchRateDet); miscPayUpd.put("cctr_code",cctrCodeDet);
sundryBalUpd.put("dr_amt", 0); //miscPayUpd.put("due_date",dueDate);
sundryBalUpd.put("cr_amt", amountPaid); miscPayUpd.put("site_code",siteCodehdr);
sundryBalUpd.put("adv_amt", 0); miscPayUpd.put("tot_amt",-amountPaid);
miscPayUpd.put("bank_code",bankCode);
miscPayUpd.put("auto_pay","N");
miscPayUpd.put("pay_mode","T");
miscPayUpd.put("paid","N");
miscPayUpd.put("adj_amt",amountPaid); //Adjusting negative payable
errString=Fcommon.gbfMiscPayUpd(miscPayUpd, conn);
if(errString!=null && errString.trim().length()>0)
{
return errString;
}
//--negative payables towards detail loan party End
//Gltrace debit note to sundry code
glTraceUpd.put("tran_date", tranDate);
glTraceUpd.put("eff_date", tranDate);
glTraceUpd.put("fin_entity", "");
glTraceUpd.put("site_code", siteCodehdr);
glTraceUpd.put("sundry_type", sundryTypeDet);
glTraceUpd.put("sundry_code", sundryCodeDet);
glTraceUpd.put("acct_code", AcctCodeDet);
glTraceUpd.put("cctr_code", cctrCodeDet);
glTraceUpd.put("curr_code", currCodeDet);
glTraceUpd.put("exch_rate", exchRateDet);
glTraceUpd.put("dr_amt", amountPaid);
glTraceUpd.put("cr_amt", 0);
//glTraceUpd.put("ref_type", "D");
glTraceUpd.put( "ref_id",tranId);
errString=Fcommon.glTraceUpdate(glTraceUpd, conn);
if(errString!=null && errString.trim().length()>0)
{
return errString;
}
//SundryBal debit to sundry code
sundryBalUpd.put("tran_date", tranDate);
//sundryBalUpd.put("eff_date", effDate);
sundryBalUpd.put("fin_entity", finEnt);
sundryBalUpd.put("site_code", siteCodehdr);
sundryBalUpd.put("sundry_type", sundryTypeDet);
sundryBalUpd.put("sundry_code", sundryCodeDet);
sundryBalUpd.put("acct_code", acctCodePay);
sundryBalUpd.put("cctr_code", cctrCodeDet);
sundryBalUpd.put("curr_code", currCodeDet);
sundryBalUpd.put("exch_rate", exchRateDet);
sundryBalUpd.put("dr_amt", 0);
sundryBalUpd.put("cr_amt", amountPaid);
sundryBalUpd.put("adv_amt", 0);
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
if(errString!=null && errString.trim().length()>0)
{
return errString;
}
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
if(errString!=null && errString.trim().length()>0)
{
return errString;
} }
//--negative payables towards detail loan party start
///Positive payable against loanParty header Start ///Positive payable against loanParty header Start
miscPayUpd.put("tran_ser","");//Tran_ser ?? miscPayUpd.put("tran_ser","MVOUC");//Tran_ser ??
miscPayUpd.put("tran_date",tranDate); miscPayUpd.put("tran_date",tranDate);
miscPayUpd.put("ref_no",refNoDet); miscPayUpd.put("ref_no",refNoDet);
miscPayUpd.put("bill_no"," "); miscPayUpd.put("bill_no"," ");
...@@ -467,7 +483,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -467,7 +483,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
miscPayUpd.put("sundry_type",sundryTypeDet); miscPayUpd.put("sundry_type",sundryTypeDet);
miscPayUpd.put("sundry_code",sundryCodeDet); miscPayUpd.put("sundry_code",sundryCodeDet);
miscPayUpd.put("acct_code",acctCodePay); miscPayUpd.put("acct_code",acctCodePay);
miscPayUpd.put("cctr_code_lc",cctrCodePay); miscPayUpd.put("cctr_code",cctrCodePay);
miscPayUpd.put("due_date",dueDate); miscPayUpd.put("due_date",dueDate);
miscPayUpd.put("site_code",siteCodehdr); miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",loanAmthdr); miscPayUpd.put("tot_amt",loanAmthdr);
...@@ -726,7 +742,4 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -726,7 +742,4 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
return retString; return retString;
} }
} //class } //class
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