Skip to content

B
business-java
Commit 9e3c173f authored by manohar's avatar manohar
Browse files
Options

maf_date__start and exp_date validation made proper 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96854 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6c81d98b
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 15 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WorkOrderAmd.java
View file @ 9e3c173f
...@@ -11,6 +11,7 @@ package ibase.webitm.ejb.mfg; ...@@ -11,6 +11,7 @@ package ibase.webitm.ejb.mfg;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.utility.E12GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -66,6 +67,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -66,6 +67,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
Document dom2 = null; Document dom2 = null;
try try
{ {
System.out.println(" in WorkOrderAmd : wfValData : xmlString [" + xmlString+ "]");
dom = parseString(xmlString); dom = parseString(xmlString);
dom1 = parseString(xmlString1); dom1 = parseString(xmlString1);
if (xmlString2.trim().length() > 0 ) if (xmlString2.trim().length() > 0 )
...@@ -117,12 +119,17 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -117,12 +119,17 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
String ordDate=""; String ordDate="";
Timestamp ordDateTs = null; Timestamp ordDateTs = null;
Timestamp currDate = null;
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
GenericUtility genericUtility = GenericUtility.getInstance(); E12GenericUtility genericUtility = new E12GenericUtility(); //GenericUtility.getInstance();
currDate =new Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
currDate = java.sql.Timestamp.valueOf(sdf.format(currDate) + " 00:00:00.000");
if(objContext != null && objContext.trim().length()>0) if(objContext != null && objContext.trim().length()>0)
{ {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
...@@ -130,7 +137,6 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -130,7 +137,6 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
switch(currentFormNo) switch(currentFormNo)
{ {
case 1 : case 1 :
parentNodeList = dom.getElementsByTagName("Detail1"); parentNodeList = dom.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
...@@ -188,24 +194,41 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -188,24 +194,41 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
else if (childNodeName.equalsIgnoreCase("mfg_date__start")) else if (childNodeName.equalsIgnoreCase("mfg_date__start"))
{ {
mfgDateStart = getColumnValue("mfg_date__start",dom); mfgDateStart = getColumnValue("mfg_date__start",dom);
mfgDateStartOld = getColumnValue("mfg_date__start__o",dom); mfgDateStartOld = getColumnValue("mfg_date__start__o",dom);
expDate = getColumnValue("exp_date",dom); expDate = getColumnValue("exp_date",dom);
planDueDate = getColumnValue("plan__due_date",dom); planDueDate = getColumnValue("plan__due_date",dom);
if( mfgDateStart == null || mfgDateStart.trim().length() == 0 || "null".equals(mfgDateStart))
{
mfgDateStart = "";
}
if( mfgDateStartOld == null || mfgDateStartOld.trim().length() == 0 || "null".equals(mfgDateStartOld))
{
mfgDateStartOld = "";
}
if( expDate == null || expDate.trim().length() == 0 || "null".equals(expDate))
{
expDate = "";
}
if( planDueDate == null || planDueDate.trim().length() == 0 || "null".equals(planDueDate))
{
planDueDate = "";
}
if( (mfgDateStart == null || mfgDateStart.trim().length() == 0) && (expDate == null || expDate.trim().length() == 0)&&(planDueDate == null || planDueDate.trim().length() == 0)) if( (mfgDateStart == null || mfgDateStart.trim().length() == 0) && (expDate == null || expDate.trim().length() == 0)&&(planDueDate == null || planDueDate.trim().length() == 0))
{ {
errCode = "VTWOVLNL"; errCode = "VTWOVLNL";
errList.add(errCode); // 23/11/14 manoharan not to give error
errFields.add(childNodeName.toLowerCase()); //errList.add(errCode);
//errFields.add(childNodeName.toLowerCase());
}// end if any value is null }// end if any value is null
else else
{ {
System.out.println("mfgDateStart before [" + mfgDateStart + "]");
mfgDateStart = genericUtility.getValidDateString(mfgDateStart,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()); mfgDateStart = genericUtility.getValidDateString(mfgDateStart,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
System.out.println("mfgDateStart in dbdate format:- " + mfgDateStart); System.out.println("mfgDateStart after " + mfgDateStart);
System.out.println("mfgDateStart + 00:00:00.0 in dbdate format:- " + (mfgDateStart + " 00:00:00.0")); //System.out.println("mfgDateStart + 00:00:00.0 in dbdate format:- " + (mfgDateStart + " 00:00:00.0"));
mfgDateStartTs = Timestamp.valueOf(mfgDateStart + " 00:00:00.0"); mfgDateStartTs = Timestamp.valueOf(mfgDateStart + " 00:00:00.0");
System.out.println("mfgDateStart in Timestamp:- " + mfgDateStart); System.out.println("mfgDateStart in Timestamp:- [" + mfgDateStart + "]");
if(mfgDateStartOld != null && mfgDateStartOld.trim().length() > 0) if(mfgDateStartOld != null && mfgDateStartOld.trim().length() > 0)
{ {
mfgDateStartOld = genericUtility.getValidDateString(mfgDateStartOld,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()); mfgDateStartOld = genericUtility.getValidDateString(mfgDateStartOld,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
...@@ -216,15 +239,23 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -216,15 +239,23 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
if(mfgDateStartTs.compareTo(mfgDateStartOldTs) == 0) if(mfgDateStartTs.compareTo(mfgDateStartOldTs) == 0)
{ {
errCode = "VTWOMFNL"; errCode = "VTWOMFNL";
// 23/11/14 manohar not to give error
//errList.add(errCode);
//errFields.add(childNodeName.toLowerCase());
}
else if(mfgDateStartTs.before(mfgDateStartOldTs))
{
errCode = "VTWOMFIN";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
if(mfgDateStartTs.before(mfgDateStartOldTs)) else if(currDate.before(mfgDateStartTs))
{ {
errCode = "VTWOMFIN"; errCode = "VTWOMDOF";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
}else }else
{ {
// start added by chnadrashekar as per manoj sir instruction ON 05/11/14 // start added by chnadrashekar as per manoj sir instruction ON 05/11/14
...@@ -249,6 +280,12 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -249,6 +280,12 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else if(currDate.before(mfgDateStartTs))
{
errCode = "VTWOMDOF";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
} }
// end added by chnadrashekar as per manoj sir instruction ON 05/11/14 // end added by chnadrashekar as per manoj sir instruction ON 05/11/14
} }
...@@ -260,8 +297,24 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -260,8 +297,24 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
expDateOld = getColumnValue("exp_date__o",dom); expDateOld = getColumnValue("exp_date__o",dom);
expDate = getColumnValue("exp_date",dom); expDate = getColumnValue("exp_date",dom);
planDueDate = getColumnValue("plan__due_date",dom); planDueDate = getColumnValue("plan__due_date",dom);
if( expDateOld == null || expDateOld.trim().length() == 0 || "null".equals(expDateOld))
{
expDateOld = "";
}
if( mfgDateStart == null || mfgDateStart.trim().length() == 0 || "null".equals(mfgDateStart))
{
mfgDateStart = "";
}
if( expDate == null || expDate.trim().length() == 0 || "null".equals(expDate))
{
expDate = "";
}
if( planDueDate == null || planDueDate.trim().length() == 0 || "null".equals(planDueDate))
{
planDueDate = "";
}
if( expDate == null || expDate.trim().length() == 0) if( expDate == null || expDate.trim().length() == 0 )
{ {
}// end if expDate is null }// end if expDate is null
...@@ -309,7 +362,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -309,7 +362,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
// break; // break;
// } // }
if(expDateTs.before(getCurrdateAppFormat())) if(expDateTs.before(currDate))
{ {
System.out.println("Previous day expdate:"); System.out.println("Previous day expdate:");
errCode = "VTWOMFMFT"; errCode = "VTWOMFMFT";
...@@ -325,6 +378,23 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -325,6 +378,23 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
planDueDateOld = getColumnValue("plan_due_date_o",dom); planDueDateOld = getColumnValue("plan_due_date_o",dom);
expDate = getColumnValue("exp_date",dom); expDate = getColumnValue("exp_date",dom);
planDueDate = getColumnValue("plan__due_date",dom); planDueDate = getColumnValue("plan__due_date",dom);
if( mfgDateStart == null || mfgDateStart.trim().length() == 0 || "null".equals(mfgDateStart))
{
mfgDateStart = "";
}
if( planDueDateOld == null || planDueDateOld.trim().length() == 0 || "null".equals(planDueDateOld))
{
planDueDateOld = "";
}
if( expDate == null || expDate.trim().length() == 0 || "null".equals(expDate))
{
expDate = "";
}
if( planDueDate == null || planDueDate.trim().length() == 0 || "null".equals(planDueDate))
{
planDueDate = "";
}
if( planDueDate == null || planDueDate.trim().length() == 0) if( planDueDate == null || planDueDate.trim().length() == 0)
{ {
...@@ -347,8 +417,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -347,8 +417,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
if(planDueDateTs.compareTo(planDueDateOldTs) == 0) if(planDueDateTs.compareTo(planDueDateOldTs) == 0)
{ {
errCode = "VTWOPLNL"; errCode = "VTWOPLNL";
errList.add(errCode); //errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); //errFields.add(childNodeName.toLowerCase());
} }
if(planDueDateTs.before(planDueDateOldTs)) if(planDueDateTs.before(planDueDateOldTs))
{ {
...@@ -357,7 +427,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -357,7 +427,7 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
if(planDueDateTs.before(getCurrdateAppFormat())) if(planDueDateTs.before(currDate))
{ {
System.out.println("Previous day plan date:"); System.out.println("Previous day plan date:");
errCode = "VTWOMFPLT"; errCode = "VTWOMFPLT";
......
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