changes made to call the conf component from post save component

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91549 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/InvHoldGen.java

@@ -83,6 +83,16 @@ public class InvHoldGen
 
 			int updCnt = 0;
 			
+			//Added by Gulzra - 26/11/11
+			if (userId == null || userId.trim().length() == 0)
+			{
+				userId = "SYSTEM";
+			}
+			if (chgTerm == null || chgTerm.trim().length() == 0)
+			{
+				chgTerm = "SYSTEM";
+			}
+			//End changes by gulzar  - 26/11/11
 			tranId = generateTranId( "w_inv_hold", conn );
 
 			pstmtHold.setString( 1, tranId );

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -50,9 +50,42 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	CommonConstants commonConstants = new CommonConstants();
 	
-	public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException, ITMException
+	// overloaded method added to call the confirm method from postsave component - 25/11/11 - Gulzar
+	public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
 	{
+		String retString = "";
+		boolean isConn= false;
 		Connection conn = null;
+
+		try
+		{
+			retString = confirm( tranID, xtraParams, forcedFlag, conn, isConn );
+
+			if ( retString != null && retString.length() > 0 )
+			{
+				throw new Exception("Exception while calling confirm for tran  Id:["+tranID+"]");
+			}
+		}
+		catch(Exception exception)
+		{
+			System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
+		}
+		return retString;
+	}
+	//Commented and new parameters(conn, connStatus) to function - 25/11/11 - Gulzar
+    /**
+	 * The public method is used for confirming the purchase receipt transaction
+	 * Returns confirmation message on successfull confirm otherwise returns error message
+	 * @param tranId is the transaction id to be confirmed
+	 * @param xtraParams contais additional information such as loginEmpCode,loginCode,chgTerm etc
+	 * @param forcedFlag (true or false)
+	 * @param Connection (true or false) - Connection to database
+	 * @param connStatus (true or false) - This status indicate whether to commit the trasaction or not (true - commit, false - no commit)
+	 */
+	//public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException, ITMException
+	public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException
+	{
+		//Connection conn = null; //Gulzar - 25/11/11
 		PreparedStatement pstmtSql = null;
 		ResultSet rs = null;
 		
@@ -62,12 +95,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		String siteRcp = "";
 		
 		try
+		{
+			if ( conn == null )//changed by Gulzar - 25/11/11
 			{
 				ConnDriver connDriver = null;
 				connDriver = new ConnDriver();
 				conn = connDriver.getConnectDB("DriverITM");
 				conn.setAutoCommit(false);
 				connDriver = null;
+				connStatus = true;
+			}
 			
 			ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		    userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");  
@@ -143,8 +180,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					}
 					/////////////////////
 
-					retString = itmDBAccessLocal.getErrorString("","VTMCONF20","");
+					if( connStatus )//Condition added - 25/11/11 - Gulzar as confirm method is called from post save component
+					{
 						conn.commit();
+						retString = itmDBAccessLocal.getErrorString("","VTMCONF20","");
+					}
 				}
 				else
 				{
@@ -174,7 +214,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtSql.close();
 					pstmtSql = null;					
 				}		
-				if( conn != null && ! conn.isClosed() )
+				//if( conn != null && ! conn.isClosed() ) // Gulzar - 25/11/11
+				if( conn != null && !conn.isClosed() && connStatus ) //Gulzar - 25/11/11
 				{
 					conn.close();
 					conn = null;
@@ -3510,7 +3551,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			{
 				return itmDBAccessLocal.getErrorString("","NOKEYSTRING","");
 			}
-			sql = "SELECT (CASE WHEN QC_REQD IS NULL THEN 'Y' ELSE QC_REQD END), PURC_ORDER, TRAN_DATE FROM PORCP WHERE TRAN_ID = ?";
+			sql = "SELECT (CASE WHEN QC_REQD IS NULL THEN 'Y' ELSE QC_REQD END) AS QC_REQD, PURC_ORDER, TRAN_DATE FROM PORCP WHERE TRAN_ID = ?";
 			pstmtSql = conn.prepareStatement(sql);
 			pstmtSql.setString(1, tranId);
 			rs = pstmtSql.executeQuery();
@@ -3603,7 +3644,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 			if ( "Y".equalsIgnoreCase(qcReqd) )
 			{
-				sql = "SELECT ITEM_CODE, MIN(LINE_NO) FROM   PORCPDET WHERE  PORCPDET.TRAN_ID = ? GROUP BY ITEM_CODE ORDER BY			   MIN(LINE_NO)";
+				sql = "SELECT ITEM_CODE, MIN(LINE_NO) AS LINE_NO FROM   PORCPDET WHERE  PORCPDET.TRAN_ID = ? GROUP BY ITEM_CODE ORDER BY			   MIN(LINE_NO)";
 				pstmtSql = conn.prepareStatement(sql);
 				pstmtSql.setString(1, tranId);
 				rs = pstmtSql.executeQuery();
@@ -3612,7 +3653,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					itemCode = checkNull(rs.getString("ITEM_CODE"));
 					lineNo = checkNull(rs.getString("LINE_NO"));
 					
-					sql = "SELECT (CASE WHEN QC_LEAD_TIME IS NULL THEN 0 ELSE QC_LEAD_TIME END) FROM ITEM WHERE ITEM_CODE = ?";
+					sql = "SELECT (CASE WHEN QC_LEAD_TIME IS NULL THEN 0 ELSE QC_LEAD_TIME END) AS QC_LEAD_TIME FROM ITEM WHERE ITEM_CODE = ?";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, itemCode);
 					rs1 = pstmt1.executeQuery();
@@ -3645,7 +3686,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						rs1 = null;
 						pstmt1.close();
 						pstmt1 = null;
-						sql = "SELECT QC_REQD_TYPE, (CASE WHEN QTY_SAMPLE IS NULL THEN 0 ELSE QTY_SAMPLE END), PROC_MTH FROM ITEM WHERE ITEM_CODE = ?";
+						sql = "SELECT QC_REQD_TYPE, (CASE WHEN QTY_SAMPLE IS NULL THEN 0 ELSE QTY_SAMPLE END) AS QTY_SAMPLE, PROC_MTH FROM ITEM WHERE ITEM_CODE = ?";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, itemCode);
 						rs1 = pstmt1.executeQuery();
