Updated component :

EmpMaritalStatusCancel.java
EmpMaritalStatusConf.java



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

webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpMaritalStatusCancel.java

@@ -214,6 +214,20 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 		String empWorkSite = "";
 		String empSite = "";
 		/* Added by vinay 13/03/2019    */
+		//Added by Mony on 13-09-2019[Start]
+			PreparedStatement pstmtDept = null;
+			String depAcctpay = "", depCctrCodePay = "";
+			String cctrCodeSal = "", acctCodeSal="";
+			long millis = System.currentTimeMillis();
+			java.sql.Date todaysDate= new java.sql.Date(millis); 
+			PreparedStatement pstmtPayrVchDet = null;
+			ResultSet rsPayrVchDet = null;
+			String payable="";
+			String acctCodeSal1="";
+			String cctrCodeSal1="";
+			String balOpt="";
+			double exchRate = 0.0;
+			//Added by Mony on 13-09-2019[End]
 		
 		try
         {
@@ -736,7 +750,8 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 						entryBatchNo = checkNull(rs.getString("ENTRY_BATCH_NO"));
 						vouchType = checkNull(rs.getString("VOUCH_TYPE"));
 						currCode = checkNull(rs.getString("CURR_CODE"));
-						exchRate = checkNull(rs.getString("EXCH_RATE"));
+						//exchRate = checkNull(rs.getString("EXCH_RATE")); Updated by Mony on 13-09-2019
+						exchRate = rs.getDouble("EXCH_RATE");
 						totAmtBc = rs.getDouble("TOT_AMT__BC");
 						hold = checkNull(rs.getString("HOLD"));					
 	
@@ -759,6 +774,96 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 						refId = "RV-"+statusDateStr;
 					}
 					//Modified by Santosh Gupta END
