Skip to content

B
business-java
Commit 1208085a authored by mjadhav's avatar mjadhav
Browse files
Options

changes done in save for chg term 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97566 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9d42004a
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 182 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/GenReceiptConf.java
View file @ 1208085a
......@@ -121,7 +121,7 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
System.out.println("confirm ::"+confirm);
if(confirm != null && confirm.equalsIgnoreCase("N"))
{
System.out.println("xtraParams["+xtraParams+"]");
errString = generateReceipt(tranId,conn,xtraParams);
System.out.println("err String from genReceiptConf ="+errString);
......@@ -141,12 +141,13 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
if(cnt>0)
{
conn.commit();
errStr = "VTCONFSUCC";
errStr = "VCNFSUC1";
System.out.println("CONFIRMED SUCESSFULLY!!!!!!!");
returnString = itmDBAccessEJB.getErrorString("",errStr,userId);
return returnString;
}
}
else
{
......@@ -155,34 +156,6 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
}
/* if(errString == null || errString.trim().length() == 0)
{
if("null".equalsIgnoreCase(loginEmpCode) || ==null || loginEmpCode.trim().length()==0)
{
loginEmpCode="E03952";
}
System.out.println("loginEmpCode--3-"+loginEmpCode);
sql = "update receipt set confirmed = 'Y', conf_date = ?,emp_code__aprv = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDate(1, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(2, loginEmpCode);
pstmt.setString(3, tranId);
int updateCoount = pstmt.executeUpdate();
System.out.println("no of row update = "+updateCoount);
pstmt.close();
pstmt = null;
if(updateCoount > 0)
{
errString = itmDBAccessEJB.getErrorString("","VTCICONF3","","",conn);
}
}
else
{
//errString = itmDBAccessEJB.getErrorString("","VTDESNCONF ","","",conn);
return errString;
}
*/
}
else
{
......@@ -264,7 +237,7 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
String lineNoRef="",refNo="",refSer="";
String custCode="",tranType="",rcpMode="",bankCode="",custbankRef="",currCode="",currCodeHD="";
String acctCodeArHD="",cctrCodeArHD="",acctCodeAdvHD="",cctrCodeAdvHD="";
String acctCodeBalHD="",cctrCodeBalHD="",acctCodeCfHD="",cctrCodeCfHD="",acctCodeCfArHD="",cctrCodeCfArHD="";
String acctCodeBalHD="",cctrCodeBalHD="",acctCodeCfHD="",cctrCodeCfHD="",acctCodeCfArHD="",cctrCodeCfArHD="",chgTerm="",chgUser="",loginEmpCode="";
StringBuffer xmlBuff = new StringBuffer();
StringBuffer advBuff = new StringBuffer();
PreparedStatement pstmt=null;
......@@ -278,7 +251,7 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
HashMap<String, String> tempMap = new HashMap<String, String>();
Date refDate=null,effDate=null;
Date refDate=null,effDate=null,chgDate=null;
double rcpAmt =0.0,chqAmt=0.0,totRcpAmt=0.0,adjAmt=0.0,chqAmtNew=0.0;
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -291,6 +264,13 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
java.util.Calendar cal = java.util.Calendar.getInstance();
tranDate = simpleDateFormat.format(cal.getTime());
chgUser = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgUser");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");
loginEmpCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
System.out.println("chgUser :"+chgUser);
System.out.println("chgTerm :"+chgTerm);
System.out.println("loginEmpCode :"+loginEmpCode);
sql = "select CUST_CODE,TRAN_TYPE,RCP_MODE,BANK_CODE ,REF_NO,REF_DATE,SITE_CODE, " +
" EFF_DATE,CUST_BANK_REF,CHQ_AMT,REMARKS from RECEIPT_FORM where tran_id = ? ";
......@@ -313,6 +293,7 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
chqAmt=rs.getDouble("CHQ_AMT");
remarks=rs.getString("REMARKS");
}
rs.close();
rs = null;
......@@ -331,9 +312,8 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
siteCode = siteCode == null ? "" : siteCode.trim();
custbankRef = custbankRef == null ? "" : custbankRef.trim();
remarks = remarks == null ? "" : remarks.trim();
/*refSer = refSer == null ? "" : refSer.trim();
refSer = refSer == null ? "" : refSer.trim();
refSer = refSer == null ? "" : refSer.trim();*/
chgUser = chgUser == null ? "" : chgUser.trim();
chgTerm = chgTerm == null ? "" : chgTerm.trim();
if(remarks == "")
{
......@@ -342,64 +322,6 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
/*---------------------------------------------------------------------------------------*/
/*sql = "select acct_code__ar, cctr_code__ar, curr_code, " +
" acct_code__adv, cctr_code__adv from customer where cust_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCodeArHD=rs.getString("acct_code__ar");
cctrCodeArHD=rs.getString("cctr_code__ar");
acctCodeAdvHD=rs.getString("acct_code__adv");
cctrCodeAdvHD=rs.getString("cctr_code__adv");
currCodeHD=rs.getString("curr_code");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
/*sql = " select case when acct_code__bal is null then '' else acct_code__bal end,case " +
" when cctr_code__bal is null then '' else cctr_code__bal end,acct_code__cf, cctr_code__cf, " +
" case when acct_code__cf_ar is null then '' " +
" else acct_code__cf_ar end, case when cctr_code__cf_ar is null then '' else cctr_code__cf_ar end " +
" from bank where bank_code = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,bankCode);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCodeBalHD=rs.getString(1);
cctrCodeBalHD=rs.getString(2);
acctCodeCfHD=rs.getString(3);
cctrCodeCfHD=rs.getString(4);
acctCodeCfArHD=rs.getString(5);
cctrCodeCfArHD=rs.getString(6);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
/* sql = " select curr_code from bank where bank_code = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,bankCode);
rs = pstmt.executeQuery();
if (rs.next())
{
currCodeHD=rs.getString("curr_code");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
currCodeHD = currCodeHD == null ? "" : currCodeHD.trim();
acctCodeArHD = acctCodeArHD == null ? "" : acctCodeArHD.trim();
cctrCodeArHD = cctrCodeArHD == null ? "" : cctrCodeArHD.trim();
......@@ -526,25 +448,10 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
}
// xmlBuff.append("<dlv_mode><![CDATA[]]></dlv_mode>");
// xmlBuff.append("<dlv_ref><![CDATA[]]></dlv_ref>");
// xmlBuff.append("<net_amt><![CDATA[]]></net_amt>");
// xmlBuff.append("<curr_code><![CDATA[]]></curr_code>");
// xmlBuff.append("<exch_rate><![CDATA[]]></exch_rate>");
// xmlBuff.append("<net_amt__bc><![CDATA[]]></net_amt__bc>");
// xmlBuff.append("<fin_entity><![CDATA[]]></fin_entity>");
//xmlBuff.append("<acct_code__ar><![CDATA["+acctCodeArHD+"]]></acct_code__ar>");
// xmlBuff.append("<cctr_code__ar><![CDATA["+cctrCodeAdvHD+"]]></cctr_code__ar>");
// xmlBuff.append("<acct_code__bal><![CDATA["+acctCodeBalHD+"]]></acct_code__bal>");
// xmlBuff.append("<cctr_code__bal><![CDATA["+cctrCodeBalHD+"]]></cctr_code__bal>");
xmlBuff.append("<site_code><![CDATA["+siteCode+"]]></site_code>");
xmlBuff.append("<confirmed><![CDATA[]]></confirmed>");
xmlBuff.append("<auto_recd><![CDATA[]]></auto_recd>");
//xmlBuff.append("<bill_amt><![CDATA[]]></bill_amt>");
// xmlBuff.append("<acct_code__cf><![CDATA["+acctCodeCfHD+"]]></acct_code__cf>");
// xmlBuff.append("<cctr_code__cf><![CDATA["+cctrCodeCfHD+"]]></cctr_code__cf>");
if(effDate != null)
{
xmlBuff.append("<eff_date><![CDATA["+sdf.format(effDate)+"]]></eff_date>");
......@@ -558,8 +465,6 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
xmlBuff.append("<sale_order><![CDATA[]]></sale_order>");
xmlBuff.append("<cust_bank_ref><![CDATA[]]></cust_bank_ref>");
xmlBuff.append("<entry_batch_no><![CDATA[]]></entry_batch_no>");
//xmlBuff.append("<acct_code__adv><![CDATA["+acctCodeAdvHD+"]]></acct_code__adv>");
//xmlBuff.append("<cctr_code__adv><![CDATA["+cctrCodeArHD+"]]></cctr_code__adv>");
xmlBuff.append("<emp_code__aprv><![CDATA[]]></emp_code__aprv>");
if(chqAmt > totRcpAmt)
......@@ -578,78 +483,24 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
//xmlBuff.append("<fin_chg><![CDATA[]]></fin_chg>");
// xmlBuff.append("<EFFECT_PARTY><![CDATA["+tranDate+"]]></tran_date>");
// xmlBuff.append("<TRAN_ID__MRCP><![CDATA["+tranDate+"]]></tran_date>");
// xmlBuff.append("<SITE_CODE__MRCP><![CDATA["+tranDate+"]]></tran_date>");
// xmlBuff.append("<BILL_DISC_AMT><![CDATA["+tranDate+"]]></tran_date>");
// xmlBuff.append("<EFUNDADJ_AMT><![CDATA["+tranDate+"]]></tran_date>");
// xmlBuff.append("<OTH_AMT><![CDATA["+tranDate+"]]></tran_date>");
//xmlBuff.append("<advadj_amt><![CDATA[]]></advadj_amt>");
xmlBuff.append("<fin_scheme><![CDATA[]]></fin_scheme>");
xmlBuff.append("<item_ser><![CDATA[]]></item_ser>");
// xmlBuff.append("<PARENT__TRAN_ID><![CDATA["+tranDate+"]]></tran_date>");
xmlBuff.append("<rcp_type><![CDATA[]]></rcp_type>");
//xmlBuff.append("<acct_code__cr><![CDATA[]]></acct_code__cr>");
// xmlBuff.append("<trf_status><![CDATA[]]></trf_status>");
// xmlBuff.append("<quantity__fc><![CDATA[]]></quantity__fc>");
xmlBuff.append("<remarks><![CDATA["+remarks+"]]></remarks>");
//xmlBuff.append("<curr_code><![CDATA["+currCodeHD+"]]></curr_code>");
xmlBuff.append("<fin_entity><![CDATA["+finEntity+"]]></fin_entity>");
xmlBuff.append("</Detail1>");
/* //sql="select ref_ser,ref_no,line_no__ref from rcpdet_form where tran_id=? and ADJ_OPT_FLG <> ? ";
sql=" select ref_ser,ref_no,line_no__ref,rcp_amt from rcpdet_form where tran_id=? ";
System.out.println("<!@#>Adding detail 2.......... sql "+sql);
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,tranId);
rs1=pstmt1.executeQuery();
while(rs1.next()){
lineNoCnt++;
System.out.println("lineNo is " + lineNoCnt);
refSer=rs1.getString("ref_ser");
lineNo=rs1.getInt("line_no");
refNo=rs1.getString("ref_no");
lineNoRef=rs1.getString("line_no__ref");
rcpAmt=rs1.getDouble("rcp_amt");
refSer = refSer == null ? "" : refSer.trim();
refNo = refNo == null ? "" : refNo.trim();
lineNoRef = lineNoRef == null ? "" : lineNoRef.trim();
System.out.println("lineNo :"+lineNo);
totRcpAmt = totRcpAmt + rcpAmt;
tempMap.put("line_no" + lineNoCnt, String.valueOf(lineNo));
tempMap.put("line_no_ref" + lineNoCnt, lineNoRef);
tempMap.put("ref_ser" + lineNoCnt, refSer);
tempMap.put("ref_no" + lineNoCnt, refNo);
tempMap.put("rcp_amt" + lineNoCnt, String.valueOf(rcpAmt));
xmlBuff.append("<chg_user><![CDATA["+chgUser+"]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA["+chgTerm+"]]></chg_term>");
xmlBuff.append("<chg_date><![CDATA["+tranDate+"]]></chg_date>");
xmlBuff.append("</Detail1>");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null; */
System.out.println("rcpAmt :"+rcpAmt);
System.out.println("lineNoCnt :"+lineNoCnt);
for(int i = 1 ; i <= lineNoCnt ; i++ )
{
System.out.println("acctCode !!!"+acctCode);
System.out.println("@@@@@@@@@@@@@@@Adding detail 2..........");
//xmlBuff.append("<Detail2 objContext=\"2\" objName=\"receivables_jv\" domID=\"1\" dbID=''>");
xmlBuff.append("<Detail2 objContext=\"2\" objName=\"receipt_adv\" domID=\"1\" dbID=''>");
xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
......@@ -660,26 +511,17 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
xmlBuff.append("<ref_ser><![CDATA["+tempMap.get("ref_ser" + i)+"]]></ref_ser>");
xmlBuff.append("<ref_no><![CDATA["+tempMap.get("ref_no" + i)+"]]></ref_no>");
xmlBuff.append("<rcp_amt><![CDATA["+tempMap.get("rcp_amt" + i)+"]]></rcp_amt>");
xmlBuff.append("</Detail2>");
}
xmlBuff.append(advBuff.toString());
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
xmlString = xmlBuff.toString();
System.out.println("xmlString " + xmlString);
errString = saveData(siteCode,xmlString,conn);
errString = saveData(siteCode,xmlString,xtraParams,conn);
System.out.println("Passed xml in master State full errString " + errString);
......@@ -696,14 +538,25 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
}
private String saveData(String siteCode,String xmlString, Connection conn) throws ITMException
private String saveData(String siteCode,String xmlString,String xtraParams, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
String retString = null;
MasterStatefulLocal masterStateful = null; // for ejb3
ibase.utility.UserInfoBean userInfo;
String chgUser="",chgTerm="";
try
{
System.out.println("saveData@@@@@@");
userInfo = new ibase.utility.UserInfoBean();
chgUser = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgUser");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");
userInfo.setLoginCode(chgUser);
userInfo.setRemoteHost(chgTerm);
System.out.println("chgUser :"+chgUser);
System.out.println("chgTerm :"+chgTerm);
AppConnectParm appConnect = new AppConnectParm();
ctx = new InitialContext(appConnect.getProperty());
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
......@@ -712,7 +565,12 @@ public class GenReceiptConf extends ActionHandlerEJB implements GenReceiptConfLo
authencate[0] = "";
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
//retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
retString = masterStateful.processRequest(userInfo,xmlString,true,conn);
}
catch(ITMException itme)
{
......
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