@@ -3847,7 +3888,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									+ " CHG_USER, CHG_TERM, LOC_CODE, QTY_SAMPLE, STATUS, UNIT, QC_CREATE_TYPE, "
 									+ " BATCH_NO, EXPIRY_DATE, LOC_CODE__APRV, LOC_CODE__REJ, UNIT__SAMPLE, "
 									+ " LOT_NO__NEW, RETEST_DATE, EMP_CODE__QCAPRV, SPEC_REF, ITEM_CODE__NEW, "
-									+ " MFG_DATE, EMP_CODE) "
+									+ " MFG_DATE, EMP_CODE ) "
 									+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
 									+ " ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 								pstmtInsert = conn.prepareStatement(sql);
@@ -4066,14 +4107,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 								if ( spec == null || spec.length() == 0 )
 								{
-									sql = "SELECT (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) FROM SITEITEM WHERE			   SITE_CODE = ? AND    ITEM_CODE = ? "; 	
+									sql = "SELECT (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) AS SPEC_REF FROM SITEITEM WHERE			   SITE_CODE = ? AND    ITEM_CODE = ? "; 	
 									pstmt2 = conn.prepareStatement(sql);
 									pstmt2.setString(1, siteCode);
 									pstmt2.setString(2, itemCode);
 									rs2 = pstmt2.executeQuery();
 									if ( rs2.next() )
 									{
-										spec =  checkNull(rs2.getString("spec_ref"));
+										spec =  checkNull(rs2.getString("SPEC_REF"));
 									}
 									pstmt2.close();
 									pstmt2 = null;
@@ -4219,7 +4260,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					}
 					else if ( "I".equalsIgnoreCase(qcType) && "Y".equalsIgnoreCase(qcReqdSite) )
 					{
-						sql = "SELECT LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) , CASE WHEN (SUM(CASE WHEN		   (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0		   ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS		   NULL THEN 0 ELSE (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY		   IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE				   CONV__QTY_STDUOM END)) END)) IS NULL THEN 0 ELSE (SUM(CASE WHEN (((CASE WHEN QUANTITY IS NULL THEN 0		   ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN		   CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS NULL THEN 0 ELSE (((CASE WHEN QUANTITY IS		   NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END))		   * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) END)) END FROM PORCPDET WHERE		   TRAN_ID = ? AND ITEM_CODE = ? GROUP BY LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF		   END) ";
+						sql = "SELECT LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) AS SPEC_REF, CASE WHEN (SUM(CASE WHEN		   (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0		   ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS		   NULL THEN 0 ELSE (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY		   IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE				   CONV__QTY_STDUOM END)) END)) IS NULL THEN 0 ELSE (SUM(CASE WHEN (((CASE WHEN QUANTITY IS NULL THEN 0		   ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * (CASE WHEN		   CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS NULL THEN 0 ELSE (((CASE WHEN QUANTITY IS		   NULL THEN 0 ELSE QUANTITY END) + (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END))		   * (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) END)) END FROM PORCPDET WHERE		   TRAN_ID = ? AND ITEM_CODE = ? GROUP BY LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF		   END) ";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, tranId);
 						pstmt1.setString(2, itemCode);
