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

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

@@ -3364,7 +3364,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								//	Changes  by Nandkumar Gadkari on 14/09/18--------[Start]---------
 								//	minRateDocKey = generateDocKey(dom1, dom, invoiceId, conn); commented by Nandkumar Gadkari on 14/09/18
 								//	dokkeyList = new ArrayList<String>();
-									dokkeyList = generateDocKey(dom1, dom, invoiceId, conn);
+									if ("M".equalsIgnoreCase(sreturnAdjOpt))
+									{
+										dokkeyList = generateDocKey(dom1, dom," ", conn);
+									}
+									else {
+										dokkeyList= generateDocKey(dom1, dom, invoiceId, conn);
+									}
+									
 									int size = dokkeyList.size();
 									System.out.println("dokkk key size: " +size);
 									for(int i=0;i<=size-1;i++)
@@ -3404,6 +3411,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 													break;
 												}
 											}
+											
 									}
 									if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
 									{