removed location code filter from stock sql

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

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

@@ -4262,7 +4262,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									+" from stock "
 									+" where item_code = ? " //:mitem_code 
 									+"   and site_code = ? " //:msite_code
-									+"   and loc_code = ? " //:mloc_code
+								//	+"   and loc_code = ? "//:mloc_code commented by nandkumar gadkari on 12/04/19 
 									+"   and lot_no = ? " //:mlot_no
 									+"   and lot_sl = ? " //:mlot_sl
 									+"   and exp_date <= ? "; //:mtran_date;
@@ -4271,10 +4271,10 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							
 							pstmt.setString( 1, itemCode );
 							pstmt.setString( 2, siteCode );
-							pstmt.setString( 3, locCode );
-							pstmt.setString( 4, lotNo );
-							pstmt.setString( 5, lotSl );
-							pstmt.setTimestamp( 6, mtranDate );
+							//pstmt.setString( 3, locCode );//:mloc_code commented by nandkumar gadkari on 12/04/19 
+							pstmt.setString( 3, lotNo );
+							pstmt.setString( 4, lotSl );
+							pstmt.setTimestamp( 5, mtranDate );
 							
 							rs = pstmt.executeQuery();
 							

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

@@ -4802,7 +4802,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								+" from stock "
 							+" where item_code = ? " //:mitem_code 
 							+"   and site_code = ? " //:msite_code
-							+"   and loc_code = ? " //:mloc_code
+						//	+"   and loc_code = ? " //:mloc_code commented by nandkumar gadkari on 12/04/19 
 							+"   and lot_no = ? " //:mlot_no
 							+"   and lot_sl = ? " //:mlot_sl
 							+"   and exp_date <= ? "; //:mtran_date;
@@ -4811,10 +4811,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						
 						pstmt.setString( 1, itemCode );
 						pstmt.setString( 2, siteCode );
-						pstmt.setString( 3, locCode );
-						pstmt.setString( 4, lotNo );
-						pstmt.setString( 5, lotSl );
-						pstmt.setTimestamp( 6, mtranDate );
+						//pstmt.setString( 3, locCode ); //:mloc_code commented by nandkumar gadkari on 12/04/19
+						pstmt.setString( 3, lotNo );
+						pstmt.setString( 4, lotSl );
+						pstmt.setTimestamp( 5, mtranDate );
 						
 						rs = pstmt.executeQuery();
 						
@@ -4879,6 +4879,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 
 								
 								mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
+								System.out.println( "mexpDate :: " + mexpDate + "mchkDate" +mchkDate );
 								if( mexpDate.before( mchkDate ) )
 								{
 									valueXmlString.append("<status>").append("<![CDATA[" + "N" + "]]>").append("</status>");