Changes in generateDocKey() method and changes in lot_no itemChange if...

Changes in generateDocKey() method and changes in lot_no itemChange if invoiceID is not null condition.

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

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

@@ -397,6 +397,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		String valStr = null;
 		String siteCode3 = null;
 		int cntItemLotInfo=0;
+		double qutyAdj=0.0;
 		//Added by Santosh on 27/04/2017 to get available invoice Id [Start]
 		String invoiceQty = "", adjQty = "";
 		HashMap<String, String> curFormItemLotHMap = new HashMap<String, String>();
@@ -2514,6 +2515,17 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						valueXmlString.append("<mrp_value>").append("<![CDATA[" + getRequiredDecimal( quantity * Double.parseDouble(varValue), 4 ) + "]]>").append("</mrp_value>");
 						setNodeValue( dom, "mrp_value", getRequiredDecimal( quantity * Double.parseDouble(varValue), 4 ) );	
 						
+						//added  by nandkumar gadkari-------------
+						if (lotNo!=null && lotNo.trim().length()>0)
+						{
+						reStr = itemChanged(dom, dom1, dom2, objContext, "lot_no", editFlag, xtraParams);
+						pos = reStr.indexOf("<Detail2>");
+						reStr = reStr.substring(pos + 9);
+						pos = reStr.indexOf("</Detail2>");
+						reStr = reStr.substring(0,pos);
+						valueXmlString.append(reStr);
+						}
+						//added  by nandkumar gadkari-------------
 					} // end of quantity 
 					else if (currentColumn.trim().equals("rate") )		
 					{
@@ -2740,6 +2752,32 @@ 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= ?";
+								pstmt1 = conn.prepareStatement(sql1);
+								pstmt1.setString( 1, itemCode );
+								pstmt1.setString( 2, lotNo );
+								
+								rs1 = pstmt1.executeQuery();
+								
+								if(rs1.next())
+								{
+									 qutyAdj= rs1.getDouble(1); 
+								}
+								if(pstmt1 != null)
+								{
+									pstmt1.close();
+									pstmt1 = null;
+								}
+								if(rs1 != null)
+								{
+									rs1.close();
+									rs1 = null;
+								}
+								
+								sQuantity=Math.abs(sQuantity-qutyAdj) ;
+								//aaded by Nandkumar gadkari end---------------------
+								
 								
 								valueXmlString.append("<quantity>").append("<![CDATA[" + getRequiredDecimal( sQuantity, 3 ) + "]]>").append("</quantity>");
 								setNodeValue( dom, "quantity", getRequiredDecimal( sQuantity, 3 ) );