Changes done In Work Order Amendment

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

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

@@ -249,12 +249,13 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 										//errList.add(errCode);
 										//errFields.add(childNodeName.toLowerCase());
 									}
-									else if(mfgDateStartTs!=null && mfgDateStartTs.before(mfgDateStartOldTs))
+									//Commented validation by manoj dtd 04/12/2014
+									/*else if(mfgDateStartTs!=null && mfgDateStartTs.before(mfgDateStartOldTs))
 									{
 										errCode = "VTWOMFIN";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
-									}
+									}*/
 									else if(mfgDateStartTs!=null && currDate.before(mfgDateStartTs))
 									{
 										errCode = "VTWOMDOF";
@@ -356,13 +357,14 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
 									}
-									if(expDateTs.before(expDateOldTs))
+									//Commented validation by manoj dtd 04/12/2014
+									/*if(expDateTs.before(expDateOldTs))
 									{
 										System.out.println("Changed expiry date less the old exp date:");
 										errCode = "VTWOEXIN";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
-									}
+									}*/
 								}
 //								if(expDateTs.compareTo(expDateOldTs) == 0)
 //								{
@@ -711,14 +713,17 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 						pstmt = null;
 						rs = null;
 						System.out.println("trackShelfLife>>>>> " +trackShelfLife + " shelfLife>>>>>>>> " + shelfLife);
-						if(trackShelfLife.equalsIgnoreCase("Y"))
+					
+						valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");//added by priyanka on 04/12/14
+						//commented by priyanka on 4/12/14 as per manoj sharma instruction
+						/*if(trackShelfLife.equalsIgnoreCase("Y"))
 						{
 							valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");
 						}
 						else
 						{
 							valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");
-						}
+						}*/
 					}
 					else if(currentColumn.trim().equalsIgnoreCase("site_code"))
 					{
@@ -863,14 +868,17 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 							pstmt = null;
 							rs = null;
 							System.out.println("trackShelfLife>>>>> " +trackShelfLife + " shelfLife>>>>>>>> " + shelfLife);
-							if(trackShelfLife.equalsIgnoreCase("Y"))
+							
+							valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA[]]>").append("</exp_date>");//added by priyanka on 04/12/14
+							//commented by priyanka on 4/12/14 as per manoj sharma instruction
+							/*if(trackShelfLife.equalsIgnoreCase("Y"))
 							{
 								valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA[]]>").append("</exp_date>");
 							}
 							else
 							{
 								valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA[]]>").append("</exp_date>");
-							}
+							}*/
 							}
 						else
 						{
@@ -919,7 +927,8 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 								pstmt = null;
 								rs = null;
 								expDateStr  = genericUtility.getValidDateString(expDate.toString(),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
-								valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");
+								//valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");
+								valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA["+expDateStr.trim()+"]]>").append("</exp_date>");
 							}
 							else
 							{
@@ -929,7 +938,7 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 					}
 					valueXmlString.append("</Detail>");
 				break;
-		   	}//end of switch
+		  	}//end of switch
 			valueXmlString.append("</Root>");
 		}//END OF TRY
 		catch(Exception e)
@@ -961,7 +970,7 @@ public class WorkOrderAmd extends ValidatorEJB implements  WorkOrderAmdLocal,  W
 		return valueXmlString.toString();
 	 }//END OF ITEMCHANGE
 	  private Timestamp getCurrdateAppFormat()
-    {
+	  {
         String s = "";	
 		 Timestamp timestamp = null;	
         GenericUtility genericUtility = GenericUtility.getInstance();