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@190813 ce508802-f39f-4f6c-b175-0d175dae99d5

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

@@ -33,8 +33,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import javax.ejb.Stateless; // added for ejb3
 import ibase.webitm.ejb.ITMDBAccessEJB;
-
-import org.apache.poi.util.SystemOutLogger;
 import org.w3c.dom.CDATASection;
 
 import java.text.*; 
@@ -3443,7 +3441,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									if(docKey.trim().length() > 0 || docKey != null )
 									{
 										System.out.println("inside dok key1 : " +docKey);
-										sqlStr = " select INVOICE_ID , INVOICE_DATE  from MIN_RATE_HISTORY where DOC_KEY = ? "; //trim(:ls_itemcode);
+										sqlStr = " select INVOICE_ID , INVOICE_DATE ,EFF_COST   from MIN_RATE_HISTORY where DOC_KEY = ? "; //trim(:ls_itemcode);
 										pstmt = conn.prepareStatement( sqlStr );
 										pstmt.setString( 1, docKey );
 										rs = pstmt.executeQuery();
@@ -3451,6 +3449,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										{
 											invRefId = checkNull(rs.getString( "INVOICE_ID" ));
 											invRefDate = checkNull(sdf.format( rs.getTimestamp( "INVOICE_DATE" )));
+											rate = rs.getDouble( "EFF_COST" );
 										}
 										if( rs != null )
 											rs.close();
@@ -3460,10 +3459,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										pstmt = null;
 
 										valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
+										valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
 										if(invRefDate != null && invRefDate.trim().length() >0)
 										{
 											valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
 										}
+										
 									}
 									//Set inv_ref and date [End] PriyankaC on 26 June2018
 									invoiceId = null;