Committed changes to bug fix split quantity in edit mode

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

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

@@ -7802,6 +7802,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									//Commented and changed by Santosh on 16/05/2017
 									//curDomDataHMap.put("invoice_id", lsInvoiceId);
 									curDomDataHMap.put("doc_key", docKey);
+									//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+									curDomDataHMap.put("line_no", lineNo);
 									
 									if( nLineNo > 1 )
 									{
@@ -7823,6 +7825,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									if(editFlag != null && "E".equalsIgnoreCase(editFlag))
 									{
 										sql = sql +" AND SDET.TRAN_ID <> ?" ;
+										//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+										sql = sql +" AND SDET.LINE_NO <> ?" ;
 									}
 									sql = sql + " GROUP BY SDET.INVOICE_ID";
 								
@@ -7837,6 +7841,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									if(editFlag != null && "E".equalsIgnoreCase(editFlag))
 									{
 										pstmt.setString(6, tranId); 
+										//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+										pstmt.setString(7, lineNo); 
 									}
 
 									rs = pstmt.executeQuery();
@@ -9803,6 +9809,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		Node detail1Node = null;
 		//Added by Santosh on 16/05/2017
 		String curDomDocKey = "", domDocKey = "";
+		//Added by Santosh on 20/09/2017
+		String domLineNo = "", curDomLineNo = "";
 		
 		try
 		{
@@ -9813,11 +9821,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 			//Commented and changed by Santosh on 16/05/2017
 			//curDomInvoiceId = curDomDataHMap.get("invoice_id").trim();
 			curDomDocKey = curDomDataHMap.get("doc_key").trim();
+			//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+			curDomLineNo = curDomDataHMap.get("line_no").trim();
 			
 			detail1NList = allDom.getElementsByTagName("Detail1");
 			detail1Node = detail1NList.item(0);
 			detail2NList = allDom.getElementsByTagName("Detail2");
-			for(int i=0; i< detail2NList.getLength()-1; i++)
+			for(int i=0; i<= detail2NList.getLength()-1; i++)
 			{
 				Node eachDetail2Node = detail2NList.item(i);
 				domCustCode = genericUtility.getColumnValueFromNode("cust_code", detail1Node).trim();
@@ -9828,6 +9838,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 				//Commented and changed by Santosh on 16/05/2017
 				//domInvoiceId = genericUtility.getColumnValueFromNode("invoice_id", eachDetail2Node).trim();
 				domDocKey = genericUtility.getColumnValueFromNode("doc_key", eachDetail2Node).trim();
+				//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+				domLineNo = genericUtility.getColumnValueFromNode("line_no", eachDetail2Node).trim();
+				
+				System.out.println("curDomDocKey["+curDomDocKey+"] domDocKey ["+domDocKey+"]");
+				System.out.println("curDomCustCode["+curDomCustCode+"] domCustCode ["+domCustCode+"]");
+				System.out.println("curDomItemCode["+curDomItemCode+"] domItemCode ["+domItemCode+"]");
+				System.out.println("curDomLotNo["+curDomLotNo+"] domLotNo ["+domLotNo+"]");
+				System.out.println("curDomSiteCode["+curDomSiteCode+"] domSiteCode ["+domSiteCode+"]");
+				System.out.println("curDomLineNo["+curDomLineNo+"] domLineNo ["+domLineNo+"]");
 				
 				dDomQty = Double.parseDouble(domQuantity);
 				
@@ -9837,7 +9856,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					curDomCustCode.equalsIgnoreCase(domCustCode) &&
 					curDomItemCode.equalsIgnoreCase(domItemCode) && 
 					curDomLotNo.equalsIgnoreCase(domLotNo) && 
-					curDomSiteCode.equalsIgnoreCase(domSiteCode) )
+					curDomSiteCode.equalsIgnoreCase(domSiteCode) &&
+					//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
+					!curDomLineNo.equalsIgnoreCase(domLineNo))
 					{
 						retDomQty += dDomQty;
 					}