changes in Work 0rder Amendment

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96865 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-mfg/ibase/webitm/ejb/mfg/WorkOrderAmd.java

@@ -224,10 +224,15 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 							else
 							{
 								System.out.println("mfgDateStart before [" + mfgDateStart + "]");
+								//added by priyanka on 24/11/14
+								if(mfgDateStart!=null && mfgDateStart.trim().length()>0)
+								{
 									mfgDateStart  = genericUtility.getValidDateString(mfgDateStart,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
 									System.out.println("mfgDateStart after " + mfgDateStart);
 									//System.out.println("mfgDateStart + 00:00:00.0 in dbdate format:- " + (mfgDateStart + " 00:00:00.0"));
 									mfgDateStartTs = Timestamp.valueOf(mfgDateStart + " 00:00:00.0");
+								}
+								System.out.println("mfgDateStartTs in Timestamp:- [" + mfgDateStartTs + "]");
 								System.out.println("mfgDateStart in Timestamp:- [" + mfgDateStart + "]");
 								if(mfgDateStartOld != null && mfgDateStartOld.trim().length() > 0)
 								{
@@ -274,13 +279,15 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 									rs = null;
 									System.out.println("mfgDateStartTs:" + mfgDateStartTs);
 									System.out.println("ordDateTs:" + ordDateTs);
-									if (mfgDateStartTs.before(ordDateTs))
+								//	//added by priyanka on 24/11/14
+									if (mfgDateStartTs!=null && mfgDateStartTs.before(ordDateTs))
 									{
 										errCode = "VTMFGORDDT";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
 									}
-									else if(currDate.before(mfgDateStartTs))
+									//added by priyanka on 24/11/14
+									else if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs))
 									{
 										errCode = "VTWOMDOF";
 										errList.add(errCode);
@@ -339,8 +346,9 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 									System.out.println("expDateOld + 00:00:00.0 in dbdate format:- " + (expDateOld + " 00:00:00.0"));
 									expDateOldTs = Timestamp.valueOf(expDateOld + " 00:00:00.0");
 									System.out.println("mfgDateStartOldTs in Timestamp:- " + expDateOldTs);
-									System.out.println("expDateTs.compareTo(mfgDateStartTs)>>>>>>>>> " + expDateTs.compareTo(mfgDateStartTs));
-									if(expDateTs.compareTo(mfgDateStartTs) <= 0)
+									//System.out.println("expDateTs.compareTo(mfgDateStartTs)>>>>>>>>> " + expDateTs.compareTo(mfgDateStartTs));
+										//added by priyanka on 24/11/14
+									if(mfgDateStartTs!=null && expDateTs.compareTo(mfgDateStartTs) <= 0)
 									{
 
 										errCode = "VTWOEXMF";