Skip to content

B
business-java
Commit 93ddfe8f authored by smanohar's avatar smanohar
Browse files
Options

single commit kept and all other intermediate commit removed 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217282 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 644e4dce
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 6 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/PorderConf.java
View file @ 93ddfe8f
...@@ -223,14 +223,24 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -223,14 +223,24 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
return errString; return errString;
} }
else else
{
if (isLocalConnection) // 28-feb-2020 manoharan to consider local connection (isLocalConnection)
{ {
conn.commit(); conn.commit();
if(errString == null || errString.trim().length() == 0)
{
System.out.println("Inside gbfPorderAdvance....."+errString);
errString = gbfPorderAdvance(pOrder,0,"PO",xtraParams,conn); // xtraParams ADDED BY NANDKUMAR GADKARI ON 11/03/19
} }
errString = itmDBAccessLocal.getErrorString("", "VTCNFSUCC", "","",conn); System.out.println(" gbfPorderAdvance errString....."+errString);
if (errString != null && errString.trim().length() > 0)
{
conn.rollback();
return errString;
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
if(conn!=null) if(conn!=null)
...@@ -251,7 +261,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -251,7 +261,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
try try
{ {
System.out.println( ">>>>>>>>>>>>>In finaly errString:"+errString); System.out.println( ">>>>>>>>>>>>>In finaly errString:"+errString);
if (errString != null && errString.trim().length() > 0 && !("d".equalsIgnoreCase(errString))) if (errString != null && errString.trim().length() > 0 ) //&& !("d".equalsIgnoreCase(errString)))
{ {
if (isLocalConnection)// 28-feb-2020 manoharan to consider local connection (isLocalConnection) if (isLocalConnection)// 28-feb-2020 manoharan to consider local connection (isLocalConnection)
{ {
...@@ -274,6 +284,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -274,6 +284,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
if (isLocalConnection)// 28-feb-2020 manoharan to consider local connection (isLocalConnection) if (isLocalConnection)// 28-feb-2020 manoharan to consider local connection (isLocalConnection)
{ {
conn.commit(); conn.commit();
errString = itmDBAccessLocal.getErrorString("", "VTCNFSUCC", "","",conn);
} }
System.out.println("@@@@ Transaction commit... "); System.out.println("@@@@ Transaction commit... ");
conn.close(); conn.close();
...@@ -952,12 +963,14 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -952,12 +963,14 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
return errString; return errString;
} }
System.out.println("isError>>"+isError); System.out.println("isError>>"+isError);
if((errString == null || errString.trim().length() == 0) && isError == false) // 28-feb-2020 manoharan voucher validation fails
/*if((errString == null || errString.trim().length() == 0) && isError == false)
{ {
System.out.println("Inside gbfPorderAdvance....."+errString); System.out.println("Inside gbfPorderAdvance....."+errString);
errString = gbfPorderAdvance(pOrder,0,"PO",xtraParams,conn); // xtraParams ADDED BY NANDKUMAR GADKARI ON 11/03/19 errString = gbfPorderAdvance(pOrder,0,"PO",xtraParams,conn); // xtraParams ADDED BY NANDKUMAR GADKARI ON 11/03/19
} }
System.out.println(" gbfPorderAdvance errString....."+errString); System.out.println(" gbfPorderAdvance errString....."+errString);
*/
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
conn.rollback(); conn.rollback();
...@@ -4411,6 +4424,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -4411,6 +4424,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
xmlBuff.append("<line_no>"+(1)+"</line_no>"); xmlBuff.append("<line_no>"+(1)+"</line_no>");
xmlBuff.append("<acct_code><![CDATA[" + acctApAdv + "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA[" + acctApAdv + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrApAdv + "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + cctrApAdv + "]]></cctr_code>");
xmlBuff.append("<exch_rate><![CDATA[" + exch + "]]></exch_rate>");
xmlBuff.append("<amount><![CDATA[" + advPerc + "]]></amount>"); xmlBuff.append("<amount><![CDATA[" + advPerc + "]]></amount>");
xmlBuff.append("<tax_chap><![CDATA[" +taxChap + "]]></tax_chap>"); xmlBuff.append("<tax_chap><![CDATA[" +taxChap + "]]></tax_chap>");
xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>"); xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>");
...@@ -4908,6 +4922,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por ...@@ -4908,6 +4922,7 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
xmlBuff.append("<line_no>"+(1)+"</line_no>"); xmlBuff.append("<line_no>"+(1)+"</line_no>");
xmlBuff.append("<acct_code><![CDATA[" + acctApAdv + "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA[" + acctApAdv + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrApAdv + "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + cctrApAdv + "]]></cctr_code>");
xmlBuff.append("<exch_rate><![CDATA[" + exch + "]]></exch_rate>");
xmlBuff.append("<amount><![CDATA[" + advPerc + "]]></amount>"); xmlBuff.append("<amount><![CDATA[" + advPerc + "]]></amount>");
xmlBuff.append("<tax_chap><![CDATA[" +taxChap + "]]></tax_chap>"); xmlBuff.append("<tax_chap><![CDATA[" +taxChap + "]]></tax_chap>");
xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>"); xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>");
......
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