Sun migration changes for Employee Advance

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

webitm-fin-advSupp/ibase/webitm/ejb/fin/advfield/AdvanceVoucherConfirm.java

@@ -131,7 +131,7 @@ public class AdvanceVoucherConfirm extends ActionHandlerEJB implements AdvanceVo
 			//Comment as changes required by manoj Sir on 21/06/2018 
 			//conn = connDriver.getConnectDB("DriverITM");
 			AppConnectParm appConnect = new AppConnectParm();
-			//Commented and Added by Vikas l on 09-02-19[For Sun Migration]Start
+			//Commented and Added by Vikas l on 28-05-19[For Sun Migration]Start
 			//InitialContext ctx = new InitialContext(appConnect.getProperty());
 			
 			//CommonDBAccessRemote dbAccessRemote = (CommonDBAccessRemote)ctx.lookup("ibase/CommonDBAccessEJB/remote");
@@ -139,10 +139,18 @@ public class AdvanceVoucherConfirm extends ActionHandlerEJB implements AdvanceVo
           	CommonDBAccessEJB commonDBAccessEJB = new CommonDBAccessEJB();
           	ibase.utility.UserInfoBean userInfo = commonDBAccessEJB.createUserInfo(empLogin);
           	System.out.println("UserInfo.............: "+userInfo);
-            //Commented and Added by Vikas l on 09-02-19[For Sun Migration]End
+            
 			setUserInfo(userInfo);
 			//conn = getConnection( userInfo.getTransDB() , userInfo) ;
+			try 
+			{
 				conn = getConnection();
+			}
+			catch(Exception e)
+			{
+				conn = connDriver.getConnectDB(userInfo.getTransDB());
+			}
+			//Commented and Added by Vikas l on 28-05-19[For Sun Migration]End
 			conn.setAutoCommit(false);
 		
 			System.out.println("commonFunctions  :  ["+commonFunctions+"]");
@@ -186,7 +194,8 @@ public class AdvanceVoucherConfirm extends ActionHandlerEJB implements AdvanceVo
 				else//added by bipin on 11/03/2010
 				{
 					//start - bipin on 11/03/2010 [reason:Transaction should be confirmed if voucher created or not created ]
-					String empCode = e12GenericUtilityObj.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
+					//String empCode = e12GenericUtilityObj.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");//Changed By Vikas L on 29-05-19
+					String empCode = userInfo.getEmpCode();
 					int updateCashVoucher=updateCashVoucher(tranId,empCode,conn);
 					System.out.println("updateCashVoucher : ["+updateCashVoucher+"]");	
 
@@ -345,11 +354,19 @@ public String createHashmapForMiscVoucher(String tranID, String xtraParams, Stri
 
 		bw.newLine();
 		bw.write("<CREATE_MISC>");
-		userId = e12Obj.getValueFromXTRA_PARAMS(xtraParams,"userId");
+		//Commented and added by Vikas L on 28-05-19[Start]  
+		/*userId = e12Obj.getValueFromXTRA_PARAMS(xtraParams,"userId");
 		emploginCode = e12Obj.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
-		loginSite =e12Obj.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
-		System.out.println("start misc voucher");
+		loginSite =e12Obj.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");*/
+		
+		CommonDBAccessEJB commonDBAccess = new CommonDBAccessEJB();
+		UserInfoBean userInfo = commonDBAccess.createUserInfo(e12Obj.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
+		userId=userInfo.getLoginCode();
+		emploginCode=userInfo.getEmpCode();
+		loginSite = userInfo.getSiteCode();
+		System.out.println("userId  ["+userId+"]    emploginCode["+emploginCode+"]   loginSite["+loginSite+"]");
 		
+		//Commented and added by Vikas L on 28-05-19[End]  
 		/***********************values not defined*********/
 		//headerMap.put("cctr_code__ap","");//commented by bipin on 08/03/2010
 		//headerMap.put("acct_code__adv","");//commented by bipin on 08/03/2010
@@ -850,7 +867,7 @@ public String createHashmapForMiscVoucher(String tranID, String xtraParams, Stri
 			System.out.println("R	 E	 T	U	R	N	S	T	 R	I	 N	 G"+retString);
 			int indexChar = retString.indexOf("@") ;
 			System.out.println("Index of Char @"+indexChar);
-			String miscTranId=retString.substring(indexChar+1,20);
+			String miscTranId=retString.substring(indexChar+1,retString.length());//Changd By Vikas L on 28-05-9  
 		//	bw.write("</CREATE_MISC>");
 			
 			System.out.println("--ELSE Inside Confirmation Block..miscTranId........"+miscTranId);

webitm-fin-advSupp/ibase/webitm/ejb/fin/advfield/AdvanceVoucherFieldSubmit.java

@@ -217,6 +217,19 @@ public class AdvanceVoucherFieldSubmit extends ActionHandlerEJB
         localPreparedStatement.close();
         localPreparedStatement = null;
         
+    	//Added By Vikas L on 29-05-19[To Invoke Workflow]Start
+    	if(!"Y".equalsIgnoreCase(str2) || str2.length() <= 0)
+		{
+			GenericWorkflowClass wfGenericClass = new GenericWorkflowClass();
+			String retString = wfGenericClass.invokeWorkflow(localConnection, paramString1, paramString2, "w_voucher_advfield", "voucher_advfield");
+			System.out.println("return String : "+retString);
+			errString = new ITMDBAccessEJB().getErrorString("", "VTSUCORDER", "","",localConnection);
+		}
+		else
+		{
+		errString = new ITMDBAccessEJB().getErrorString("", "VTMWFALCNF", "","",localConnection);
+		}
+    	//Added By Vikas L on 29-05-19[To Invoke Workflow]End
     			
         /*
          *   Changes by Manoj Sarode on 10-Oct-2013 End