Commit 98d07b1d authored by agaikwad's avatar agaikwad

Request_id-D15GSUN006


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101155 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 313e298d
......@@ -569,8 +569,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
{
count++;
tabSeparatedData.append("<Detail2>");
tabSeparatedData.append ("<lr_no>").append("<![CDATA[" + (rs.getString(1)==null?" ":rs.getString(1)) +"]]>").append("<lr_no>");
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + (rs.getString(2)==null?" ":rs.getString(2)) +"]]>").append("<lr_date>");
tabSeparatedData.append ("<lr_no>").append("<![CDATA[" + (rs.getString(1)==null?" ":rs.getString(1)) +"]]>").append("</lr_no>");
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + (rs.getString(2)==null?" ":rs.getString(2)) +"]]>").append("</lr_date>");
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
......@@ -661,9 +661,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
count++;
tabSeparatedData.append("<Detail2>");
tabSeparatedData.append ("<lr_no>").append("<![CDATA[" + (rs.getString(1)==null?" ":rs.getString(1)) +"]]>").append("<lr_no>");
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + (rs.getString(2)==null?" ":rs.getString(2)) +"]]>").append("<lr_date>");
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("<stan_fr>");
tabSeparatedData.append ("<lr_no>").append("<![CDATA[" + (rs.getString(1)==null?" ":rs.getString(1)) +"]]>").append("</lr_no>");
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + (rs.getString(2)==null?" ":rs.getString(2)) +"]]>").append("</lr_date>");
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append("</gross_weight>");
......@@ -1122,7 +1122,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
detailDom = genericUtility.parseString(xmlString2);
System.out.println("detailDom" + detailDom);
}
System.out.println("Process return");
retStr = process(headerDom, detailDom, windowName, xtraParams);
System.out.println("Process return"+retStr);
}
catch (Exception e)
{
......@@ -1187,15 +1189,15 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
parentNodeListLength = parentNodeList.getLength();
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
{
parentNode = parentNodeList.item(selectedRow);
//for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
//{
/* parentNode = parentNodeList.item(selectedRow);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
System.out.println("childNodeListLength::: "+ childNodeListLength+"\n");
System.out.println("parentNodeListLength:::::::::"+parentNodeListLength);
System.out.println("Type is "+ type);
System.out.println("childNodeListLength::: "+ childNodeListLength+"\n");
System.out.println("childNodeListLength::: "+ childNodeListLength+"\n");*/
if(type.equalsIgnoreCase("Y"))
{
errString= gbsingle_vouch(headerDom,detailDom,windowName,xtraParams,conn);
......@@ -1204,6 +1206,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
{
errString=gbf_multi_vouch(headerDom,detailDom,windowName,xtraParams,conn);
}
System.out.println("@@@@@@Error String is" + errString);
if(errString.indexOf("CONFSUCCES") > -1)
{
conn.commit();
......@@ -1212,10 +1215,23 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
else
{
conn.rollback();
errString = itmDBAccessEJB.getErrorString("","VTPRCERR","","",conn);
System.out.println("#####Error String is" + errString);
return errString;
/*String error1 ="<Root><Errors><error id=VMANAL2 type=E column_name=anal_code><message><![CDATA[Error : Invalid analysis code ]]></message><description><![CDATA[Analysis code is not valid for this account. Define the account and analysis combination in the accounts analysis definition.]]></description><trace><![CDATA[ Tran Id : 0000000009, Line No : 1, Acct Code : 1442, Cctr Code : H101, Amount : 60.0]]></trace><redirect>1</redirect></error></Errors></Root>";
String[] arrayForTranId1 = error1.split("<error id=");
System.out.println("arrayForTranId1"+arrayForTranId1[1]);
int endIndex1 = arrayForTranId1[1].indexOf("type");
String ErrorCode = arrayForTranId1[1].substring(0, endIndex1);
System.out.println("Tranid is :"+ ErrorCode);
errString = itmDBAccessEJB.getErrorString("",ErrorCode,"","",conn);
if(error1.length()== 0)
{
errString = itmDBAccessEJB.getErrorString("","VTPRCERR","","",conn);
}*/
}
}
//}
}
catch(Exception e)
{
......@@ -1475,7 +1491,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
String winname="w_misc_voucher";
String ref="M-VOUC";
errString = gfmiscvoucherpe(winname, ref, payHeadList, lsvouchtype, payDetailList, lctaxamt, currDate,lssundrytype, lsremarks, ldlrdate1, lsbillno, tranIdSingle, xtraParams,postVouch, conn);
System.out.println("errString" +errString);
System.out.println("errString" +errString +"@@@@@Single Voucher");
/*if(errString.indexOf("CONFSUCCES") > -1)
{
System.out.println("Sucessfully");
......@@ -1498,6 +1514,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}else
{
System.out.println("not Successfully");
System.out.println("######Error String "+errString);
return errString;
}
}
else
......@@ -1508,17 +1526,19 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
for(int n = 0;n < nodeListLength;n++)
{
String refLineNo="";
detailNode = detailNodeList.item(n);
System.out.println("Z count is in starting"+ z);
System.out.println("For nodeList"+ nodeListLength);
String trandate1="",trandate2="",refdate1="",refdate2,tranID="",lssitecodedet="";
lcamt1 = GenericUtility.getInstance().getColumnValueFromNode("amount",detailNode);
System.out.println("lcamt1" + lcamt1);
System.out.println("lcamt1@@@@@" + lcamt1);
lcamt=Double.parseDouble(lcamt1);
System.out.println("lcamt" + lcamt);
System.out.println("lcamt@@@" + lcamt);
lcamount = lcamount + lcamt;
trandate1 = GenericUtility.getInstance().getColumnValueFromNode("proc_date",detailNode);
lsrefser = GenericUtility.getInstance().getColumnValueFromNode("ref_ser",detailNode);
lsrefid = GenericUtility.getInstance().getColumnValueFromNode("tran_id",detailNode);
System.out.println("lsrefid"+lsrefid);
lscurrcode= GenericUtility.getInstance().getColumnValueFromNode("curr_code",detailNode);
refdate1 = GenericUtility.getInstance().getColumnValueFromNode("tran_date",detailNode);
lssitecodedet = GenericUtility.getInstance().getColumnValueFromNode("site_code",detailNode);
......@@ -1811,13 +1831,80 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
lsvouchtype = "E";
lssundrytype = "S";
lschargetype = "L";
/*select acct_code__ap, cctr_code__ap, cr_term into :ls_sundry_acct , :ls_sundry_cctr , :ls_cr_term from supplier where supp_code = :ls_sundry_code;*/
sql="select acct_code__ap, cctr_code__ap,cr_term,pay_mode from supplier where supp_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lssundrycode);
rs = pstmt.executeQuery();
if(rs.next())
{
lssundryacct=rs.getString("acct_code__fp");
lssundrycctr=rs.getString("cctr_code__fp");
lscrterm=rs.getString("cr_term");
lspaymode=rs.getString("pay_mode");
}
rs.close();
pstmt.close();
rs = null;
pstmt = null;
if(lssundryacct.length()==0)
{
lssundryacct=null;
}
if(lssundrycctr.length()==0)
{
lssundrycctr=null;
}
if(lscrterm.length()==0)
{
lscrterm=null;
}
lssitecode = genericUtility.getColumnValue("site_code",headerDom);
sql="select bank_code from site where site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lssitecode);
rs = pstmt.executeQuery();
if(rs.next())
{
lsbankcode=rs.getString("bank_code");
}
rs.close();
pstmt.close();
rs = null;
pstmt = null;
if(lsbankcode.length()==0)
{
lsbankcode=null;
}
sql="select acct_code__cf,cctr_code__cf from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lsbankcode);
rs = pstmt.executeQuery();
if(rs.next())
{
lsacctcf=rs.getString("acct_code__cf");
lscctrcf=rs.getString("cctr_code__cf");
}
rs.close();
pstmt.close();
rs = null;
pstmt = null;
if(lsacctcf.length()==0)
{
lsacctcf=null;
}
if(lscctrcf.length()==0)
{
lscctrcf=null;
}
}
else if (chargetype.equalsIgnoreCase("F"))
{
lschargetype = "F";
lsvouchtype = "G";
lssundrytype = "T";
}
sql="select acct_code__fp, cctr_code__fp,cr_term,pay_mode from transporter where tran_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lssundrycode);
......@@ -1883,17 +1970,22 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
{
lscctrcf=null;
}
}
lcamt1 = GenericUtility.getInstance().getColumnValueFromNode("amount",detailNode);
System.out.println("lcamt1" + lcamt1);
System.out.println("lcamt in multi voucher" + lcamt1);
lcamt=Double.parseDouble(lcamt1);
System.out.println("lcamt" + lcamt);
System.out.println("lcamt in multi voucher" + lcamt);
lstranid = GenericUtility.getInstance().getColumnValueFromNode("tran_id",detailNode);
System.out.println("Ref_id is"+ lstranid);
ldlrdate1 = GenericUtility.getInstance().getColumnValueFromNode("lr_date",detailNode);
billdate1 = GenericUtility.getInstance().getColumnValueFromNode("bill_date",detailNode);
lsbillno1 = GenericUtility.getInstance().getColumnValueFromNode("bill_no",detailNode);
System.out.println("lcamount before"+ lcamount);
lcamount = lcamount +lcamt;
System.out.println("lcamount after"+ lcamount);
lcamtadl = lcamtadl + lcamtadlad;
System.out.println("lcamtadl"+lcamtadl);
if(lcamount != 0 || lcamtadl !=0 )
{
HashMap payRollHeadMap = new HashMap();
......@@ -1901,7 +1993,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
payRollHeadMap.put("acct_code__arap",lssundryacct);
payRollHeadMap.put("cctr_code__arap",lssundrycctr);
payRollHeadMap.put("curr_code",lscurrcode);
payRollHeadMap.put("amount",lcamount + lcamtadl);
payRollHeadMap.put("amount",lcamt + lcamtadl);
payRollHeadMap.put("site_code",lssitecode);
payRollHeadMap.put("tax_class",lstaxclass);
payRollHeadMap.put("tax_chap",lstaxchap);
......@@ -1960,7 +2052,10 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
payRollDetMap.put("tax_env",lstaxenv) ;
payRollDetMap.put("qty_fld",lcamtadlad) ;
payRollDetMap.put("rate_fld",lsnull) ;
payDetailList.add(payRollDetMap);
}
System.out.println("payHeadList pass Voucher"+ payHeadList);
System.out.println("payDetailList pass Voucher"+ payDetailList);
String winname="w_misc_voucher";
String ref="M-VOUC";
errString = gfmiscvoucherpe(winname, ref, payHeadList, lsvouchtype, payDetailList, lctaxamt, currDate,lssundrytype, lsremarks, ldlrdate1, lsbillno, lstranid, xtraParams,postVouch, conn);
......@@ -1981,7 +2076,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}else
{
System.out.println("not Successfully");
System.out.println("not Successfully MULTIVOUCHER");
System.out.println("######Error String "+errString);
return errString;
}
lstranid="";
......@@ -2158,6 +2255,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
System.out.println("Return errString");
return errString;
}
tranIdPe="";
if(postVouch.equalsIgnoreCase("N"))
{
......@@ -2234,9 +2332,10 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
StringBuffer xmlBuff = null;
String xmlString = null,retString = null;
SimpleDateFormat sdf = null;
try
{
System.out.println("In gfmiscvoucherpe");
Conf = new MiscValConf();
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW= ?";
......@@ -2254,12 +2353,13 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
pstmt.close();
pstmt = null;
//String traniD=tranIdPe;
System.out.println("payHeadList"+payHeadList);
System.out.println("payDetailList"+payDetailList);
System.out.println("payHeadList in voucher creation "+payHeadList);
System.out.println("payDetailList in voucher creation"+payDetailList);
HashMap payTranMap = (HashMap)payHeadList.get(0);
ldtrandt = currDate;
ldeffdt = currDate;
ldtaxdt = currDate;
lstrantype = checkNull(payTranMap.get("contract_type").toString());
System.out.println("lstrantype"+ lstrantype);
lssundrycode = checkNull(payTranMap.get("sundry_code").toString());
......@@ -2270,6 +2370,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
lstaxenv = checkNull(payTranMap.get("tax_env").toString());
System.out.println("lstaxenv"+lstaxenv);
amthdr =payTranMap.get("amount").toString();
System.out.println("amounthdr in voucher creation "+amthdr);
lcamthdr = amthdr == null ? 0 : Double.parseDouble(amthdr);
lspaymode = checkNull(payTranMap.get("pay_mode").toString());
if( lsremarks == null || lsremarks.trim().length() == 0 )
......@@ -2521,8 +2622,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
System.out.println("Successfully INSERT into Payrol Voucher..................");
for(int n = 0;n < payDetailList.size();n++)
{
System.out.println("@@@@@@payDetailList.size()@@@@@@@@@@@@@" + payDetailList.size());
//for(int n = 0;n < payDetailList.size();n++)
// {
String lilineno1="",lcamt1="";
HashMap payDetTranMap = (HashMap)payDetailList.get(0);
lilineno1 = payDetTranMap.get("line_no").toString();
......@@ -2532,7 +2634,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
lstype = payDetTranMap.get("amt_type").toString();
lcamt1 = payDetTranMap.get("amount").toString();
lcamt= lcamt1 == null ? 0 : Double.parseDouble(lcamt1);
System.out.println("lcamt Det" +lcamt);
if(lstype.equalsIgnoreCase("F"))
{
lcamount = lcamt;
......@@ -2561,7 +2663,26 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
xmlString = xmlBuff.toString();
System.out.println("@@@@@2: xmlString:"+xmlBuff.toString());
// System.out.println("@@@@@2: xmlString:"+xmlBuff.toString());
// System.out.println("...............just before savdata()");
// String siteCode="";
// siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
// System.out.println("== site code =="+siteCode);
// retString = saveData(siteCode,xmlString,conn);
// System.out.println("@@@@@2: retString:"+retString);
// System.out.println("--retString finished--");
// if (retString.indexOf("Success") > -1)
// {
// System.out.println("Voucher is Generated retString [" + retString + "]");
// }
// else
// {
// conn.rollback();
// return retString;
// }
// }
System.out.println("@@@@@2: xmlString:"+xmlBuff.toString());
System.out.println("...............just before savdata()");
String siteCode="";
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
......@@ -2569,53 +2690,16 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
retString = saveData(siteCode,xmlString,conn);
System.out.println("@@@@@2: retString:"+retString);
System.out.println("--retString finished--");
/*if (retString.indexOf("Success") > -1)
{
String[] arrayForTranId1 = retString.split("<TranID>");
System.out.println("Tran ID :::::in conf:::::::"+arrayForTranId1);
System.out.println("Tran ID :::::in conf:::::::"+arrayForTranId1[1]);
int endIndex1 = arrayForTranId1[1].indexOf("</TranID>");
System.out.println("endIndex1:::::::"+endIndex1);
tranIdPe = arrayForTranId1[1].substring(0, endIndex1);
System.out.println("invoiceId=====["+tranIdPe+"]");
}else
{
System.out.println("not Successfully");
}
/*
System.out.println("postVouch.equalsIgnoreCase()"+postVouch);
if(errString.length()==0 && postVouch.equalsIgnoreCase("Y"));
if (retString.indexOf("Success") > -1)
{
System.out.println("PostVoucher"+ postVouch);
errString = Conf.confirm(tranIdPe, xtraParams, forcedFlag,conn); //nvo_miscvouch.gbf_retrieve_misc_vou(lstr_pur_exp_reco.voucher_no, lstr_pur_exp_reco.voucher_no,2,ls_errcode,ls_site_code)
System.out.println("Voucher is Generated retString [" + retString + "]");
}
Conf = null;
if(errString.indexOf("CONFSUCCES") > -1)
{
System.out.println("Sucessfully");
}
if(errString != null && errString.trim().length() > 0)
else
{
System.out.println("Return errString");
return errString;
conn.rollback();
return retString;
}
tranIdPe="";
if(postVouch.equalsIgnoreCase("N"))
{
System.out.println("Post Voucher N");
}*/
}
}
catch (SQLException sqx)
{
System.out.println("The SQLException occurs in PayrollVoucherComPrc :"+sqx);
sqx.printStackTrace();
throw new ITMException(sqx);
}
catch(Exception e)
{
......
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