Sana S: Modified on 15/11/19

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

webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java

@@ -177,6 +177,52 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							}
 							else
 							{
+								
+								mval  = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
+								mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
+								String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
+								String cadreCode=checkNull(genericUtility.getColumnValue("cadre_code",dom));
+								effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
+
+								System.out.print("effDateStr at 433:"+effDateStr);
+
+								//sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ? and eff_date = ?";
+								
+								sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ?";
+
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, mval1);
+								pstmt.setString(2, mval);
+								pstmt.setString(3, payTable);
+								pstmt.setString(4, cadreCode);
+								//pstmt.setString(5, effDateStr);
+								rs = pstmt.executeQuery();
+
+								if (rs.next())
+								{
+									cnt = rs.getInt("cnt");
+								}
+								if (rs != null)
+								{
+									rs.close();
+									rs = null;
+								}
+								if (pstmt != null) 
+								{
+									pstmt.close();
+									pstmt = null;
+								}
+								if(cnt > 0 && "A".equalsIgnoreCase(editFlag))
+								{
+									System.out.print("Duplicate");
+									/*errCode="VTDUPREC";
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());*/
+									
+									errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", conn);
+									return errString;
+								}
+								
 								if(mval==mval1)
 								{
 									sql="select payable as mtype from allwdedn where ad_code=?";
@@ -328,6 +374,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 								errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn);
 								return errString;
 							}
+							
 						}
 
 						else if ("cycle_start".equalsIgnoreCase(childNodeName))
@@ -657,8 +704,17 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 					
 					lastProcDate =sdf.format(new Date());
 					valueXmlString.append("<last_proc_for ><![CDATA[").append(lastProcDate).append("]]></last_proc_for>\r\n");
-					AdmCommon.setNodeValue(dom, "last_proc_for", adExpDate1);
+					AdmCommon.setNodeValue(dom, "last_proc_for", lastProcDate);
 
+					
+					proccFor=sdf.parse(lastProcDate);
+
+					cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
+
+					nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
+					nextProcDate1 =sdf.format(nextProcDate);
+					valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
+					
 					/*valueXmlString.append("<cadre_code  protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
 					valueXmlString.append("<pay_table  protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");*/
 				}