Added site_code validation in invoice id column

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

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

@@ -3485,11 +3485,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								if (tempInvoiceId == null || tempInvoiceId.trim().length() == 0)
 								{
 									sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
-											+ "	SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
-											+ " FROM MIN_RATE_HISTORY MRH,  SRETURNDET SRDET"
-											+ " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) "
+										//	+ "	SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, " //COMMENTED BY NANDKUMAR GADKARI ON 25/12/18
+											+ " MRH.EFF_COST"
+											+ " FROM MIN_RATE_HISTORY MRH"
+										//	+ ",  SRETURNDET SRDET" //COMMENTED BY NANDKUMAR GADKARI ON 25/12/18
+											+ " WHERE "
+											//+ "MRH.DOC_KEY =SRDET.DOC_KEY(+) "//COMMENTED BY NANDKUMAR GADKARI ON 25/12/18
 										//	+ " AND MRH.CUST_CODE = ?" //COMMENTED BY NANDKUMAR GADKARI ON 17/12/18 TO SET DOC_KAY WITHOUT CUST_CODE
-											+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+										//	+ " AND "
+											+ " MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
 										
 											+ " AND MRH.SITE_CODE = ? "
 											//+ " AND MRH.QUANTITY IS NOT NULL"
@@ -3508,7 +3512,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										{
 											invoiceId = checkNull(rs.getString("INVOICE_ID"));
 											invoiceQty = checkNull(rs.getString("QUANTITY"));
-											adjQty = checkNull(rs.getString("QTY_ADJ"));
+											//adjQty = checkNull(rs.getString("QTY_ADJ"));//COMMENTED BY NANDKUMAR GADKARI ON 25/12/18
 											
 											rate = rs.getDouble("EFF_COST");
 											
@@ -7125,13 +7129,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						{ 
 							mVal = null;
 							mVal = genericUtility.getColumnValue( "invoice_id", dom ); //dw_edit.GetItemString(dw_edit.GetRow(),fldname) 
+							siteCode = genericUtility.getColumnValue( "site_code", dom );//added by nandkumar gadkari on 25/12/18
 							if( mVal != null && mVal.trim().length() > 0 )
 							{
-								sqlStr = " select Count(*) cnt from invoice where invoice_id = ? "; //:mVal;
+								sqlStr = " select Count(*) cnt from invoice where invoice_id = ? and site_code = ? "; //:mVal;// site_code added in sql by nandkumar gadkari on 25/12/18
 							
 								pstmt = conn.prepareStatement( sqlStr );
 								
 								pstmt.setString( 1, mVal );
+								pstmt.setString( 2, siteCode );
 								
 								rs = pstmt.executeQuery();
 								if( rs.next() )