Skip to content

B
business-java
Commit bb2a182a authored by agaikwad's avatar agaikwad
Browse files
Options

latest Version code merge in Head 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103683 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b6b5978a
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/PayVoucherComPrc.java
View file @ bb2a182a
...@@ -3140,7 +3140,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3140,7 +3140,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
return errString; return errString;
} }
private String gfmiscvoucherpe( String winname, String ref,ArrayList payHeadList, String lsvouchtype, ArrayList payDetailList, double lctaxamt,Timestamp currDate,String lssundrytype,String lsremarks,String ldlrdate, String lsbillno, String AstranId,String xtraParams, String postVouch,String billdate1,Connection conn)throws ITMException private String gfmiscvoucherpe( String winname, String ref,ArrayList payHeadList, String lsvouchtype, ArrayList payDetailList, double lctaxamt,Timestamp currDate,String lssundrytype,String lsremarks,String ldlrdate, String lsbillno, String tranId,String xtraParams, String postVouch,String billdate1,Connection conn)throws ITMException
{ {
String sql=""; String sql="";
PreparedStatement pstmt = null,pstmt1=null; PreparedStatement pstmt = null,pstmt1=null;
...@@ -3155,6 +3155,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3155,6 +3155,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
String lsarg1="", lsarg2="", lsacctcodedet="", lscctrcodedet="", lsempcodedet=""; String lsarg1="", lsarg2="", lsacctcodedet="", lscctrcodedet="", lsempcodedet="";
String lsanalcodedet="", lskeystr="", lstype="", lstaxclass="", lstaxchap=""; String lsanalcodedet="", lskeystr="", lstype="", lstaxclass="", lstaxchap="";
String lstaxenv="", lsapply="", lsankeycol="", lsoedittax=""; String lstaxenv="", lsapply="", lsankeycol="", lsoedittax="";
String tranIdPe="";
String lsacctcf="" , lscctrcf="",lsacctadv="",lscctradv="",lsrndoff="",amthdr="",dateStr=""; String lsacctcf="" , lscctrcf="",lsacctadv="",lscctradv="",lsrndoff="",amthdr="",dateStr="";
Timestamp ldtrandt=null, ldeffdt=null, ldbilldt=null, ldchgdt=null, ldtaxdt=null,ld_duedate=null; Timestamp ldtrandt=null, ldeffdt=null, ldbilldt=null, ldchgdt=null, ldtaxdt=null,ld_duedate=null;
double lcadvamt=0, lcbillamt=0, lctotamt=0, lc_amthdr=0, lcamt=0, lctaxdet=0, lcnetamtbc=0, lcnetamt=0, lctottax=0, lcamount=0; double lcadvamt=0, lcbillamt=0, lctotamt=0, lc_amthdr=0, lcamt=0, lctaxdet=0, lcnetamtbc=0, lcnetamt=0, lctottax=0, lcamount=0;
...@@ -3171,7 +3172,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3171,7 +3172,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
String xmlString = null,retString = null; String xmlString = null,retString = null;
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
SimpleDateFormat sddTemp = null; SimpleDateFormat sddTemp = null;
String tranIdPe="";
java.util.Date currDate1 = new java.util.Date(System.currentTimeMillis()); java.util.Date currDate1 = new java.util.Date(System.currentTimeMillis());
try try
{ {
...@@ -3192,6 +3192,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3192,6 +3192,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("keyString :["+keyString+"]");
System.out.println("keyCol :["+keyCol+"]");
System.out.println("tranSer :["+tranSer+"]");
//String traniD=tranIdPe; //String traniD=tranIdPe;
sddTemp=new SimpleDateFormat(genericUtility.getApplDateFormat()); sddTemp=new SimpleDateFormat(genericUtility.getApplDateFormat());
dateStr = sddTemp.format(currDate1); dateStr = sddTemp.format(currDate1);
...@@ -3274,7 +3277,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3274,7 +3277,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
ldduedate = utilMethod.RelativeDate(ldeffdt,licrdays); ldduedate = utilMethod.RelativeDate(ldeffdt,licrdays);
if (ldduedt.after(ldtrandt)) if (ldduedt.after(ldtrandt))
ldduedt = ldduedate; ldduedt = ldduedate;
lsorderef=AstranId; lsorderef=tranId;
System.out.println("lsorderef is["+lsorderef+"]"); System.out.println("lsorderef is["+lsorderef+"]");
lssitecode = checkNull(payTranMap.get("site_code").toString()); lssitecode = checkNull(payTranMap.get("site_code").toString());
lsacctcf = checkNull(payTranMap.get("acct_code__cf").toString()); lsacctcf = checkNull(payTranMap.get("acct_code__cf").toString());
...@@ -3282,11 +3285,11 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3282,11 +3285,11 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
payTranMap.clear(); payTranMap.clear();
payHeadList.clear(); payHeadList.clear();
System.out.println("site_code :["+lssitecode+"] // tran_type["+lstrantype+"] // tran_date["+dateStr+"] // vouch_type["+lsvouchtype+"] // sundry_type["+lssundrytype+"]"); /* String xmlValues = "";
String xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>"; xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + lssitecode + "</site_code>"; xmlValues = xmlValues + "<site_code>" + lssitecode + "</site_code>";
xmlValues = xmlValues + "<tran_type>" + lstrantype + "</tran_type>"; xmlValues = xmlValues + "<tran_type>" + lstrantype + "</tran_type>";
xmlValues = xmlValues + "<tran_date>" + dateStr + "</tran_date>"; xmlValues = xmlValues + "<tran_date>" + dateStr + "</tran_date>";
...@@ -3294,11 +3297,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3294,11 +3297,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
xmlValues = xmlValues + "<sundry_type>" + lssundrytype + "</sundry_type>"; xmlValues = xmlValues + "<sundry_type>" + lssundrytype + "</sundry_type>";
xmlValues = xmlValues + "</Detail1></Root>"; xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]"); System.out.println("xmlValues :["+xmlValues+"]");
System.out.println("tranSer :["+tranSer+"] // keyCol["+keyCol+"] // keyString["+keyString+"]");
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME); TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranIdPe = tg.generateTranSeqID(tranSer, keyCol, keyString, conn); tranIdPe = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
System.out.println("tranId :"+tranIdPe); System.out.println("tranId MiscVoucher:"+tranIdPe);*/
sql="select fin_entity from site where site_code = ? "; sql="select fin_entity from site where site_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lssitecode); pstmt.setString(1,lssitecode);
...@@ -3380,7 +3381,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3380,7 +3381,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
xmlBuff.append("<description>").append("Header0 members").append("</description>"); xmlBuff.append("<description>").append("Header0 members").append("</description>");
xmlBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_voucher\" objContext=\"1\">"); xmlBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_voucher\" objContext=\"1\">");
xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>"); xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
xmlBuff.append("<tran_id><![CDATA[" + tranIdPe + "]]></tran_id>"); //xmlBuff.append("<tran_id><![CDATA[" + tranIdPe + "]]></tran_id>");
xmlBuff.append("<tran_id><![CDATA[]]></tran_id>");
//xmlBuff.append("<tran_date><![CDATA[" + sdf.format(new java.util.Date()).toString() + "]]></tran_date>"); //xmlBuff.append("<tran_date><![CDATA[" + sdf.format(new java.util.Date()).toString() + "]]></tran_date>");
xmlBuff.append("<tran_date><![CDATA[" + dateStr + "]]></tran_date>"); xmlBuff.append("<tran_date><![CDATA[" + dateStr + "]]></tran_date>");
if(lstrantype==null) if(lstrantype==null)
...@@ -3553,7 +3555,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca ...@@ -3553,7 +3555,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
lsapply = checkNull(payDetTranMap.get("apply_tax").toString()); lsapply = checkNull(payDetTranMap.get("apply_tax").toString());
xmlBuff.append("<Detail3 dbID='' domID=\"1\" objName=\"misc_voucher\" objContext=\"2\">"); xmlBuff.append("<Detail3 dbID='' domID=\"1\" objName=\"misc_voucher\" 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><![CDATA["+tranIdPe +"]]></tran_id>"); // xmlBuff.append("<tran_id><![CDATA["+tranIdPe +"]]></tran_id>");
xmlBuff.append("<tran_id><![CDATA[]]></tran_id>");
xmlBuff.append("<line_no><![CDATA["+lilineno1+"]]></line_no>"); xmlBuff.append("<line_no><![CDATA["+lilineno1+"]]></line_no>");
xmlBuff.append("<acct_code><![CDATA["+ lsacctcodedet +"]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA["+ lsacctcodedet +"]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA["+ lscctrcodedet +"]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA["+ lscctrcodedet +"]]></cctr_code>");
......
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