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 Hide 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/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);
......@@ -240,13 +250,56 @@ public class SepCloseConf extends ActionHandlerEJB implements SepCloseConfLocal,
rSet.close();
rSet = null;
}
sql = "UPDATE EMPLOYEE SET RESI_DATE = NULL, RELIEVE_DATE = NULL WHERE EMP_CODE = '"+empCode+"'";
updCnt = stmt.executeUpdate(sql);
if ( updCnt > 0 )
{
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