CHNAGES IN VALIDATION

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

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

@@ -3267,7 +3267,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 												
 												int size = dokkeyList.size();
 												System.out.println("dokkk key size: " +size);
-												for(int i=1;i<=size-1;i++)
+												for(int i=0;i<=size-1;i++)
 												{		
 													cnt=0;
 														minRateDocKey = dokkeyList.get(i);
@@ -3408,10 +3408,10 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 												pstmt = null;
 												if(cnt > 0)
 												{	
-													int lineNoTraceref =0;
+													int lineNoTraceref =0 , lineNoSR=0;
 													valueXmlString.append("<invoice_id>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_id>");
 													
-													sqlStr = " select INV_LINE_NO from INVOICE_TRACE WHERE INVOICE_ID= ? AND ITEM_CODE=? AND LOT_NO= ? ";
+													sqlStr = " select INV_LINE_NO , LINE_NO from INVOICE_TRACE WHERE INVOICE_ID= ? AND ITEM_CODE=? AND LOT_NO= ? ";//LINE_NO  COLUMN ADDED BY NANDKUMAR GADKARI ON 12/03/19
 													if(lotSl!=null && lotSl.trim().length() >0 )
 													{
 													sqlStr = sqlStr		+ "AND LOT_SL= ? "; 
@@ -3428,8 +3428,9 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 													if( rs.next() )
 													{
 														lineNoTraceref = rs.getInt(1); 
+														lineNoSR = rs.getInt(2); 
 														valueXmlString.append("<line_no__inv>").append("<![CDATA["+ lineNoTraceref +"]]>").append("</line_no__inv>");
-														valueXmlString.append("<line_no__invtrace>").append("<![CDATA["+ lineNoTraceref +"]]>").append("</line_no__invtrace>");
+														valueXmlString.append("<line_no__invtrace>").append("<![CDATA["+ lineNoSR +"]]>").append("</line_no__invtrace>");//lineNoSR set by  NANDKUMAR GADKARI ON 12/03/19
 													}
 													if( rs != null )
 														rs.close();
@@ -5658,10 +5659,10 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									pstmt = null;
 									if(cnt > 0)
 									{	
-										int lineNoTraceref =0;
+										int lineNoTraceref =0,lineNoSR=0;
 										valueXmlString.append("<invoice_id>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_id>");
 										
-										sqlStr = " select INV_LINE_NO from INVOICE_TRACE WHERE INVOICE_ID= ? AND ITEM_CODE=? AND LOT_NO= ? ";
+										sqlStr = " select INV_LINE_NO,LINE_NO from INVOICE_TRACE WHERE INVOICE_ID= ? AND ITEM_CODE=? AND LOT_NO= ? ";//LINE NO COLUMN ADDED BY NANDKUMAR GADKARI ON 12/03/19
 										if(lotSl!=null && lotSl.trim().length() >0 )
 										{
 										sqlStr = sqlStr		+ "AND LOT_SL= ? "; 
@@ -5678,8 +5679,9 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										if( rs.next() )
 										{
 											lineNoTraceref = rs.getInt(1); 
+											lineNoSR = rs.getInt(2); 
 											valueXmlString.append("<line_no__inv>").append("<![CDATA["+ lineNoTraceref +"]]>").append("</line_no__inv>");
-											valueXmlString.append("<line_no__invtrace>").append("<![CDATA["+ lineNoTraceref +"]]>").append("</line_no__invtrace>");
+											valueXmlString.append("<line_no__invtrace>").append("<![CDATA["+ lineNoSR +"]]>").append("</line_no__invtrace>");
 										}
 										if( rs != null )
 											rs.close();
@@ -7149,7 +7151,11 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								else if( lsInvoiceId.trim().length() > 0 )
 								{	
 									// 26/10/10 manoharan to set average rate in case invoiced from multiple lot
-									llLineNoInvtraceStr = genericUtility.getColumnValue( "line_no__inv", dom ); 
+									llLineNoInvtraceStr = genericUtility.getColumnValue( "line_no__invtrace", dom );//line_no__inv removed and added line_no__invtrace by nandkumar gadkari on 12/03/19
+									if (llLineNoInvtraceStr != null && llLineNoInvtraceStr.indexOf(".") > 0)
+									{
+										llLineNoInvtraceStr = llLineNoInvtraceStr.substring(0,llLineNoInvtraceStr.indexOf("."));
+									}
 									llLineNoInvtrace = Integer.parseInt( llLineNoInvtraceStr == null || llLineNoInvtraceStr.trim().length() == 0 ? "0" : llLineNoInvtraceStr.trim() ); 	
 									sqlStr = " select i.SORD_NO as SORD_NO, i.SORD_LINE_NO as LINE_NO__SORD"
 											+"	from invoice_trace i "
@@ -7189,13 +7195,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									sqlStr = " select (sum(case when '" + fldName + "' ='rate' then rate else rate__stduom*conv__rtuom_stduom end * quantity) / sum(quantity) ) as lc_inv_rate "
 											+"	from invoice_trace "
 											+"	where invoice_id = ? "
-											+"	and SORD_NO = ? " //
-											+"	and SORD_LINE_NO 	 = ? " ;
-											
+										/*	+"	and SORD_NO = ? " //
+											+"	and SORD_LINE_NO 	 = ? " ;*/ //commented and added + " and line_no = ? " by nandkumar gadkari on 12/03/19; 
+											+ " and line_no = ? "; 
 									pstmt = conn.prepareStatement( sqlStr );
 									pstmt.setString( 1, lsInvoiceId );
-									pstmt.setString( 2, saleOrder );
-									pstmt.setString( 3, lineNoSord );
+									/*pstmt.setString( 2, saleOrder );
+									pstmt.setString( 3, lineNoSord );*///commented and added + " and line_no = ? " by nandkumar gadkari on 12/03/19; 
+									pstmt.setInt( 2, llLineNoInvtrace );
 									rs = pstmt.executeQuery();
 									if( rs.next() )
 									{