Skip to content

B
business-java
Commit bfe50aae authored by arawankar's avatar arawankar
Browse files
Options

PoRcpConf.java 

-Changes made to throw exception from all methods
- Changes made in confirm method(without connection)

PostOrderIC.java
-Changes made to set club order and club order pending from disparam table.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@192307 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ffb83db0
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 5 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrderIC.java
View file @ bfe50aae
......@@ -92,8 +92,11 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
* @param objContext represents form number
* @param editFlag represents the mode of transaction(A-Add or E-Edit)
* @param xtraParams contains additional information such as loginEmpCode,loginCode,chgTerm etc
* @throws ITMException
*/
public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams)
//Modified by Anjali R. on [25/10/2018][Throws ITMException]
//public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams)
public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws ITMException
{
System.out.println("wfValData inside ----->>");
NodeList parentNodeList = null;
......@@ -281,6 +284,10 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
catch ( Exception e )
{
System.out.println ( "Exception: PostOrderIC: wfValData( Document currFormDataDom ): " + e.getMessage() + ":" );
//Modified by Anjali R. on [25/10/2018][Start]
e.printStackTrace();
throw new ITMException(e);
//Modified by Anjali R. on [25/10/2018][End]
}
finally
{
......@@ -305,13 +312,20 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
catch(Exception e)
{
System.out.println( "Exception : PostOrderIC : " + e.getMessage() );
//Modified by Anjali R. on [25/10/2018][Start]
e.printStackTrace();
throw new ITMException(e);
//Modified by Anjali R. on [25/10/2018][End]
}
}
System.out.println( "errString>>>>>>>::" + errString );
return errString;
}
private String errorType( Connection conn , String errorCode )
//Modified by Anjali R. on [25/10/2018][Throws ITMException]
//private String errorType( Connection conn , String errorCode )
private String errorType( Connection conn , String errorCode ) throws ITMException
{
String msgType = "";
PreparedStatement pstmt = null ;
......@@ -341,6 +355,9 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
catch (Exception ex)
{
ex.printStackTrace();
//Modified by Anjali R. on [25/10/2018][Start]
throw new ITMException(ex);
//Modified by Anjali R. on [25/10/2018][End]
}
finally
{
......@@ -425,6 +442,12 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
int count = 0;
Date ldt_desp_date = null, tempDate = null;
//Modified by Anjali R. on [25/10/2018][Start]
String postOrdClubOrd = "";
String postOrdClubPendOrd = "";
DistCommon distCommon = null;
//Modified by Anjali R. on [25/10/2018][End]
System.out.println("xtraParams=["+xtraParams+"]");
System.out.println("currentColumn inside itemChanged................. : ["+currentColumn+"]");
System.out.println("currentFormNo inside itemChanged................. : ["+currentFormNo+"]");
......@@ -438,6 +461,8 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//currDate = sdf.format(new java.util.Date());
distCommon = new DistCommon();//Modified by Anjali R. on[25/10/2018]
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
userID = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
......@@ -463,6 +488,31 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
valueXmlString.append( "<club_order><![CDATA[" ).append( "N" ).append( "]]></club_order>\r\n" ); // Club Order:
valueXmlString.append( "<club_pend_ord><![CDATA[" ).append( "N" ).append( "]]></club_pend_ord>\r\n" ); // Club Pending Ord:
//Modified by Anjali R. on [25/10/2018][club_order and club_pend_ord values set from disparam][Start]
postOrdClubOrd = checkNull(distCommon.getDisparams("999999", "POSTORD_CLUBORD", conn));
postOrdClubPendOrd = checkNull(distCommon.getDisparams("999999", "POSTORD_CLUBPENDORD", conn));
System.out.println("postOrdClubOrd--["+postOrdClubOrd+"]postOrdClubPendOrd--["+postOrdClubPendOrd+"]");
if((!"Y".equalsIgnoreCase(postOrdClubOrd)) || "NULLFOUND".equalsIgnoreCase(postOrdClubOrd))
{
valueXmlString.append( "<club_order><![CDATA[" ).append( "N" ).append( "]]></club_order>\r\n" );
}
else
{
valueXmlString.append( "<club_order><![CDATA[" ).append(postOrdClubOrd ).append( "]]></club_order>\r\n" );
}
if((!"Y".equalsIgnoreCase(postOrdClubPendOrd)) || "NULLFOUND".equalsIgnoreCase(postOrdClubPendOrd))
{
valueXmlString.append( "<club_pend_ord><![CDATA[" ).append( "N" ).append( "]]></club_pend_ord>\r\n" );
}
else
{
valueXmlString.append( "<club_pend_ord><![CDATA[" ).append(postOrdClubPendOrd ).append( "]]></club_pend_ord>\r\n" );
}
//Modified by Anjali R. on [25/10/2018][club_order and club_pend_ord values set from disparam][End]
//Added By PriyankaC on 11/09/2018 To set By default value from disparm [START].
sql = "SELECT VAR_VALUE FROM DISPARM WHERE PRD_CODE = ? AND VAR_NAME = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -892,6 +942,10 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
catch (Exception e)
{
e.printStackTrace();
//Modified by Anjali R. on [25/10/2018][Start]
e.printStackTrace();
throw new ITMException(e);
//Modified by Anjali R. on [25/10/2018][End]
}
finally
......
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ bfe50aae
......@@ -76,18 +76,109 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
boolean isConn = false;
Connection conn = null;
//Modified by Anjali R. on[24/10/2018][Start]
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
String confirmed = "";
ITMDBAccessEJB itmDBAccessLocal = null;
//Modified by Anjali R. on[24/10/2018][End]
try
{
//Modified by Anjali R. on[24/10/2018][Start]
conn = getConnection();
itmDBAccessLocal = new ITMDBAccessEJB();
//Modified by Anjali R. on[24/10/2018][End]
retString = confirm(tranID, xtraParams, forcedFlag, conn, isConn);
if (retString != null && retString.length() > 0)
//Modified by Anjali R. on[24/10/2018][Start]
sql = "select confirmed from porcp where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
if(rs.next())
{
confirmed = checkNull(rs.getString("confirmed"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(!"Y".equalsIgnoreCase(confirmed))
{
conn.rollback();
if(retString != null && retString.trim().length() > 0)
{
retString = itmDBAccessLocal.getErrorString("", "DS000", "","",conn);
}
}
else
{
throw new Exception("Exception while calling confirm for tran Id:[" + tranID + "]");
conn.commit();
retString = itmDBAccessLocal.getErrorString("", "VTMCONF2", "","",conn);
}
/*if (retString != null && retString.length() > 0 )
{
//throw new Exception("Exception while calling confirm for tran Id:[" + tranID + "]");
}*/
//Modified by Anjali R. on[24/10/2018][End]
} catch (Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
//Added by Anjali R. on[4/10/2018][Start]
try
{
conn.rollback();
}
catch(Exception e)
{
System.out.println("Exception--["+e.getMessage()+"]");
e.printStackTrace();
throw new ITMException(e);
}
exception.printStackTrace();
throw new ITMException(exception);
}
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(conn != null)
{
conn.close();
conn = null;
}
}
catch(Exception e)
{
System.out.println("Exception in finally--["+e.getMessage()+"]");
e.printStackTrace();
throw new ITMException(e);
}
}
//Added by Anjali R. on[4/10/2018][End]
return retString;
}
......@@ -303,6 +394,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
conn.rollback();
} catch (Exception e1)
{
//Modified by Anjali R. on[25/10/2018][Start]
e1.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
throw new ITMException(e1);
//Modified by Anjali R. on[25/10/2018][End]
}
e.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
......@@ -326,6 +422,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on[25/10/2018]
throw new ITMException(e);
}
}
......@@ -436,6 +533,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
retString = itmDBAccessLocal.getErrorString("", "VTLCKERR", "","",conn);
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
jobWorkType = distCommon.getDisparams("999999", "JOBWORK_TYPE", conn);
......@@ -582,6 +680,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
val = Double.parseDouble(value);
} catch (Exception e)
{
//Added by Anjali R. on[4/10/2018][Start]
System.out.println("Exception--["+e.getMessage()+"]");
e.printStackTrace();
throw new ITMException(e);
//Added by Anjali R. on[4/10/2018][End]
}
sql = "SELECT COUNT(*) AS COUNT FROM PORCPDET WHERE TRAN_ID = ? AND ABS( ((CASE WHEN QUANTITY__STDUOM IS NULL THEN 0 ELSE QUANTITY__STDUOM END) * (CASE WHEN RATE__STDUOM IS NULL THEN 0 ELSE RATE__STDUOM END) - (CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) * (CASE WHEN RATE IS NULL THEN 0 ELSE RATE END)) ) > ? ";
......@@ -1181,6 +1284,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
conn.rollback();
} catch (Exception e1)
{
//Added by Anjali R. on[4/10/2018][Start]
e1.printStackTrace();
throw new ITMException(e1);
//Added by Anjali R. on[4/10/2018][End]
}
e.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
......@@ -1204,6 +1311,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on[25/10/2018]
throw new ITMException(e);
}
}
......@@ -2695,6 +2803,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
conn.rollback();
} catch (Exception e1)
{
//Added by Anjali R. on[4/10/2018][Start]
e1.printStackTrace();
throw new ITMException(e1);
//Added by Anjali R. on[4/10/2018][End]
}
e.printStackTrace();
throw new ITMException(e);
......@@ -2730,6 +2842,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
}
......@@ -2803,7 +2916,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
}
} catch (Exception e)
{
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
......@@ -2825,6 +2938,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
currAppdate = new java.text.SimpleDateFormat(genericUtility.getApplDateFormat()).format(currDate).toString();
} catch (Exception e)
{
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
return (currAppdate);
......@@ -2844,6 +2958,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
e.printStackTrace();//Modified by Anjali R. on[25/10/2018]
throw new ITMException(e);
}
return (currDate);
......@@ -2938,6 +3053,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
}
......@@ -3090,6 +3206,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on [25/10/2015]
throw new ITMException(e);
}
}
......@@ -4872,6 +4989,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
}
......@@ -6745,6 +6863,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println("PoRcpConf:autoBackflush( String tranId, Connection conn):" + e.getMessage());
e.printStackTrace();//Modified by Anjali R. on [25/10/2018]
throw new ITMException(e);
}
}
......@@ -7749,6 +7868,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// conn.rollback();
} catch (Exception e1)
{
//Added by Anjali R. on[4/10/2018][Start]
throw new ITMException(e1);
//Added by Anjali R. on[4/10/2018][End]
}
e.printStackTrace();
throw new ITMException(e);
......@@ -7792,6 +7914,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
System.out.println("PoRcpConf : createAssetInstall(String tranId, String orderNo,String logEmpCode, Connection conn) :" + e.getMessage());
e.printStackTrace();//Modified by Anjali R. on[25/10/2018]
throw new ITMException(e);
}
}
......@@ -8018,7 +8141,13 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{
System.out.println("Unable to rollback");
s.printStackTrace();
//Added by Anjali R. on[4/10/2018][Start]
throw new ITMException(s);
//Added by Anjali R. on[4/10/2018][End]
}
//Added by Anjali R. on[4/10/2018][Start]
throw new ITMException(e);
//Added by Anjali R. on[4/10/2018][End]
}
}
return retString;
......@@ -8109,6 +8238,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} catch (Exception e)
{
e.printStackTrace();
//Added by Anjali R. on[4/10/2018][Start]
throw new ITMException(e);
//Added by Anjali R. on[4/10/2018][End]
} finally
{
try
......@@ -8128,6 +8260,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{
// TODO Auto-generated catch block
e.printStackTrace();
//Added by Anjali R. on[4/10/2018][Start]
throw new ITMException(e);
//Added by Anjali R. on[4/10/2018][End]
}
}
return updCnt1;
......
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