Sarita : Committed by sarita

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

webitm-adm/ibase/webitm/ejb/adm/PerkClaimPos.java

@@ -156,7 +156,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 			fullAmtHdr = checkNull(genericUtility.getColumnValue("full_amt",dom)) ; 
 			adjLoanHdr = checkNull(genericUtility.getColumnValue("adjust_loan",dom));
 			payrollVoucherHdr = checkNull(genericUtility.getColumnValue("payroll_voucher",dom));
-			bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom));
+			bankCodeHdr = checkNull(genericUtility.getColumnValue("bank_code",dom));
 			payrollPrd =  checkNull(genericUtility.getColumnValue("payroll_prd", dom));
 
 			if(claimDateStr != null && claimDateStr.trim().length() > 0)
@@ -190,6 +190,19 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 				pstmt.close();
 				pstmt = null;
 			}
+			bankCodeHdr =  genericUtility.getColumnValue("bank_code", dom);
+			payModeHdr =  genericUtility.getColumnValue("pay_mode", dom);
+			if(bankCodeHdr != null && bankCodeHdr.trim().length() > 0)
+			{
+				bankCode = bankCodeHdr;
+			}
+			if(payModeHdr != null && payModeHdr.trim().length() > 0)
+			{
+				payMode = payModeHdr;
+			}
+			
+			
+			
 			String xmlValues = "";
 			xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
 			xmlValues = xmlValues + "<Header></Header>";
@@ -302,7 +315,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 					{
 						lcAmountStr = checkNull(childNode.getFirstChild().getNodeValue());
 					}
-					else if(childNode != null && "bal_amt".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
+					else if(childNode != null && "amt_bal".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						lcBalAmtStr = checkNull(childNode.getFirstChild().getNodeValue());
 					}
@@ -372,7 +385,15 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 					isError = true;
 					return errString;
 				}
-				
+				if("Y".equalsIgnoreCase(fullAmtHdr))
+				{
+					if(lcBalAmt1 != lcClaimAmt1)
+					{
+						errString = itmDBAccess.getErrorString("","VTPERK1","","",conn);
+						isError = true;
+						return errString;
+					}
+				}
 				if(employeeData.contains(lsEmpCode) == false)
 				{
 					employeeData.add(lsEmpCode);
@@ -502,13 +523,13 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 
 				if("P".equalsIgnoreCase(payrollVoucherHdr))
 				{
-					if(lcClaimAmt1 > 0)
+					if(lcClaimAmt1 > 0 || lcClaimAmt1 < 0)
 					{
 						sql = " select count(*) from employee_mthad where emp_code = ? "
 								+" and ad_code = ? 	and eff_date = ?  and exp_date = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, lsEmpCode);
-						pstmt.setString(2, lcAdCode);
+						pstmt.setString(2, envVar);
 						pstmt.setTimestamp(3, frDate);
 						pstmt.setTimestamp(4,toDate);
 						rs = pstmt.executeQuery();
@@ -607,6 +628,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 														
 					HashMap payHdr = new HashMap();
 					HashMap payDet = new HashMap();
+					
 					payHdr.put("tran_date",claimDate);
 					payHdr.put("tran_type","PRK");
 					payHdr.put("eff_date",claimDate);
@@ -628,7 +650,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
 					payHdr.put("vouch_type","O");
 					payHdr.put("curr_code",currCode);
 					payHdr.put("exch_rate",1.0);
-					payHdr.put("remarks","Through claim, " + adCode.trim() + " , on " + claimDateStr);
+					payHdr.put("remarks","Through claim, " + lcAdCode.trim() + " , on " + claimDateStr);
 					payHdr.put("chg_date",currDate);
 					payHdr.put("chg_user",userId);
 					payHdr.put("chg_term",chgTerm);