+					//Added by Mony to fetch data to be inserted in PAYR_VOUCHER from EMPLOYEE instead of prev trans of PAYR_VOUCHER start
+
+					sql = "SELECT CCTR_CODE__SAL,acct_code__sal, BANK_CODE, DEPT_CODE, RELIEVE_DATE, WITH_HELD, PAY_SITE,PAY_MODE FROM EMPLOYEE WHERE EMP_CODE = ?";
+				
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, empCode);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						cctrCodeSal = checkNull(rs.getString("CCTR_CODE__SAL"));
+						acctCodeSal=checkNull(rs.getString("acct_code__sal"));
+						bankCode = checkNull(rs.getString("BANK_CODE"));
+						empDeptCode = checkNull(rs.getString("DEPT_CODE"));
+						relieveDate = rs.getTimestamp("RELIEVE_DATE");
+						withHeld = checkNull(rs.getString("WITH_HELD"));
+						paySite = checkNull(rs.getString("PAY_SITE"));
+						payMode = checkNull(rs.getString("PAY_MODE"));
+					}
+
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					
+					sql= "";
+					sql = " select pay_site, site.fin_entity, dept_code, pay_mode, curr_code, employee.bank_code "
+							+"	from employee, site, finent where employee.pay_site = site.site_code and "
+							+"	site.fin_entity = finent.fin_entity and  emp_code = ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, empCode);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						paySite = checkNull(rs.getString("pay_site"));
+						finEntity = checkNull(rs.getString("fin_entity"));
+						empDeptCode= checkNull(rs.getString("dept_code"));
+						currCode = checkNull(rs.getString("curr_code"));
+					}
+
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					
+					sql= "";
+					sql = "select acct_code as ls_acctpay, cctr_code  as ls_cctrpay  from department where dept_code = ? ";
+
+					pstmtDept = conn.prepareStatement(sql);
+					pstmtDept.setString(1,empDeptCode);
+
+					rs = pstmtDept.executeQuery();
+
+					if(rs.next())
+					{
+						depAcctpay = checkNull(rs.getString("ls_acctpay"));
+						depCctrCodePay = checkNull(rs.getString("ls_cctrpay"));
+					}		
+					System.out.println("lsAcctpay"+depAcctpay);
+					System.out.println("lsCctrpay"+depCctrCodePay);
+
+					if (depCctrCodePay.length() == 0)
+					{
+						depCctrCodePay = " ";
+					}
+
+					if( rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if( pstmtDept != null)
+					{
+						pstmtDept.close();
+						pstmtDept = null;
+					}
+					
+					
+					//Added by Mony to fetch data to be inserted in PAYR_VOUCHER from EMPLOYEE instead of prev trans of PAYR_VOUCHER end
 					sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " +
 							"BANK_CODE, AUTO_PAY, PAY_MODE, CHG_DATE, CHG_USER, CHG_TERM, SITE_CODE, FIN_ENTITY, REMARKS, " +
 							"ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " +
@@ -769,30 +874,37 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 					pstmt.setString(1, newVouchNo);
 					pstmt.setTimestamp(2, chgDate);
 					pstmt.setString(3, tranType);
-					pstmt.setTimestamp(4, effDate);
+					//pstmt.setTimestamp(4, effDate); Modified by Mony on 13-09-2019
+					pstmt.setDate(4, todaysDate);
 					pstmt.setString(5, empCode);
 //					pstmt.setString(6, tranId);
 					pstmt.setString(6, refId);
-					pstmt.setTimestamp(7, chgDate);
-					pstmt.setString(8, empBankCode);
+					//pstmt.setTimestamp(7, chgDate); Modified by Mony on 13-09-2019
+					pstmt.setDate(7, todaysDate);
+					pstmt.setString(8, bankCode);
 					pstmt.setString(9, autoPay);
 					pstmt.setString(10, payMode);
 					pstmt.setString(11, chgUser);
 					pstmt.setString(12, chgTerm);
-					pstmt.setString(13, siteCodeAcct);
+					//pstmt.setString(13, siteCodeAcct); Modified by Mony on 13-09-2019
+					pstmt.setString(13, paySite);
 					pstmt.setString(14, finEntity);
 					pstmt.setString(15, remarks);
 					pstmt.setString(16, analCode);
 					pstmt.setString(17, confirmed);
 					pstmt.setString(18, paid);
-					pstmt.setString(19, acctCodePay);
-					pstmt.setString(20, cctrCodePay);
+					//pstmt.setString(19, acctCodePay); Modified by Mony on 13-09-2019
+					pstmt.setString(19, depAcctpay);
+					//pstmt.setString(20, cctrCodePay); Modified by Mony on 13-09-2019
+					pstmt.setString(20, depCctrCodePay);
 					pstmt.setDouble(21, (totAmt*-1));
 					pstmt.setString(22, entryBatchNo);
 					pstmt.setString(23, vouchType);
 					pstmt.setString(24, currCode);
-					pstmt.setString(25, exchRate);
-					pstmt.setDouble(26, totAmtBc);
+					//pstmt.setString(25, exchRate); Modified by Mony on 13-09-2019
+					pstmt.setDouble(25, exchRate);
+					//pstmt.setDouble(26, totAmtBc); Modified by Mony on 13-09-2019
+					pstmt.setDouble(26, (totAmt*-1)*exchRate);
 					pstmt.setString(27, hold);
 					int payrVoucherInsertCount = pstmt.executeUpdate();
 					System.out.println("@V@ row insert into payr_voucher :: " + payrVoucherInsertCount);
@@ -825,6 +937,43 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 //						xmlBuff.append("</Detail2>");
 						
 						System.out.println("@V@ Inserting Payer_voucher_det");
+						//To set acctCodeSal and cctr_code__sal from allow dedn table by Mony 16-09-2019 start
+						sql = "	select payable, acct_code__sal, cctr_code__sal, bal_opt from allwdedn where ad_code = ?  ";
+
+						pstmtPayrVchDet = conn.prepareStatement(sql);
+						pstmtPayrVchDet.setString(1,adCode);
+						rsPayrVchDet = pstmtPayrVchDet.executeQuery();
+						if(rsPayrVchDet.next())
+						{
+							payable = rsPayrVchDet.getString("payable");
+							acctCodeSal1 = rsPayrVchDet.getString("acct_code__sal");
+							cctrCodeSal1 = rsPayrVchDet.getString("cctr_code__sal");
+							balOpt = rsPayrVchDet.getString("bal_opt");
+						}
+						rsPayrVchDet.close();
+						rsPayrVchDet = null;
+						pstmtPayrVchDet.close();
+						pstmtPayrVchDet = null;
+
+						if(balOpt == null)
+						{
+							balOpt = " ";
+						}
+
+						System.out.println("acctCodeSal.. acct_code__sal...["+acctCodeSal1+"]");
+						if(acctCodeSal != null && acctCodeSal.trim().length() > 0)
+						{
+							System.out.println("Inside acct_code__sal...["+acctCodeSal+"]");
+							acctCodeSal1 = acctCodeSal;
+						}
+						if(cctrCodeSal1 != null && cctrCodeSal1.trim().length() > 0)
+						{
+							cctrCodeSal1 = cctrCodeSal;
+						}
+						System.out.println("@Amit acctCodeSal1>>.."+acctCodeSal1);
+						System.out.println("@Amit cctrCodeSal1>>.."+cctrCodeSal1);
+						
+						//To set acctCodeSal and cctr_code__sal from allow dedn table by Mony 16-09-2019 end
 						
 						sql1 = "INSERT INTO PAYR_VOUCHDET (TRAN_ID, LINE_NO, ACCT_CODE, CCTR_CODE, AMOUNT, AD_CODE) "
 								+" VALUES (?, ?, ?, ?, ?, ?)";
@@ -849,7 +998,7 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
 
 						if("Y".equalsIgnoreCase(autoPost))
 						{
-							payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
+							payrollVoucherConf = new PayrollVoucherConf(); //(PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local"); commented by Mony on 19-09-2019 to make it work in Jboss
 							retString = checkNull(payrollVoucherConf.confirm(newVouchNo, forcedFlag, xtraParams, conn));
 						}
 						//Changed By Santosh Gupta purposed  to retrive old data of employee (10/4/17)

webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpMaritalStatusConf.java

@@ -5,7 +5,7 @@
 
 package ibase.webitm.ejb.adm.adv;
 
-import ibase.system.config.AppConnectParm;
+//import ibase.system.config.AppConnectParm;
 //modified by Shital on 12/08/2019 [Start]
 //import ibase.system.config.ConnDriver;
 //modified by Shital on 12/08/2019 [End]
@@ -13,7 +13,7 @@ import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
-import ibase.webitm.ejb.ITMDBAccessLocal;
+//import ibase.webitm.ejb.ITMDBAccessLocal;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.adm.AdmCommon;
 import ibase.webitm.utility.ITMException;
@@ -30,9 +30,8 @@ import java.util.Calendar;
 import java.util.Date;
 //modified by Shital on 12/08/2019 [Start]
 //import javax.ejb.Stateless;
+//import javax.naming.InitialContext;
 //modified by Shital on 12/08/2019 [End]
-import javax.naming.InitialContext;
-
 import org.w3c.dom.Document;
 
 /**
@@ -59,6 +58,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 		
 		try
 		{
+			System.out.println("::::::::::::Inside Action Hadler::::");
 			//modified by Shital on 12/08/2019 [Start]
 			//connDriver = new ConnDriver();
 			//connection = connDriver.getConnectDB("DriverITM");
@@ -122,9 +122,9 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 		AdmCommon admCommon = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		AppConnectParm appConnect = null;
-		InitialContext initialCtx = null;
-		ITMDBAccessLocal itmDBAccess = null;
+		//AppConnectParm appConnect = null;
+		//InitialContext initialCtx = null;
+		//ITMDBAccessLocal itmDBAccess = null;
 		ValidatorEJB validator = null;
 		String empCode = "";
 		String tranDate = "";
@@ -155,6 +155,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 		double totalAmountBC = 0.0d;
 		SimpleDateFormat sdf = null;
 		Date relieveDate = null;
+		//PayrollVoucherConfLocal payrollVoucherConf = null; //modified by Shital on 12/08/2019
 		PayrollVoucherConfLocal payrollVoucherConf = null;
 		
 		/* Added by vinay 07/03/2019    */
@@ -181,24 +182,36 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 			statusDate = checkNull(genericUtility.getColumnValue("status_date", headerDom));
 			oldStatus = checkNull(genericUtility.getColumnValue("old_status", headerDom));
 			generateVouch = checkNull(genericUtility.getColumnValue("generate_voucher", headerDom));*/
-			sql = "select emp_code , "
-				+ "tran_date , "
-				+ "status_date , "
-				+ "old_status , "
-				+ "generate_voucher "
-				+ "from "
-				+ "EMP_MARITALCHG where tran_id = ?";
-			pstmt = connection.prepareStatement(sql);
-			pstmt.setString(1, tranId);
-			rs = pstmt.executeQuery();
-			if(rs.next())
+			if(headerDom == null)
 			{
-				empCode = rs.getString("emp_code");
-				tranDate = rs.getString("tran_date");
-				statusDate = rs.getString("status_date");
-				oldStatus = rs.getString("old_status");
-				generateVouch = rs.getString("generate_voucher");
-				
+				sql = "select emp_code , "
+						+ "tran_date , "
+						+ "status_date , "
+						+ "old_status , "
+						+ "generate_voucher "
+						+ "from "
+						+ "EMP_MARITALCHG where tran_id = ?";
+				pstmt = connection.prepareStatement(sql);
+				pstmt.setString(1, tranId);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					empCode = rs.getString("emp_code");
+					tranDate = rs.getString("tran_date");
+					statusDate = rs.getString("status_date");
+					oldStatus = rs.getString("old_status");
+					generateVouch = rs.getString("generate_voucher");
+
+				}
+				close(pstmt, rs);
+			}
+			else
+			{
+				empCode = checkNull(genericUtility.getColumnValue("emp_code", headerDom));
+				tranDate = checkNull(genericUtility.getColumnValue("tran_date", headerDom));
+				statusDate = checkNull(genericUtility.getColumnValue("status_date", headerDom));
+				oldStatus = checkNull(genericUtility.getColumnValue("old_status", headerDom));
+				generateVouch = checkNull(genericUtility.getColumnValue("generate_voucher", headerDom));
 			}
 			//Commented and added by shital 13 AUG 2019 [END]
 			System.out.println("empCode ::" + empCode);
@@ -207,8 +220,11 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 			System.out.println("oldStatus ::" + oldStatus);
 			
 			System.out.println("generateVouch ::" + generateVouch);
-			
+			if(tranDate != null && tranDate.trim().length() > 0)
+			{
 			tranDateTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(tranDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
+			}
+			System.out.println("tranDateTimestamp:::::::::::"+tranDateTimestamp);
 			String dbName= checkNull(CommonConstants.DB_NAME);
 			System.out.println("dbName:::::::"+dbName);
 			if(dbName.trim().equalsIgnoreCase("oracle"))
@@ -632,7 +648,8 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
 				
 				if("Y".equalsIgnoreCase(autoPost))
 				{
-					payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
+					//payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
+					payrollVoucherConf = new PayrollVoucherConf();
 					retString = checkNull(payrollVoucherConf.confirm(tranId, forcedFlag, xtraParams, connection));
 					if(retString.length() > 0 && retString.indexOf("VTMCONF2") == -1 )
 					{