Commit df5e69e0 authored by cpatil's avatar cpatil

modify


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@36532 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a4c27f1a
......@@ -1242,7 +1242,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
if(advtype.equalsIgnoreCase("01"))
{
calRelAmt=(ordamt * advperc)/100; // change by cpatil ordAmt to ordamt
calRelAmt=(ordamt * advperc)/100; // change by cpatil ordAmt to ordamt on 15/07/15
}
else if(advtype.equalsIgnoreCase("02"))
{
......
......@@ -223,6 +223,9 @@ import javax.xml.rpc.ParameterMode;
amount = Double.parseDouble(genericUtility.getColumnValue("amount",xmlDataAllDom)==null?"":genericUtility.getColumnValue("amount",xmlDataAllDom));
paymentOpt = genericUtility.getColumnValue("payment_opt",xmlDataAllDom);
System.out.println("@@@@ paymentOpt["+paymentOpt+"]amount["+amount+"]");
String complDateStr = checkNull(genericUtility.getColumnValue("compl_date",xmlDataAllDom));
// xml end
/*
......@@ -235,8 +238,7 @@ import javax.xml.rpc.ParameterMode;
}
*/
//timeDiff = 3;
System.out.println("tranId["+tranId+"]tranType["+tranType+"]timeDiff["+timeDiff+"]paymentOpt["+paymentOpt+"]taskCode["+taskCode+"]");
System.out.println("tranId["+tranId+"]tranType["+tranType+"]timeDiff["+timeDiff+"]paymentOpt["+paymentOpt+"]taskCode["+taskCode+"]complDateStr["+complDateStr+"]");
if( "P".equalsIgnoreCase(tranType))
{ // voucher created for tran type 'P'
......@@ -377,9 +379,11 @@ import javax.xml.rpc.ParameterMode;
xmlBuff.append( "<emp_code__aprv><![CDATA[]]></emp_code__aprv>");
xmlBuff.append( "<wf_status><![CDATA[S]]></wf_status>");
xmlBuff.append( "<status_date><![CDATA[]]></status_date>");
xmlBuff.append( "<compl_date><![CDATA[]]></compl_date>");
//xmlBuff.append( "<compl_date><![CDATA[]]></compl_date>");
xmlBuff.append( "<compl_date><![CDATA["+complDateStr+"]]></compl_date>");
xmlBuff.append( "<allow_override><![CDATA["+allowOverride+"]]></allow_override>");
xmlBuff.append( "<amount_orig><![CDATA["+amountOrig+"]]></amount_orig>");
xmlBuff.append( "<date_format><![CDATA["+genericUtility.getApplDateFormat()+"]]></date_format>");
xmlBuff.append( "<add_user><![CDATA["+chgUser+"]]></add_user>");
xmlBuff.append( "<add_date><![CDATA["+ sdf.format(currentDate).toString() +"]]></add_date>");
xmlBuff.append( "<add_term><![CDATA["+chgTerm+"]]></add_term>");
......@@ -467,7 +471,7 @@ import javax.xml.rpc.ParameterMode;
int cnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
System.out.println("@@@@@ updated sucessfully pur_milstn tranId["+tranId+"]tranIdForVoucher["+tranIdForVoucher+"]cnt["+cnt+"]");
System.out.println("@@@@@ updated sucessfully pur_milstn tranId["+tranId+"]tranIdForDebit["+tranIdForDebit+"]cnt["+cnt+"]");
// conn.commit();
}
else
......@@ -825,7 +829,7 @@ import javax.xml.rpc.ParameterMode;
purcOrder=purcOrder==null ? "" :purcOrder.trim();
currCode=currCode==null ? "" :currCode.trim();
acctCode=acctCode==null ? "" :acctCode.trim();
cctrCode=cctrCode==null ? "" :cctrCode.trim();
cctrCode=cctrCode==null ? " " :cctrCode;
// bankCode=bankCode==null ? "" :bankCode.trim();
siteCode=siteCode==null ? "" :siteCode.trim();
// finEntity=finEntity==null ? "" :finEntity.trim();
......@@ -918,7 +922,7 @@ import javax.xml.rpc.ParameterMode;
taxEnvDet=taxEnvDet==null ? "" :taxEnvDet.trim();
System.out.println("taxEnvDet :"+taxEnvDet);
acctCodeDr=acctCodeDr==null ? "" :acctCodeDr.trim();
cctrCodeDr=cctrCodeDr==null ? "" :cctrCodeDr.trim();
cctrCodeDr=cctrCodeDr==null ? " " :cctrCodeDr;
System.out.println("lineNoDet :"+lineNoDet);
// System.out.println("acctCdDet :"+acctCdDet);
......@@ -991,7 +995,7 @@ import javax.xml.rpc.ParameterMode;
xmlBuff.append("<fin_entity><![CDATA[" + finEntity.trim()+ "]]></fin_entity>");
xmlBuff.append("<supp_code><![CDATA[" + suppCode.trim()+ "]]></supp_code>");
xmlBuff.append("<acct_code><![CDATA[" + acctCode.trim()+ "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrCode.trim()+ "]]></cctr_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrCode+ "]]></cctr_code>");
if(effDate == null)
{
xmlBuff.append("<eff_date><![CDATA[" + sdf.format(currentDate).toString() + "]]></eff_date>");
......@@ -1070,7 +1074,7 @@ import javax.xml.rpc.ParameterMode;
xmlBuff.append("<net_amt><![CDATA["+pentlyAmt+"]]></net_amt>");
xmlBuff.append("<reas_code><![CDATA[]]></reas_code>");
xmlBuff.append("<acct_code><![CDATA["+acctCodeDr.trim()+"]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA["+cctrCodeDr.trim()+"]]></cctr_code>");
xmlBuff.append("<cctr_code><![CDATA["+cctrCodeDr+"]]></cctr_code>");
xmlBuff.append("<amount><![CDATA["+pentlyAmt+"]]></amount>");
// xmlBuff.append("<analysis3><![CDATA["+vocDetMap.get("analysis3" + itemCtr)+"]]></analysis3>");
// xmlBuff.append("<analysis2><![CDATA["+vocDetMap.get("analysis2" + itemCtr)+"]]></analysis2>");
......
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