Skip to content

B
business-java
Commit cba45176 authored by gahmad's avatar gahmad
Browse files
Options

changes made by Pawan for following request id: AD01SUN007, AD01SUN008, AD01SUN009, AD01SUN010 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91414 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 864bfda3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 144 deletions
webitm-adm/.project 0 → 100755
View file @ cba45176
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>webitm-adm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
webitm-adm/ibase/webitm/ejb/adm/Form16Payment1.java
View file @ cba45176
......@@ -208,6 +208,17 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
break;
}
}
//Changed by Pawan on 5/14/2011 [AD01SUN010] to check blank bank_name.start
else if (childNodeName.equals("bank_name"))
{
if (childNode.getFirstChild() == null)
{
errCode = "INVBANKNAM";
errString = getErrorString("bank_name",errCode,loginCode);
break;
}
}
//Changed by Pawan on 5/14/2011 [AD01SUN010] to check blank bank_name.end
else if (childNodeName.equals("date__payment"))
{
datePayment = getColumnValue("date__payment",dom);
......@@ -295,6 +306,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
String siteDescr = null, prdCode = "", periodDescr = "";
try
{
System.out.println("xtra parm is : "+xtraParams);
System.out.println("currentColumn is : "+currentColumn);
conn = connDriver.getConnectDB("DriverITM");
if(objContext != null && objContext.trim().length()>0)
......@@ -334,9 +348,11 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
{
try
{
loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
System.out.println("loginSite in ItemChange ::: [" + loginSite + "]");
if (loginSite != null)
if ( loginSite != null )
{
sql = "SELECT DESCR FROM SITE WHERE SITE_CODE = '"+ loginSite + "'";
System.out.println("sql ::: [" + sql + "]");
......@@ -430,7 +446,6 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
valueXmlString.append("<emp_fname>").append("<![CDATA[" + fName + "]]>").append("</emp_fname>\r\n");
valueXmlString.append("<emp_lname>").append("<![CDATA[" + lName + "]]>").append("</emp_lname>\r\n");
}
}
valueXmlString.append("</Detail1>");
break;
......
webitm-adm/ibase/webitm/ejb/adm/SepClose.java
View file @ cba45176
......@@ -146,7 +146,8 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
break;
}
*/
empCode = childNode.getFirstChild().getNodeValue().trim();
//Changed by Pawan on 5/3/2011 [AD01SUN009].
//empCode = childNode.getFirstChild().getNodeValue().trim();
//empCode = getColumnValue("emp_code",dom);
if (childNode.getFirstChild() == null)
{
......@@ -154,6 +155,14 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
errString = getErrorString("emp_code",errCode,userId);
break;
}
else //Changed by Pawan on 5/3/2011 [AD01SUN009] to validate employee code.start
{
empCode = childNode.getFirstChild().getNodeValue().trim();
if (empCode == null || empCode.trim().length() == 0)
{
errString = getErrorString("emp_code","VMEMP1",userId);
break;
}//Changed by Pawan on 5/3/2011 [AD01SUN009] to validate employee code.end
sql = "SELECT COUNT(*) AS COUNT FROM EMPLOYEE WHERE EMP_CODE = '"+empCode.trim()+"'";
System.out.println("sql :"+sql);
System.out.println("emp_code :"+empCode);
......@@ -292,6 +301,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
break;
}
}
}//end of else . Changed by Pawan on 5/3/2011 [AD01SUN009].
//Add ended by Raj (ADM5000192)- 24/04/2008
}
}
......@@ -445,8 +455,20 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
Object date = null;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
date = sdf.parse(ts.toString());
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.start
//SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat sdf1 = null;
if( xtraParams.indexOf("user_lang=") <= 0 )
{
sdf1 = new SimpleDateFormat("yyyy-MM-dd");
}
else
{
sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
}
//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.end
currDate=sdf1.format(date).toString();
String siteDescr = "";
String fName= "";
String lName= "";
......@@ -471,7 +493,6 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
valueXmlString.append("<emp_lname_1>").append(lName).append("</emp_lname_1>\r\n");
*///End - Commented by jaimin on 17/07/2008 (AD89SUN025)
valueXmlString.append("<tran_date>").append(currDate).append("</tran_date>\r\n");
/*--Commented by pawan - 11/10/10 unnecessary S.O.P are not required
System.out.println("EmpCodeaprv::::["+empCodeAprv+"]");
System.out.println("EmpCodeaprv(FNAME)::::["+fName+"]");
......@@ -528,6 +549,30 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
rsSep = null;
stmtSep.close();
stmtSep = null;
//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.start
if( xtraParams.indexOf("user_lang=") <= 0 )
{
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf3 = new SimpleDateFormat(genericUtility.getDBDateFormat());
if ( confDate != null && confDate.trim().length() > 0 )
{
java.util.Date confDate1 = sdf3.parse(confDate);
confDate = sdf2.format(confDate1);
}
if ( reliveDate != null && reliveDate.trim().length() > 0 )
{
java.util.Date reliveDate1 = sdf3.parse(reliveDate);
reliveDate = sdf2.format(reliveDate1);
}
if ( resiDate != null && resiDate.trim().length() > 0 )
{
java.util.Date resiDate1 = sdf3.parse(resiDate);
resiDate = sdf2.format(resiDate1);
}
}
else
{//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.end
//Added below by Raj (AD90SUN017)- 08/05/2010
if ( confDate != null && confDate.trim().length() > 0 )
{
......@@ -545,6 +590,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
//resiDate = genericUtility.getValidDateTimeString(resiDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat() );
resiDate = genericUtility.getValidDateString(resiDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat() );
}
}//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.
valueXmlString.append("<sep_status>").append(status).append("</sep_status>\r\n");
valueXmlString.append("<separation_mode>").append(sepMode).append("</separation_mode>\r\n");
valueXmlString.append("<reason>").append(reason).append("</reason>\r\n");
......
webitm-adm/ibase/webitm/ejb/adm/SepCloseConf.java
View file @ cba45176
......@@ -20,6 +20,10 @@ import ibase.webitm.ejb.*;
import ibase.webitm.utility.TransIDGenerator;
import ibase.utility.CommonConstants;
import ibase.webitm.utility.GenericUtility;
//Changed by Rohan on 4/20/2011 [AD01SUN009] to import below given classes.start
import ibase.webitm.ejb.sys.GenerateXmlFromDB;
import ibase.webitm.ejb.sys.NFCreateEdiMultiLogic;
//Changed by Rohan on 4/20/2011 [AD01SUN009] to import below given classes.end
@javax.ejb.Stateless
public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal, SepCloseConfRemote
......@@ -39,7 +43,9 @@ public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal,
String empCodeConf = "";
String deleteSepOnClose = "";
String relieveDate = "";
String confDate = "";
//Changed by Pawan on 5/4/2011 [AD01SUN009].
//String confDate = "";
java.sql.Timestamp confDate = null;
String sql = "";
Statement stmt = null;
......@@ -123,7 +129,9 @@ public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal,
separationMode = rSet.getString("SEPARATION_MODE");
reason = rSet.getString("REASON");
vacNoCreated = rSet.getString("VAC_NO__CREATED");
confDate = rSet.getString("CONF_DATE");
//Changed by Pawan on 5/4/2011 [AD01SUN009].
//confDate = rSet.getString("CONF_DATE");
confDate = rSet.getTimestamp("CONF_DATE");
empCodeConf = rSet.getString("EMP_CODE__CONF");
}
if( pstmt != null )
......@@ -152,7 +160,9 @@ public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal,
pstmt.setString(3, reason);
pstmt.setString(4, vacNoCreated);
pstmt.setString(5, status);
pstmt.setTimestamp(6,Timestamp.valueOf( confDate ) );
//Changed by Pawan on 5/4/2011 [AD01SUN009].
//pstmt.setTimestamp(6,Timestamp.valueOf( confDate ) );
pstmt.setTimestamp(6, confDate);
pstmt.setString(7, empCodeConf);
pstmt.setString(8, loginEmpCode);
pstmt.setString(9, tranId);
......@@ -247,6 +257,49 @@ public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal,
{
System.out.println("EMPLOYEE Updated Successfully ::"+updCnt);
}
//Changed by Rohan on 19/04/11 [AD01SUN009] to generate EDI data.start
Document dom = null;
String runMode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "runMode" );
String ediOption = "";
System.out.println("runMode is :"+runMode);
if(runMode != null && runMode.trim().length() > 0 && !runMode.equalsIgnoreCase("B"))
{
sql = " SELECT EDI_OPTION FROM TRANSETUP WHERE TRAN_WINDOW = 'w_sep_close' ";
stmt = connectionObject.createStatement();
rSet = stmt.executeQuery(sql);
while ( rSet.next() )
{
ediOption = rSet.getString("EDI_OPTION");
}
if (ediOption == null)
{
ediOption = "0";
}
stmt.close();
stmt = null;
rSet.close();
rSet = null;
if (!"0".equals(ediOption))
{
GenerateXmlFromDB generateXmlFromDB = GenerateXmlFromDB.getInstance();
String dataString = generateXmlFromDB.getXMLData("w_sep_close", tranId , connectionObject);
System.out.println("generateXmlFromDB returned [" + dataString + "]");
generateXmlFromDB = null;
dom = genericUtility.parseString(dataString);
NFCreateEdiMultiLogic ceateEdiMultiLogic = new NFCreateEdiMultiLogic();
errString = ceateEdiMultiLogic.nfCreateEdiMultiLogic( dom, "w_sep_close", "E", xtraParams, connectionObject );
ceateEdiMultiLogic = null;
if (errString != null && !"SUCCESS".equals(errString))
{
return errString;
}
else
{
errString = "";
}
}
}
//Changed by Rohan on 19/04/11 [AD01SUN009] to generate EDI data.end
}
catch(Exception e)
{
......
webitm-adm/ibase/webitm/ejb/adm/ShiftProcess.java
View file @ cba45176
......@@ -287,8 +287,23 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternCodeFilt = genericUtility.getColumnValue("pattern_code",headerDom);
fromDate = genericUtility.getColumnValue("date__fr",headerDom);
System.out.println(" From Date [" +fromDate+"]");
toDate = genericUtility.getColumnValue("date__to",headerDom);
//Changed by Pawan on 5/11/2011 [AD01SUN008].start
if ( fromDate == null || fromDate.length() <= 0 )
{
errString = itmdbAccessLocal.getErrorString("","INVFRMDATE","","",conn);
return errString;
}
//Changed by Pawan on 5/11/2011 [AD01SUN008].end
toDate = genericUtility.getColumnValue("date__to",headerDom );
//Changed by Pawan on 5/11/2011 [AD01SUN008].start
if ( toDate == null || toDate.length() <= 0)
{
errString = itmdbAccessLocal.getErrorString("","INVDTODATE","","",conn);
return errString;
}
//Changed by Pawan on 5/11/2011 [AD01SUN008].end
System.out.println("ToDate:::[" +toDate+"]");
System.out.println("empCodeFr :"+empCodeFr+" empCodeTo :"+empCodeTo+" deptCodeFr :"+deptCodeFr+" siteCodeFr :"+siteCodeFr);
......@@ -298,6 +313,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("FromDate in DbDate Format :["+strFrDate+"]");
String strToDate = genericUtility.getValidDateString(toDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat());
System.out.println("To Date in Db Date Format:["+strToDate+"]");
java.util.Date frDate = sdf.parse(strFrDate);
fromPrdDate = frDate;
System.out.println("From Date Object :["+frDate+"]");
......
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