@@ -4289,7 +4330,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 								
 								if ( spec == null || spec.length() == 0 )
 								{
-									sql= "SELECT (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) FROM   SITEITEM WHERE			  SITE_CODE = ? AND  ITEM_CODE = ? "; 			   
+									sql= "SELECT (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) AS SPEC_REF FROM   SITEITEM WHERE			  SITE_CODE = ? AND  ITEM_CODE = ? "; 			   
 									pstmt2 = conn.prepareStatement(sql);
 									pstmt2.setString(1, siteCode);
 									pstmt2.setString(2, itemCode);	
@@ -4406,7 +4447,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			else if ( "N".equalsIgnoreCase(qcReqd) )
 			{
 				genLotAuto = distCommon.getDisparams("999999", "GENERATE_LOT_NO_AUTO", conn);
-				lotNoManualSite = distCommon.getDisparams("999999" , "LOT_NO_MANUAL_SITE", conn);
+				//lotNoManualSite = distCommon.getDisparams("999999" , "LOT_NO_MANUAL_SITE", conn); //Gulzar - 25/11/11
 
 				if ( genLotAuto == null )
 				{
@@ -4416,6 +4457,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 				if ( "Y".equalsIgnoreCase(genLotAuto) )
 				{
+					lotNoManualSite = distCommon.getDisparams("999999" , "LOT_NO_MANUAL_SITE", conn); //Gulzar - 25/11/11
 					siteString = lotNoManualSite;
 					while ( siteString.trim().length() > 0 )
 					{
@@ -4426,15 +4468,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						}
 					}
 					
-					sql = "SELECT DISTINCT A.ITEM_CODE, (CASE WHEN A.BATCH_NO IS NULL THEN ' ' ELSE A.BATCH_NO END), A.LOC_CODE FROM		   PORCPDET A, ITEM B  WHERE A.ITEM_CODE = B.ITEM_CODE AND TRAN_ID = ? AND (CASE WHEN B.STK_OPT IS NULL THEN		   '0' ELSE B.STK_OPT END) = '2' AND (A.LOT_NO IS NULL OR TRIM(A.LOT_NO) IS NULL OR LENGTH(TRIM(A.LOT_NO)) = 0		   ) ";
+					sql = "SELECT DISTINCT A.ITEM_CODE, (CASE WHEN A.BATCH_NO IS NULL THEN ' ' ELSE A.BATCH_NO END) AS BATCH_NO, A.LOC_CODE FROM		   PORCPDET A, ITEM B  WHERE A.ITEM_CODE = B.ITEM_CODE AND TRAN_ID = ? AND (CASE WHEN B.STK_OPT IS NULL THEN		   '0' ELSE B.STK_OPT END) = '2' AND (A.LOT_NO IS NULL OR TRIM(A.LOT_NO) IS NULL OR LENGTH(TRIM(A.LOT_NO)) = 0		   ) ";
 					pstmtSql = conn.prepareStatement(sql);
 					pstmtSql.setString(1, tranId);
 					rs = pstmtSql.executeQuery();
-					if ( pstmtSql != null)
-					{
-						pstmtSql.close();
-						pstmtSql = null;
-					}
 
 					while ( rs.next() )
 					{
@@ -4496,6 +4533,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		{
 			try
 			{
+				System.out.println("Finally block, closing resultset and prepared statement variables..............");
 				if(pstmtSql != null)
 				{
 					pstmtSql.close();

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConfLocal.java

-package ibase.webitm.ejb.dis.adv;
import ibase.webitm.utility.ITMException;import ibase.webitm.ejb.*;
import java.rmi.RemoteException;import javax.ejb.Local;
@Localpublic interface PoRcpConfLocal extends ActionHandlerLocal{
	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;}
\ No newline at end of file
+package ibase.webitm.ejb.dis.adv;
import ibase.webitm.utility.ITMException;import ibase.webitm.ejb.*;
import java.sql.Connection;import java.rmi.RemoteException;import javax.ejb.Local;
@Localpublic interface PoRcpConfLocal extends ActionHandlerLocal{
	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
	//new method by gulzar - 25/11/11 to call from postsave component
	public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException;
}
\ No newline at end of file

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConfRemote.java

-package ibase.webitm.ejb.dis.adv;
import ibase.webitm.utility.ITMException;import ibase.webitm.ejb.*;
import java.rmi.RemoteException;import javax.ejb.Remote; 
@Remotepublic interface PoRcpConfRemote extends ActionHandlerRemote {
	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;}
\ No newline at end of file
+package ibase.webitm.ejb.dis.adv;
import ibase.webitm.utility.ITMException;import ibase.webitm.ejb.*;
import java.sql.Connection;import java.rmi.RemoteException;import javax.ejb.Remote; 
@Remotepublic interface PoRcpConfRemote extends ActionHandlerRemote {
	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
	//new method by gulzar - 25/11/11 to call from postsave component
	public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException;
}
\ No newline at end of file