Commit b3ae64a9 authored by vdhoble's avatar vdhoble

changes made for comparing start date to order date.

if greater> error thrown
it should not be less or equal.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96944 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 795b3a2e
...@@ -246,8 +246,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -246,8 +246,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
{ {
errCode = "VTWOMFNL"; errCode = "VTWOMFNL";
// 23/11/14 manohar not to give error // 23/11/14 manohar not to give error
//errList.add(errCode); errList.add(errCode);
//errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
//Commented validation by manoj dtd 04/12/2014 //Commented validation by manoj dtd 04/12/2014
/*else if(mfgDateStartTs!=null && mfgDateStartTs.before(mfgDateStartOldTs)) /*else if(mfgDateStartTs!=null && mfgDateStartTs.before(mfgDateStartOldTs))
...@@ -256,15 +256,16 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -256,15 +256,16 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/ }*/
else if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs))
{
errCode = "VTWOMDOF";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}else
}
if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs))//THIS IF STATEMENT IS TAKEN OUT OF PARENT IF ***VISHAKHA ON 09/12/14
{ {
errCode = "VTWOMDOF";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
//else{ ****** COMMENTED BY VISHAKHA...09/12/2014
// 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
tranIdRef = getColumnValue("work_order__ref", dom); tranIdRef = getColumnValue("work_order__ref", dom);
sql = "Select ord_date from workorder where work_order = ?"; sql = "Select ord_date from workorder where work_order = ?";
...@@ -289,16 +290,16 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W ...@@ -289,16 +290,16 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
//added by priyanka on 24/11/14 //added by priyanka on 24/11/14
else if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs)) /*else if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs))
{ {
errCode = "VTWOMDOF"; errCode = "VTWOMDOF";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} } THIS STATEMENT IS WRITTEN TWICE*/
} }
// 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
} }
}//end mfg_date //}//end mfg_date
else if (childNodeName.equalsIgnoreCase("exp_date")) else if (childNodeName.equalsIgnoreCase("exp_date"))
{ {
......
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