Changes in sql for picking adj quantity

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

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

@@ -3132,13 +3132,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"*/
 									//sql added for remove join with sreturnDet table  by nandkumar gadkari on 18/07/19
 									sql =" SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
-										+ "	CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+										+ "	CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST,MRH.DOC_KEY "// MRH.DOC_KEY added by nandkumar on 21/08/19
 										+ " FROM MIN_RATE_HISTORY MRH "
 										+ " WHERE  MRH.CUST_CODE = ?"
 										+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
 										+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END >= ?  "
 										+ " AND MRH.QUANTITY IS NOT NULL"
-										+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
+										+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ,MRH.DOC_KEY "
 										+ orderByStr;
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, custCode);
@@ -3151,6 +3151,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									while(rs.next())
 									{
 										invoiceId = checkNull(rs.getString("INVOICE_ID"));
+										//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start---------------
+										minRateDocKey = checkNull(rs.getString("DOC_KEY"));
+										if(minRateDocKey.indexOf(invoiceId) != -1)
+										{
+										
+										//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------end---------------
 										invoiceQty = checkNull(rs.getString("QUANTITY"));
 										//adjQty = checkNull(rs.getString("QTY_ADJ"));
 										adjQty =rs.getDouble("QTY_ADJ");
@@ -3276,6 +3282,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											break;
 										}
 									}
+									}
 									if(pstmt != null)
 									{
 										pstmt.close();

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

@@ -3496,13 +3496,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									//+ " ORDER BY "+orderByStr;
 */								//sql added for remove join with sreturnDet table  by nandkumar gadkari on 18/07/19
 								sql =" SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
-									+ "	CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+									+ "	CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST,MRH.DOC_KEY "// MRH.DOC_KEY added by nandkumar on 21/08/19
 									+ " FROM MIN_RATE_HISTORY MRH "
 									+ " WHERE  MRH.CUST_CODE = ?"
 									+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
 									+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END >= ?  "
 									+ " AND MRH.QUANTITY IS NOT NULL"
-									+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
+									+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ,MRH.DOC_KEY "
 									+ orderByStr;
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, custCode);
@@ -3515,6 +3515,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								while(rs.next())
 								{
 									invoiceId = checkNull(rs.getString("INVOICE_ID"));
+									//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start---------------
+									minRateDocKey = checkNull(rs.getString("DOC_KEY"));
+									if(minRateDocKey.indexOf(invoiceId) != -1)
+									{
+									
+									//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------end---------------
 									invoiceQty = checkNull(rs.getString("QUANTITY"));
 									//adjQty = checkNull(rs.getString("QTY_ADJ"));
 									adjQty =rs.getDouble("QTY_ADJ");
@@ -3650,6 +3656,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										break;
 									}// //	commented   by Nandkumar Gadkari on 15/10/18
 									//	Changes  by Nandkumar Gadkari on 14/09/18--------[end]---------
+									
+									}
 								}
 								if(pstmt != null)
 								{
@@ -3866,6 +3874,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
 									
 								}
+								
 							}
 							else if(invoiceId != null && invoiceId.trim().length()>0)
 							{