Commit 6074c171 authored by ngadkari's avatar ngadkari

removed ' ' from error code

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199606 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c9c01def
......@@ -3530,11 +3530,17 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
HashMap commissionMap = null;
HashMap commPercMap = null;
HashMap commPercSalesMap=null;
String sOrdLineNo="";//added by nandkumar gadkari on 15/04/19
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
try
{
commissionMap = new HashMap();
saleOrder=(String) calcCommission.get("sord_no");
// added by nandkumar gadkari on 15/04/19--------------start-------------------
sOrdLineNo=(String) calcCommission.get("line_no__sord");
sOrdLineNo=" "+checknull(sOrdLineNo).trim();
sOrdLineNo=sOrdLineNo.substring(sOrdLineNo.length()-3, sOrdLineNo.length());
// added by nandkumar gadkari on 15/04/19--------------end-------------------
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Get data from sale order...
sql ="SELECT dlv_term,curr_code,exch_rate,exch_rate__frt,exch_rate__ins," +
......@@ -3600,7 +3606,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
"tax_amt,net_amt FROM sorddet WHERE sale_order = ? AND line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
pstmt.setString(2,lineNo);
pstmt.setString(2,sOrdLineNo);//desptch line no removed and sorder line set by nandkumar gadkari on 15/04/19
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -3848,7 +3854,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
if(netAmt<=0 && Double.parseDouble(calcCommission.get("desp_rate__stduom").toString()) >0)
{
//errString = itmDBAccessLocal.getErrorString("","''VTCOMMERR''","");
errString = itmDBAccessLocal.getErrorString("", "''VTCOMMERR''", "", "", conn);
errString = itmDBAccessLocal.getErrorString("", "VTCOMMERR", "", "", conn);//removed '' from error msg by nandkumar gadkari on 15/04/19
commPercMap.put("errorStr", errString);
return commPercMap;
}
......@@ -3859,7 +3865,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
if(netAmt <= 0)
{
//errString = itmDBAccessLocal.getErrorString("","''VTCOMMERR''","");
errString = itmDBAccessLocal.getErrorString("", "''VTCOMMERR''", "", "", conn);
errString = itmDBAccessLocal.getErrorString("", "VTCOMMERR", "", "", conn);//removed '' from error msg by nandkumar gadkari on 15/04/19
commPercMap.put("errorStr", errString);
return commPercMap;
......@@ -4310,7 +4316,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
sql="SELECT ddf_get_tax_detail('S-ORD',sale_order,line_no,'EXC_TAX_CODE','A') AS asses_amt FROM sorddet WHERE sale_order = ? AND line_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
pstmt.setString(2,lineNo);
pstmt.setString(2,sOrdLineNo);//desptch line no removed and sorder line set by nandkumar gadkari on 15/04/19
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -4347,7 +4353,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
sql="SELECT ddf_get_tax_detail('S-ORD',sale_order,line_no,'SALE_TAX_CODE','A') as sales_amt FROM sorddet WHERE sale_order = ? AND line_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
pstmt.setString(2,lineNo);
pstmt.setString(2,sOrdLineNo);//desptch line no removed and sorder line set by nandkumar gadkari on 15/04/19
rs = pstmt.executeQuery();
if(rs.next())
{
......
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