Skip to content

B
business-java
Commit d903b95e authored by pbhosale's avatar pbhosale
Browse files
Options

Changes done on[06/11/19] changes in payrarr_to_proc for status validation 

payarr_to_proc11.xml
payarr_to_proc21.xml
A18FSUN004.sql
d_payarr_to_proc11.srd
d_payarr_to_proc21.srd
ArrearsDeleteIC.java
PayarrToProc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211447 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b83f257c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 587 additions and 607 deletions
webitm-adm/module-resource/SQL/A18FSUN004.sql
View file @ d903b95e
......@@ -70,8 +70,13 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
--------------------------------------------------[31/10/2019][END]
--------------------------------------------------[06/11/2019][START]
update messages set MSG_STR = 'Invalid Access!!',MSG_DESCR = 'You are not allow to select Deleted Option in status field' where MSG_NO = 'DELRECO';
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('DELETEREC','Record Deleted..','This record is already deleted, You are not allow to edit this record','E','Y',null,null,null,to_date('01-11-12','DD-MM-RR'),'Yogesh ','BASE ',null,null);
--------------------------------------------------[06/11/2019][END]
......
webitm-adm/module-resource/srd/d_payarr_to_proc21.srd
View file @ d903b95e
......@@ -8,17 +8,17 @@ table(column=(type=char(10) update=yes updatewhereclause=yes name=emp_code dbnam
column=(type=char(5) updatewhereclause=yes name=site dbname="site" )
column=(type=char(60) updatewhereclause=yes name=descr dbname="descr" )
column=(type=char(6) update=yes updatewhereclause=yes name=prd_code dbname="payarr_to_proc.prd_code" )
column=(type=char(1) update=yes updatewhereclause=yes name=status dbname="payarr_to_proc.status" values="Unprocessed U/Processed P/" )
column=(type=char(1) update=yes updatewhereclause=yes name=status dbname="payarr_to_proc.status" values="Unprocessed U/Processed P/Deleted D/" )
column=(type=char(6) update=yes updatewhereclause=yes name=prd_code__acc dbname="payarr_to_proc.prd_code__acc" )
column=(type=datetime update=yes updatewhereclause=yes name=proc_date dbname="payarr_to_proc.proc_date" )
column=(type=datetime update=yes updatewhereclause=yes name=chg_date dbname="payarr_to_proc.chg_date" )
column=(type=char(10) update=yes updatewhereclause=yes name=chg_user dbname="payarr_to_proc.chg_user" )
column=(type=char(15) update=yes updatewhereclause=yes name=chg_term dbname="payarr_to_proc.chg_term" )
column=(type=char(2) update=yes updatewhereclause=yes name=proc_type dbname="payarr_to_proc.proc_type" )
column=(type=char(300) update=yes updatewhereclause=yes name=chg_term dbname="payarr_to_proc.chg_term" )
column=(type=char(2) update=yes updatewhereclause=yes name=proc_type dbname="payarr_to_proc.proc_type" values="Arrears AR/Payroll PY/" )
column=(type=char(12) update=yes updatewhereclause=yes key=yes name=tran_id dbname="payarr_to_proc.tran_id" )
column=(type=char(47) updatewhereclause=yes name=name dbname="name" )
column=(type=char(11) updatewhereclause=yes name=psuedo_status dbname="psuedo_status" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"employee~" ) TABLE(NAME=~"payarr_to_proc~" ) TABLE(NAME=~"site~" ) COLUMN(NAME=~"payarr_to_proc.emp_code~") COMPUTE(NAME=~"TRIM(EMPLOYEE.PAY_SITE) AS SITE~") COMPUTE(NAME=~"TRIM(SITE.DESCR) AS DESCR~") COLUMN(NAME=~"payarr_to_proc.prd_code~") COLUMN(NAME=~"payarr_to_proc.status~") COLUMN(NAME=~"payarr_to_proc.prd_code__acc~") COLUMN(NAME=~"payarr_to_proc.proc_date~") COLUMN(NAME=~"payarr_to_proc.chg_date~") COLUMN(NAME=~"payarr_to_proc.chg_user~") COLUMN(NAME=~"payarr_to_proc.chg_term~") COLUMN(NAME=~"payarr_to_proc.proc_type~") COLUMN(NAME=~"payarr_to_proc.tran_id~") COMPUTE(NAME=~"TRIM(EMPLOYEE.EMP_FNAME) || ' ' || TRIM(EMPLOYEE.EMP_MNAME) || ' ' || TRIM(EMPLOYEE.EMP_LNAME) AS NAME~") COMPUTE(NAME=~"CASE PAYARR_TO_PROC.status WHEN 'P' THEN 'Processed' ELSE 'Unprocessed' END AS psuedo_status~") JOIN (LEFT=~"employee.emp_code~" OP =~"=~"RIGHT=~"payarr_to_proc.emp_code~" ) JOIN (LEFT=~"employee.pay_site~" OP =~"=~"RIGHT=~"site.site_code~" )WHERE( EXP1 =~"~~~"PAYARR_TO_PROC~~~".~~~"TRAN_ID~~~"~" OP =~"=~" EXP2 =~":tran_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string) " update="PAYARR_TO_PROC" updatewhere=0 updatekeyinplace=no arguments=(("tran_id", string)) )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"employee~" ) TABLE(NAME=~"payarr_to_proc~" ) TABLE(NAME=~"site~" ) COLUMN(NAME=~"payarr_to_proc.emp_code~") COMPUTE(NAME=~"TRIM(EMPLOYEE.PAY_SITE) AS SITE~") COMPUTE(NAME=~"TRIM(SITE.DESCR) AS DESCR~") COLUMN(NAME=~"payarr_to_proc.prd_code~") COLUMN(NAME=~"payarr_to_proc.status~") COLUMN(NAME=~"payarr_to_proc.prd_code__acc~") COLUMN(NAME=~"payarr_to_proc.proc_date~") COLUMN(NAME=~"payarr_to_proc.chg_date~") COLUMN(NAME=~"payarr_to_proc.chg_user~") COLUMN(NAME=~"payarr_to_proc.chg_term~") COLUMN(NAME=~"payarr_to_proc.proc_type~") COLUMN(NAME=~"payarr_to_proc.tran_id~") COMPUTE(NAME=~"TRIM(EMPLOYEE.EMP_FNAME) || ' ' || TRIM(EMPLOYEE.EMP_MNAME) || ' ' || TRIM(EMPLOYEE.EMP_LNAME) AS NAME~") COMPUTE(NAME=~"CASE PAYARR_TO_PROC.status WHEN 'P' THEN 'Processed' WHEN 'D' THEN 'Deleted' ELSE 'Unprocessed' END AS psuedo_status~") JOIN (LEFT=~"employee.emp_code~" OP =~"=~"RIGHT=~"payarr_to_proc.emp_code~" ) JOIN (LEFT=~"employee.pay_site~" OP =~"=~"RIGHT=~"site.site_code~" )WHERE( EXP1 =~"~~~"PAYARR_TO_PROC~~~".~~~"TRAN_ID~~~"~" OP =~"=~" EXP2 =~":tran_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string) " update="PAYARR_TO_PROC" updatewhere=0 updatekeyinplace=no arguments=(("tran_id", string)) )
column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="255" x="140" y="22" height="16" width="66" format="[general]" html.valueishtml="0" name=emp_code visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=8 alignment="0" tabsequence=32766 border="5" color="255" x="140" y="122" height="16" width="81" format="[shortdate] [time]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=2 alignment="0" tabsequence=32766 border="5" color="255" x="140" y="42" height="16" width="66" format="[general]" html.valueishtml="0" name=site visible="1" edit.limit=5 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
......@@ -39,7 +39,7 @@ text(band=detail alignment="1" text="Transaction Id:" border="0" color="33554432
text(band=detail alignment="1" text="Change Term:" border="0" color="33554432" x="396" y="122" height="16" width="81" html.valueishtml="0" name=chg_term_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
text(band=detail alignment="1" text="Status:" border="0" color="33554432" x="424" y="62" height="16" width="53" html.valueishtml="0" name=status_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
text(band=detail alignment="1" text="Process Type:" border="0" color="33554432" x="388" y="82" height="16" width="89" html.valueishtml="0" name=proc_type_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=11 alignment="0" tabsequence=32766 border="5" color="255" x="481" y="82" height="16" width="87" format="[general]" html.valueishtml="0" name=proc_type visible="1" edit.limit=2 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=11 alignment="0" tabsequence=32766 border="5" color="255" x="481" y="82" height="16" width="87" format="[general]" html.valueishtml="0" name=proc_type visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.useasborder=yes ddlb.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=5 alignment="0" tabsequence=10 border="5" color="33554432" x="481" y="62" height="16" width="87" format="[general]" html.valueishtml="0" name=status visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.useasborder=yes ddlb.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
text(band=detail alignment="1" text="Change User:" border="0" color="33554432" x="226" y="122" height="16" width="79" html.valueishtml="0" name=chg_user_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=9 alignment="0" tabsequence=32766 border="5" color="255" x="309" y="122" height="16" width="81" format="[general]" html.valueishtml="0" name=chg_user visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
......
webitm-adm/src/ibase/webitm/ejb/adm/ArrearsDeleteIC.java
View file @ d903b95e
......@@ -66,7 +66,7 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
int currentFormNo=0,childNodeListLength ,ctr=0 , columnCtr=0 , cnt=0;
String errCode = "", userId = "" , prdCodeTo = "", prdCodeAcc = "" ,errString ="" , errorType = "";
String prdCodeFr = "";
String siteCode = "", sql = "" , loginSiteCode = ""; //Added by Poonam B [30/10/2019]
String siteCode = "", sql = ""; //Added by Poonam B [30/10/2019]
PreparedStatement pstmt = null; //Added by Poonam B [30/10/2019]
ResultSet rs = null; //Added by Poonam B [30/10/2019]
int usrLevel = 0; //Added by Poonam B [30/10/2019]
......@@ -201,8 +201,9 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
}
}
//Added by Poonam B[26-SEP-2019][END]
}
//Added by Poonam B[30-OCT-2019][START]
//Added by Poonam B[30/10/2019][START]
else if (childNodeName.equalsIgnoreCase("site_code__fr"))
{
siteCode = E12GenericUtility.checkNull(genericUtility.getColumnValue("site_code__fr", dom));
......@@ -280,7 +281,7 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
}
}
}
//Added by Poonam B[30-OCT-2019][END]
//Added by Poonam B[30/10/2019][END]
}
int errListSize = errList.size();
cnt =0;
......@@ -401,15 +402,14 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
{
currentFormNo = Integer.parseInt(objContext);
}
//Modified By Poonam B[25-SEP-2019]
/*loginEmpCode = getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
loginSiteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");*/
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//Modified By Poonam B[25-SEP-2019]
loginEmpCode = getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
loginSiteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
System.out.println("currentColumn:::::" + currentColumn);
valueXmlString = new StringBuffer("<?xml version=\"1.0\" encoding=''?>\r\n<Root>\r\n<header>\r\n<editFlag>");
/*valueXmlString = new StringBuffer("<?xml version=\"1.0\" encoding=''?>\r\n<Root>\r\n<header>\r\n<editFlag>");
valueXmlString.append(editFlag).append("</editFlag>\r\n</header>\r\n");*/
valueXmlString = new StringBuffer("<?xml version=\"1.0\" ?>\r\n<Root>\r\n<header>\r\n<editFlag>");
valueXmlString.append(editFlag).append("</editFlag>\r\n</header>\r\n");
switch (currentFormNo)
......@@ -574,4 +574,4 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
}
return count;
}
}
}
\ No newline at end of file
webitm-adm/src/ibase/webitm/ejb/adm/PayarrToProc.java
View file @ d903b95e
......@@ -9,7 +9,7 @@ import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
//import javax.ejb.Stateless;
import javax.ejb.Stateless;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
......@@ -20,7 +20,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
//import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
//@Stateless
@Stateless
public class PayarrToProc extends ValidatorEJB implements PayarrToProcLocal,PayarrToProcRemote
{
//modified by Shital on 12/07/2019 [Start]
......@@ -92,6 +92,7 @@ public class PayarrToProc extends ValidatorEJB implements PayarrToProcLocal,Paya
StringBuffer errStringXml = null;
String sql = "";
String empCode = "";
String flagStatus = ""; //Added By Poonam B[05/11/2019]
String status = "";
String prdCode = "";
String procType = "";
......@@ -194,19 +195,7 @@ public class PayarrToProc extends ValidatorEJB implements PayarrToProcLocal,Paya
}
//Modified by Ahmed on 31-AUG-2018[To break and return error message when validation fails]end
}
//Added By Poonam B [25-SEP-2019][START]
if(status.trim().equalsIgnoreCase("D"))
{
errCode = "DELRECO";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, errCode);
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
//Added By Poonam B [25-SEP-2019][END]
sql = "select usr_lev from users where code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
......@@ -264,8 +253,44 @@ public class PayarrToProc extends ValidatorEJB implements PayarrToProcLocal,Paya
}
}
}
}
//Added By Poonam B[05/11/2019][START]
else if("status".equalsIgnoreCase(childNodeName))
{
flagStatus = checkNull(genericUtility.getColumnValue("status", dom));
System.out.println("flagStatus::::"+flagStatus);
if("E".equalsIgnoreCase(editFlag))
{
if(flagStatus.trim().equalsIgnoreCase("D"))
{
errCode = "DELETEREC";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, errCode);
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//Added By Poonam B[06/11/2019][START]
else if("A".equalsIgnoreCase(editFlag))
{
if(flagStatus.trim().equalsIgnoreCase("D"))
{
errCode = "DELRECO";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, errCode);
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//Added By Poonam B[06/11/2019][END]
}
////Added By Poonam B[05/11/2019][END]
else if("prd_code".equalsIgnoreCase(childNodeName))
{
prdCode = checkNull(genericUtility.getColumnValue("prd_code", dom));
......@@ -740,6 +765,7 @@ public class PayarrToProc extends ValidatorEJB implements PayarrToProcLocal,Paya
if((status.trim().equalsIgnoreCase("D") ))
{
System.out.println("IN IF CONDITION::::::::::");
System.out.println("Status::::::::::" +status);
xmlString.append("<status protect=\"1\"><![CDATA[").append(checkNull(status)).append("]]></status>\r\n");
xmlString.append("<emp_code protect=\"1\"><![CDATA[").append(checkNull(empCode)).append("]]></emp_code>\r\n");
xmlString.append("<site protect=\"1\"><![CDATA[").append(checkNull(site)).append("]]></site>\r\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment