changes in line_no invtrace column item chnage method sql chnages

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

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

@@ -2749,17 +2749,31 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								
 								valueXmlString.append("<lot_sl>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>");
 								setNodeValue( dom, "lot_sl", lotSl );
-								//aaded by Nandkumar gadkari Start---------------------
-								sql1 = "select QUANTITY_ADJ from MIN_RATE_HISTORY where DOC_KEY like '%"+invoiceId+"%' AND ITEM_CODE=? AND LOT_NO= ?";
+								//changes  by Nandkumar gadkari Start-----on 31/12/18----------------
+								//sql1 = "select QUANTITY_ADJ from MIN_RATE_HISTORY where DOC_KEY like '%"+invoiceId+"%' AND ITEM_CODE=? AND LOT_NO= ?";
+								String docKey="";
+								sql1 = "select DOC_KEY,QUANTITY_ADJ from MIN_RATE_HISTORY where invoice_id = ? AND ITEM_CODE=? AND LOT_NO= ?";
 								pstmt1 = conn.prepareStatement(sql1);
-								pstmt1.setString( 1, itemCode );
-								pstmt1.setString( 2, lotNo );
+								pstmt1.setString( 1, invoiceId );
+								pstmt1.setString( 2, itemCode );
+								pstmt1.setString( 3, lotNo );
 								
 								rs1 = pstmt1.executeQuery();
 								
-								if(rs1.next())
+								/*if(rs1.next())
 								{
 									 qutyAdj= rs1.getDouble(1); 
+								}*/
+								while(rs1.next())
+								{
+									docKey= checkNullTrim(rs1.getString(1)); 
+								
+									if( docKey.indexOf(invoiceId) != -1)
+									{
+										qutyAdj= rs1.getDouble(2); 
+										break;
+									}
+									 
 								}
 								if(pstmt1 != null)
 								{
@@ -2773,7 +2787,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								}
 								
 								sQuantity=Math.abs(sQuantity-qutyAdj) ;
-								//aaded by Nandkumar gadkari end---------------------
+								//chnages  by Nandkumar gadkari end---------------------
 								
 								
 								valueXmlString.append("<quantity>").append("<![CDATA[" + getRequiredDecimal( sQuantity, 3 ) + "]]>").append("</quantity>");