commented N status set on lot no

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

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

@@ -4534,8 +4534,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									pstmt.close();
 									pstmt = null;
 
-									
-									mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
+									//commented by nandkumar gadkari on 18/11/19
+									/*mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
 									
 									System.out.println("mchkDate["+mchkDate+"] mexpDate["+mexpDate+"]");
 									if( mexpDate.before( mchkDate ) )
@@ -4550,7 +4550,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										reStr = reStr.substring(0,pos);
 										valueXmlString.append(reStr);
 										// end 22/04/10 manoharan to set the loc_code accordingly
-									}
+									}*/
 								}else
 								{
 									lsDamagedtype = distCommon.getDisparams( "999999", "DAMAGED_SRET_TYPE", conn );
@@ -4925,11 +4925,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							}
 							else
 							  {
-								if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
+								/*if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
 								{
 									valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"N"+"]]>").append("</status>");
 								}
-								else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
+								else*/  //commented by nandkumar gadkari on 18/11/19
+								if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
 								{
 									valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"H"+"]]>").append("</status>");
 								}
@@ -5608,11 +5609,11 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							}
 							else
 							  {
-								if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
+								/*if( "NEXP".equalsIgnoreCase(mlocCode.trim()) )
 								{
 									valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"N"+"]]>").append("</status>");
-								}
-								else if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
+								} //commented by nandkumar gadkari on 18/11/19
+								else*/ if( "HOLD".equalsIgnoreCase(mlocCode.trim()) )
 								{
 									valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"H"+"]]>").append("</status>");
 								}

webitm-dis/src/ibase/webitm/ejb/dis/SalesReturn.java

@@ -5063,8 +5063,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								pstmt.close();
 								pstmt = null;
 
-								
-								mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
+								// commented by nandkumar gadkari on 18/11/19
+							/*	mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
 								System.out.println( "mexpDate :: " + mexpDate + "mchkDate" +mchkDate );
 								if( mexpDate.before( mchkDate ) )
 								{
@@ -5078,7 +5078,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									reStr = reStr.substring(0,pos);
 									valueXmlString.append(reStr);
 									// end 22/04/10 manoharan to set the loc_code accordingly
-								}
+								}*/
 							}else
 							{
 								lsDamagedtype = distCommon.getDisparams( "999999", "DAMAGED_SRET_TYPE", conn );