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

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

@@ -304,7 +304,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		String currCodeBase = null;
 		String sExchRate = "1";
 		String retOpt = null;
-		String invoiceId = null;
+		String invoiceId = null,tempInvoiceId=null;
 		String lineNoTrace = null;
 		int iLineNoTrace = 0 ;
 		int lineNoInv = 0;
@@ -3518,12 +3518,17 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									System.out.println("@@@@@@@@@@@@ dokkeyList["+dokkeyList+"]");
 								
 									invoiceId = getAvailableInvId(dom,dom2, curFormItemLotHMap, curRecordItemLotHMap,invoiceId, minRateDocKey, adjQty);
-											
+									tempInvoiceId =invoiceId;	
 									if (invoiceId != null && invoiceId.trim().length() > 0)
 									{
 										break;
 									}
 								}
+								if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
+								{
+									break;
+								}
+								
 								if (pstmt != null) {
 									pstmt.close();
 									pstmt = null;
@@ -10113,7 +10118,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						dTotalDomQty += dDomQty;
 						double totalQty = dQtyAdj + dTotalDomQty;
 						System.out.println("totalQty["+totalQty+"]");
-						if ( totalQty < dCurRecInvQty)
+						if ( totalQty <= dCurRecInvQty)
 						{
 							retInvoiceId = invoiceId;
 						}
@@ -10131,6 +10136,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 				}
 				
 			}
+			System.out.println("invoiceid["+invoiceId+"]");
 			
 			if( !isCurFormDataInDom )
 			{