Commit 8cbc5ae7 authored by cpatil's avatar cpatil

change status field as editable


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91879 ce508802-f39f-4f6c-b175-0d175dae99d5
parent db2f4500
...@@ -2841,10 +2841,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2841,10 +2841,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
lotSl = genericUtility.getColumnValue( "lot_sl", dom ); lotSl = genericUtility.getColumnValue( "lot_sl", dom );
if(lotNo != null && lotSl != null ) if(lotNo != null && lotSl != null )
{ {
sqlStr = " select count(*) from stock where lot_no = ? and lot_sl= ? " ; sqlStr = " select count(*) from stock where lot_no = ? and lot_sl= ? and item_code = ? " ;
pstmt = conn.prepareStatement( sqlStr ); pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lotNo ); pstmt.setString( 1, lotNo );
pstmt.setString( 2, lotSl ); pstmt.setString( 2, lotSl );
pstmt.setString( 3, mitemCode );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) if( rs.next() )
...@@ -2867,7 +2869,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2867,7 +2869,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
{ {
if(expDate.after(ldtLrdate)) if(expDate.after(ldtLrdate))
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
else if ( expDate.before(ldtLrdate) ) else if ( expDate.before(ldtLrdate) )
{ {
...@@ -2909,36 +2911,40 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2909,36 +2911,40 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("@@@@@ :mshlife:["+mshlife+"]:::mlocCode:["+mlocCode+"]"); System.out.println("@@@@@ :mshlife:["+mshlife+"]:::mlocCode:["+mlocCode+"]");
if( mshlife == 0 ) if( mshlife == 0 )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"E"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"E"+"]]>").append("</status>");
} }
else else
{ {
if( "NEXP".equalsIgnoreCase(mlocCode.trim()) ) if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"N"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"N"+"]]>").append("</status>");
} }
else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) ) else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"H"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"H"+"]]>").append("</status>");
} }
else if( "DMGD".equalsIgnoreCase(mlocCode.trim()) ) else if( "DMGD".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"D"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"D"+"]]>").append("</status>");
} }
else if( "EXP".equalsIgnoreCase(mlocCode.trim()) ) else if( "EXP".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"E"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"E"+"]]>").append("</status>");
} }
else if( "FRSH".equalsIgnoreCase(mlocCode.trim()) ) else if( "FRSH".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
else else
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
} }
} }
else if ( expDate.equals(ldtLrdate) )
{
valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
}
} }
} }
...@@ -3491,7 +3497,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3491,7 +3497,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
{ {
if(expDate.after(ldtLrdate)) if(expDate.after(ldtLrdate))
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
else if ( expDate.before(ldtLrdate) ) else if ( expDate.before(ldtLrdate) )
{ {
...@@ -3533,37 +3539,41 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3533,37 +3539,41 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("@@@@@ :mshlife:["+mshlife+"]:::mlocCode:["+mlocCode+"]"); System.out.println("@@@@@ :mshlife:["+mshlife+"]:::mlocCode:["+mlocCode+"]");
if( mshlife == 0 ) if( mshlife == 0 )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"E"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"E"+"]]>").append("</status>");
} }
else else
{ {
if( "NEXP".equalsIgnoreCase(mlocCode.trim()) ) if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"N"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"N"+"]]>").append("</status>");
} }
else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) ) else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"H"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"H"+"]]>").append("</status>");
} }
else if( "DMGD".equalsIgnoreCase(mlocCode.trim()) ) else if( "DMGD".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"D"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"D"+"]]>").append("</status>");
} }
else if( "EXP".equalsIgnoreCase(mlocCode.trim()) ) else if( "EXP".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"E"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"E"+"]]>").append("</status>");
} }
else if( "FRSH".equalsIgnoreCase(mlocCode.trim()) ) else if( "FRSH".equalsIgnoreCase(mlocCode.trim()) )
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
else else
{ {
valueXmlString.append("<status protect =\"1\">").append("<![CDATA["+"S"+"]]>").append("</status>"); valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
} }
} }
} }
else if ( expDate.equals(ldtLrdate) )
{
valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
}
} }
} }
} }
......
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