Changes related to set rate from pricelist or min_rate_history based on...

Changes related to set rate from pricelist or min_rate_history based on disparm variable SRETURN_ADJ_OPT


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

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

@@ -3113,7 +3113,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							orderByStr = " MRH.INVOICE_DATE DESC,MRH.INVOICE_ID DESC ";
 						}
 
-						if(invoiceId == null || invoiceId.trim().length() == 0)
+						//Changed by Santosh on 10/05/2017 to not set invoice id if SRETURN_ADJ_OPT is not defined
+						//if(invoiceId == null || invoiceId.trim().length() == 0)
+						if( (invoiceId == null || invoiceId.trim().length() == 0) &&  !"NULLFOUND".equalsIgnoreCase(sreturnAdjOpt))
 						{
 							/*int noSchemeHist = 0;
 						String schemeKey = "", disParmVarValue = "", docKey = "", docValue = "";
@@ -7650,7 +7652,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							int nLineNo = Integer.parseInt(lineNo);
 							//Added by Santosh on 02/05/2017 to get unconfirmed adjusted quantity [End]
 							
+							//Added by Santosh on 10/05/2017
+							String sreturnAdjOpt = distCommon.getDisparams("999999", "SRETURN_ADJ_OPT", conn);
+							
 							//Added by Santosh on 02/12/2016 to split quantity in multiple line as per min_rate_history[Start]
+							//Changed by Santosh on 10/05/2017 to not to validate split quantity if SRETURN_ADJ_OPT is not defined
+							if(! "NULLFOUND".equalsIgnoreCase(sreturnAdjOpt))
+							{
 								String[] col = new String[500];
 								int noSchemeHist = 0;
 								double invoiceQty = 0.0, qtyAdj = 0.0;
@@ -7661,6 +7669,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								noSchemeHist = Integer.parseInt(sNoSchemeHist);
 								for (int keyCtr = 1; keyCtr <= noSchemeHist ;  keyCtr++)
 								{
+									//Added by Santosh on 10/05/2017 to reset docKey in case of more than 1 doc keys are defined
+									docKey = "";
 									schemeKey = "SCHEME_HIST_KEY" + keyCtr ;
 									System.out.println(">>>>>>>>>In for loop schemeKey:"+schemeKey);
 									varValue = distCommon.getDisparams("999999",schemeKey,conn);
@@ -7789,6 +7799,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								{
 									return getError((invoiceQty - (qtyAdj+sdetQtyAdj+domTotalQty)), "VTSPLTQTY", conn);
 								}
+							}
 							//Added by Santosh on 02/12/2016 to split quantity in multiple line as per min_rate_history[End]
 							
 							if (llLineNoInvStr != null && llLineNoInvStr.indexOf(".") > 0)