Commit bcff2618 authored by manohar's avatar manohar

In case std_rate is -1, take the rate__stduom


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93843 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cfe425a1
......@@ -48,7 +48,7 @@ public class InvAcct
int qcCount = 0;
String finEntity = "", acctAP = "", cctrAP = "", acctAdCost = "", cctrAdCost = "";
String acctFreCost = "", cctrFreCost = "", acctCleCost = "", cctrCleCost = "", acctInsCost = "", cctrInsCost = "";
double amountCR = 0, netAmount = 0, addAmount = 0, quantity = 0, stdRate = 0, grAmount = 0, recoAmount = 0, stdAmount = 0;
double amountCR = 0, netAmount = 0, addAmount = 0, quantity = 0, stdRate = 0, grAmount = 0, recoAmount = 0, stdAmount = 0, rateStduom = 0;
String itemCode = "", lineNo = "", acctCodeCR = "", acctCodeDR = "", cctrCodeCR = "", cctrCodeDR = "", tranSer = "";
String deptCode = "", acctCodeProvDR = "", acctCodeProvCR = "", cctrCodeProvDR = "", cctrCodeProvCR = "", mapKey = "";
......@@ -313,7 +313,7 @@ public class InvAcct
+ " acct_code__cr, acct_code__dr, "
+ " cctr_code__cr, cctr_code__dr, (case when net_amt is null then 0 else net_amt end) as net_amt, "
+ " (case when additional_cost is null then 0 else additional_cost end) as additional_cost, "
+ " quantity, std_rate, dept_code, "
+ " quantity, std_rate,rate__stduom, dept_code, "
+ " acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr "
+ " from porcpdet where tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
......@@ -335,6 +335,13 @@ public class InvAcct
addAmount = rs.getDouble("additional_cost");
quantity = rs.getDouble("quantity");
stdRate = rs.getDouble("std_rate");
// 06/11/13 manoharan as per change in PB code
rateStduom = rs.getDouble("rate__stduom");
if (stdRate == -1)
{
stdRate = rateStduom;
}
// end 06/11/13 manoharan as per change in PB code
deptCode = rs.getString("dept_code");
acctCodeProvDR = rs.getString("acct_code__prov_dr");
acctCodeProvCR = rs.getString("acct_code__prov_cr");
......
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