changes for request ID- D17JVHB001

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

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

@@ -407,6 +407,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		String minRateDocKey = "";
 		boolean isMinHisRateSet = false;
 		//Added by Santosh on 16/05/2017 [End]
+		String shExpDiscAppl="";// Added by Nandkumar Gadkari on 19MAR2018
 		try
 		{
 			// Changed by Sneha on 22-07-2016 for exchange rate [Start]
@@ -1471,6 +1472,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					}
 				   while(ctr < childNodeListLength && !childNodeName.equals(currentColumn));
 					
+					// Added by Nandkumar Gadkari on 19MAR2018-----------start ----------
+					shExpDiscAppl = distCommon.getDisparams( "999999", "SH_EXP_DISC_APPL", conn );
+		        	System.out.println("shExpDiscAppl ["+shExpDiscAppl+"]  Disparam Value");
+		        	if(shExpDiscAppl == null || shExpDiscAppl.trim().length()== 0 || "NULLFOUND".equalsIgnoreCase(shExpDiscAppl))
+		        	{
+		        		shExpDiscAppl="N";
+		        	}
+		        	// Added by Nandkumar Gadkari on 19MAR2018-----------end----------
+						   
 					if(currentColumn.trim().equalsIgnoreCase("itm_default"))
 					{
 						invoiceId = genericUtility.getColumnValue("invoice_id", dom1);
@@ -4066,7 +4076,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							pstmt = null;
 
 						}
-						if ( channelPartner != null && !"Y".equals( channelPartner ) )
+						if ( channelPartner != null && !"Y".equals( channelPartner )  || "Y".equalsIgnoreCase(shExpDiscAppl.trim()) )//changes by Nandkumar Gadkari on 19MAR2018 
 						{
 							
 							sqlStr = " select deduct_perc " //into :mdisc 
@@ -4642,7 +4652,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									pstmt = null;
 								}
 								
-								if( !"Y".equalsIgnoreCase( channelPartner ) )
+								if( !"Y".equalsIgnoreCase( channelPartner ) || "Y".equalsIgnoreCase(shExpDiscAppl.trim()) )//changes by Nandkumar Gadkari on 19MAR2018 
 								{
 									sqlStr = " select deduct_perc mdisc "
 											+" 		from sreturn_norms "
@@ -5311,7 +5321,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							pstmt = null;
 						}
 						
-						if( channelPartner != null && !"Y".equalsIgnoreCase( channelPartner ) )
+						if( channelPartner != null && !"Y".equalsIgnoreCase( channelPartner ) || "Y".equalsIgnoreCase(shExpDiscAppl.trim()) )//changes by Nandkumar Gadkari on 19MAR2018 
 						{
 							sqlStr = " select deduct_perc mdisc from sreturn_norms "
 									+"	where days_from <= ? " //:mdays