modify status

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

webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java

@@ -2869,7 +2869,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							{
 								valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>");
 							}
-							else
+							else if ( expDate.before(ldtLrdate) )
 							{
 								
 							sqlStr = " select ( case when shelf_life is null then 0 else shelf_life end ) mshlife "
@@ -3486,7 +3486,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							{
 								valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>");
 							}
-							else
+							else if ( expDate.before(ldtLrdate) )
 							{
 								
 							sqlStr = " select ( case when shelf_life is null then 0 else shelf_life end ) mshlife "
@@ -3546,6 +3546,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								{
 									valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"E"+"]]>").append("</status>");
 								}
+								else if( "FRSH".equalsIgnoreCase(mlocCode.trim()) )
+								{
+									valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>");
+								}
+								else
+								{
+									valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>");
+								}
 								
 							 }
 						   }