bug fixing for split qty validation in edit mode.

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

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

@@ -5656,7 +5656,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); 
 		String errorType = "";
 		String locCode = "", faciLocCode = "", faciSiteCode = "";
-
+		String  tranId = "";
 		try
 		{
 			//Changes and Commented By Bhushan on 09-06-2016 :START
@@ -7711,6 +7711,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							custCode = genericUtility.getColumnValue("cust_code", dom1);
 							double sdetQtyAdj = 0.0, domTotalQty = 0.0;
 							int nLineNo = Integer.parseInt(lineNo);
+							
+							// added by Pavan Rane on 15/09/17
+							tranId = genericUtility.getColumnValue("tran_id", dom); 
+							
 							//Added by Santosh on 02/05/2017 to get unconfirmed adjusted quantity [End]
 							
 							//Added by Santosh on 10/05/2017
@@ -7803,7 +7807,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									{
 										domTotalQty = getDomQuantity(dom2, curDomDataHMap);
 									}
-									
+									System.out.println("editFlag["+editFlag+"]");
 									sql = " SELECT SDET.INVOICE_ID, SUM(SDET.QUANTITY) AS QTY_ADJ"
 										+ " FROM SRETURN SRET, SRETURNDET SDET"
 										+ " WHERE SRET.TRAN_ID = SDET.TRAN_ID"
@@ -7815,9 +7819,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										+ " AND SDET.ITEM_CODE = ?"
 										+ " AND SDET.LOT_NO = ?"
 										+ " AND SRET.SITE_CODE = ?"
-										+ " AND SRET.CUST_CODE = ?"
-										+ " GROUP BY SDET.INVOICE_ID";
-									
+										+ " AND SRET.CUST_CODE = ?";
+									if(editFlag != null && "E".equalsIgnoreCase(editFlag))
+									{
+										sql = sql +" AND SDET.TRAN_ID <> ?" ;
+									}
+									sql = sql + " GROUP BY SDET.INVOICE_ID";
+								
 									pstmt = conn.prepareStatement(sql);
 									//Changed by Santosh on  16/05/2017
 									//pstmt.setString(1, lsInvoiceId);
@@ -7826,7 +7834,11 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									pstmt.setString(3, lsLotNo);
 									pstmt.setString(4, siteCode);
 									pstmt.setString(5, custCode);
-									
+									if(editFlag != null && "E".equalsIgnoreCase(editFlag))
+									{
+										pstmt.setString(6, tranId); 
+									}
+
 									rs = pstmt.executeQuery();
 									
 									if(rs.next())
@@ -7872,7 +7884,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									
 									//Added by Santosh on 23/05/2017 to check if enetered inovice id is availbel for salesreturn[Start]
 									if(lsInvoiceId != null && lsInvoiceId.trim().length()>0)
-									{
+									{	
 										if((qtyAdj+sdetQtyAdj+domTotalQty)>0)
 										{
 											errCode = "VTINVADJ";
@@ -7882,7 +7894,11 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										}
 									}
 									//Added by Santosh on 23/05/2017 to check if enetered inovice id is availbel for salesreturn[End]
-									
+									System.out.println( "lcQty :: " + lcQty );
+									System.out.println( "qtyAdj :: " + qtyAdj );
+									System.out.println( "sdetQtyAdj :: " + sdetQtyAdj );
+									System.out.println( "domTotalQty :: " + domTotalQty );
+									System.out.println( "invoiceQty :: " + invoiceQty );
 									//Changed by Santosh on 17/05/2017
 									//if(lcQty > (invoiceQty - (qtyAdj+sdetQtyAdj+domTotalQty)))
 									//Changed by wasim on 17-MAY-17 corrected validation condition