Skip to content

B
business-java
Commit d90ba686 authored by prane's avatar prane
Browse files
Options

changes done for issue tracker no:246,248,250 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@184133 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ad1c0f7d
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 17 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractReleasePrc.java
View file @ d90ba686
...@@ -1579,18 +1579,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1579,18 +1579,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
//totTax = 0; //totTax = 0;
//analCode = ""; //analCode = "";
//empCode = ""; //empCode = "";
System.out.println("[1]"+netAmt+"[2]"+netAmtBc+"[3]"+billAmt+"[4]"+totTax+"[5]"+totAmt+"[6]"+totTax+"[7]"+billAmt+"[8]"+tranId); System.out.println("[1]"+netAmt+"[2]"+netAmtBc+"[3]"+billAmt+"[4]"+totTax+"[5]"+totAmt+"[6]"+totTax+"[7]"+billAmt+"[8]"+tranId);
// updating misc voucher header related values sql = "update misc_voucher set bill_amt = ? supp_bill_amt = ? where tran_id = ? ";
sql = "update misc_voucher set net_amt = ?, net_amt__bc = ?, bill_amt = ?, tax_amt = ?," + pstmt = conn.prepareStatement(sql);
" tot_amt = ?, supp_bill_amt = ? where tran_id = ? "; pstmt.setDouble(1, billAmt);
pstmt = conn.prepareStatement(sql); pstmt.setDouble(2, billAmt);
pstmt.setDouble(1, netAmt); pstmt.setString(3, tranId);
pstmt.setDouble(2, netAmtBc);
pstmt.setDouble(3, billAmt);
pstmt.setDouble(4, totTax);
pstmt.setDouble(5, totAmt);
pstmt.setDouble(6, billAmt);
pstmt.setString(7, tranId);
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -1651,7 +1645,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1651,7 +1645,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
taxClass = "", taxChap = "", taxEnv = "", apply = "", anKeyCol = "", taxClass = "", taxChap = "", taxEnv = "", apply = "", anKeyCol = "",
oEditTax = "", arg1 = "", arg2 = "", rndOff = "", analCode1 = "", analCode2 = "", deptCode = "", oEditTax = "", arg1 = "", arg2 = "", rndOff = "", analCode1 = "", analCode2 = "", deptCode = "",
remarksDet = "", taxClassDet = "", taxChapDet = "", taxEnvDet = "", bankCode = "", projCode = "", billNo = "", temp = "", billDateStr = "", lineNo = ""; remarksDet = "", taxClassDet = "", taxChapDet = "", taxEnvDet = "", bankCode = "", projCode = "", billNo = "", temp = "", billDateStr = "", lineNo = "";
String xmlString = "", tranIDSer = "", errString = "", stringxmlInvString=""; String xmlString = "", tranIDSer = "", errString = "", stringxmlInvString="",fromDateStr="",toDateStr="";
Timestamp tranDate = null, effDate = null, chgDate = null, dueDate = null , currDate= null, releaseFrDt = null, releaseToDt = null, taxDate = null, relDate = null, effDate1 = null, billDate = null; Timestamp tranDate = null, effDate = null, chgDate = null, dueDate = null , currDate= null, releaseFrDt = null, releaseToDt = null, taxDate = null, relDate = null, effDate1 = null, billDate = null;
Double amount = 0.0, amt = 0.0, amountDet = 0.0, taxDet = 0.0, netAmtBc = 0.0, Double amount = 0.0, amt = 0.0, amountDet = 0.0, taxDet = 0.0, netAmtBc = 0.0,
netAmt = 0.0, totTax = 0.0, billAmt= 0.0, exchRate = 0.0, rndTo = 0.0, amtBase = 0.0 ; netAmt = 0.0, totTax = 0.0, billAmt= 0.0, exchRate = 0.0, rndTo = 0.0, amtBase = 0.0 ;
...@@ -1685,7 +1679,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1685,7 +1679,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
} }
System.out.println("[relDateStr:"+relDateStr+"][relDate"+relDate+"][effDate1Str:"+effDate1Str+"]"); System.out.println("[relDateStr:"+relDateStr+"][relDate"+relDate+"][effDate1Str:"+effDate1Str+"]");
fromDateStr = checkNull(genericUtility.getColumnValue("date__fr", headerDom));
toDateStr = genericUtility.getColumnValue("date__to", headerDom);
System.out.println("----miscVouchAR---hdrMap["+hdrMap+"]"); System.out.println("----miscVouchAR---hdrMap["+hdrMap+"]");
tranType = hdrMap.get("contract_type"); tranType = hdrMap.get("contract_type");
sundryCode = hdrMap.get("sundry_code"); sundryCode = hdrMap.get("sundry_code");
...@@ -1842,7 +1838,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1842,7 +1838,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>"); xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
xmlBuff.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>"); xmlBuff.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
xmlBuff.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>"); xmlBuff.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
xmlBuff.append("<remarks>").append("<![CDATA[" + "#" +contractId + ", Autogenerated" + "]]>").append("</remarks>"); xmlBuff.append("<remarks>").append("<![CDATA[" + "Against contract id:"+contractId+" from "+fromDateStr+" to "+toDateStr+" "+"]]>").append("</remarks>");
xmlBuff.append("<drcr_flag>").append("<![CDATA[" + drCrFlag + "]]>").append("</drcr_flag>"); xmlBuff.append("<drcr_flag>").append("<![CDATA[" + drCrFlag + "]]>").append("</drcr_flag>");
xmlBuff.append("<tran_id__rcv>").append("<![CDATA[" + tranIdRcv + "]]>").append("</tran_id__rcv>"); xmlBuff.append("<tran_id__rcv>").append("<![CDATA[" + tranIdRcv + "]]>").append("</tran_id__rcv>");
xmlBuff.append("<confirmed>").append("<![CDATA[" + confirmed + "]]>").append("</confirmed>"); xmlBuff.append("<confirmed>").append("<![CDATA[" + confirmed + "]]>").append("</confirmed>");
...@@ -2060,7 +2056,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -2060,7 +2056,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
Timestamp currDate=null, relDate=null, effDate1=null,chgDate=null; Timestamp currDate=null, relDate=null, effDate1=null,chgDate=null;
int lineNo = 0; int lineNo = 0;
String chgUser = "", chgTerm = "", tranIDSer = "", siteCode = "",finEntity="", errCode= "", String chgUser = "", chgTerm = "", tranIDSer = "", siteCode = "",finEntity="", errCode= "",
sql = "", currCode="",projCode="",refNo=""; sql = "", currCode="",projCode="",refNo="",fromDateStr="",toDateStr="";
String cctrCode = "", acctCode="",contractType="",acctCodeDet="",cctrCodeDet="",loginSite="",today=""; String cctrCode = "", acctCode="",contractType="",acctCodeDet="",cctrCodeDet="",loginSite="",today="";
double exchRate = 0.0,amount=0.0, amountDet=0.0, totAmt = 0.0; double exchRate = 0.0,amount=0.0, amountDet=0.0, totAmt = 0.0;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -2084,6 +2080,8 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -2084,6 +2080,8 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
if(effDate1Str != null) { if(effDate1Str != null) {
effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
} }
fromDateStr = checkNull(genericUtility.getColumnValue("date__fr", headerDom));
toDateStr = genericUtility.getColumnValue("date__to", headerDom);
siteCode = hdrMap.get("site_code"); siteCode = hdrMap.get("site_code");
acctCode = hdrMap.get("acct_code"); acctCode = hdrMap.get("acct_code");
...@@ -2163,7 +2161,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -2163,7 +2161,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>"); xmlBuff.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
xmlBuff.append("<dr_amt>").append("<![CDATA[" + amount + "]]>").append("</dr_amt>"); xmlBuff.append("<dr_amt>").append("<![CDATA[" + amount + "]]>").append("</dr_amt>");
xmlBuff.append("<cr_amt>").append("<![CDATA[" + amount + "]]>").append("</cr_amt>"); xmlBuff.append("<cr_amt>").append("<![CDATA[" + amount + "]]>").append("</cr_amt>");
xmlBuff.append("<remarks>").append("<![CDATA[" +"#" +contractId + ", Autogenerated" + "]]>").append("</remarks>"); xmlBuff.append("<remarks>").append("<![CDATA[" + "Against contract id:"+contractId+" from "+fromDateStr+" to "+toDateStr+" "+"]]>").append("</remarks>");
xmlBuff.append("<reversible>").append("<![CDATA[" + "N" + "]]>").append("</reversible>"); xmlBuff.append("<reversible>").append("<![CDATA[" + "N" + "]]>").append("</reversible>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>"); xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
/*xmlBuff.append("<chg_date>").append("<![CDATA[" + today + "]]>").append("</chg_date>"); /*xmlBuff.append("<chg_date>").append("<![CDATA[" + today + "]]>").append("</chg_date>");
......
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