D16JBAS001 updated source for validation if Sales return is already created...

D16JBAS001  updated source for validation if Sales return is already created for the invoice then not allowing to cancel the invoice.


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

webitm-fin/ibase/webitm/ejb/fin/adv/InvoiceCancelEJB.java

@@ -88,7 +88,38 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 			{
 				retString = itmDBAccessEJB.getErrorString("","VTINVCANC","","",conn);  
 				return retString;
-			}	
+			}
+			
+			sql = " SELECT COUNT(*) FROM SRETURN WHERE INVOICE_ID = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, invoiceID);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				cnt = rs.getInt(1);
+			}
+			if(pstmt != null)
+			{
+				pstmt.close();pstmt=null;
+			}
+			if(rs != null)
+			{
+				rs.close();rs=null;
+			}
+			
+			if(cnt > 0)
+			{
+				System.out.println("Sales Return already created for this invoice");
+				retString = itmDBAccessEJB.getErrorString("","VTALRCNC","","",conn);  
+				return retString;
+			}
+			cnt = 0;
+			
+			if(!"Y".equalsIgnoreCase(confirmed))
+			{
+				retString = itmDBAccessEJB.getErrorString("","VTINVCANC","","",conn);  
+				return retString;
+			}
 			
 			confirmed = "";
 			
@@ -179,6 +210,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 					xmlStringDet.append("<line_no__invtrace><![CDATA[").append(lineNoInvoice).append("]]></line_no__invtrace>");
 					xmlStringDet.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>");
 					xmlStringDet.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>");
+					xmlStringDet.append("<ret_rep_flag><![CDATA[").append("R").append("]]></ret_rep_flag>");
 					
 					xmlStringDet.append("</Detail2>");
 					
@@ -205,7 +237,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 	            }
 	            userInfo  = getUserInfo(xtraParams);
 
-	            retString = masterStatefulLocal.processRequest(userInfo, xmlString.toString(), true, conn); 
+	            retString = masterStatefulLocal.processRequest(userInfo, xmlString.toString(), true, conn);
 	            
 	            System.out.println("@@Sales Return return string"+retString);
 	            
@@ -216,7 +248,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 					
 					cnt = 0;
 					sql = " select tran_ser, (case when tot_amt is null then 0 else tot_amt end) as tot_amt ,(case when adj_amt is null then 0 else adj_amt end) as adj_amt "
-						+ " from receivables where ref_no = ? ";
+						+ " from receivables where ref_no = ? and tran_ser = 'S-INV' ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, invoiceID);
 					rs = pstmt.executeQuery();
@@ -227,7 +259,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 						totAmt = rs.getDouble("tot_amt");
 						adjAmt = rs.getDouble("adj_amt");
 						
-						System.out.println("@@TotAmt["+rs.getDouble("tot_amt")+"]  @@AdjAmt["+rs.getDouble("adj_amt")+"]");
+						System.out.println("@@TotAmt["+rs.getDouble("tot_amt")+"]  @@AdjAmt["+rs.getDouble("adj_amt")+"] refSer["+refSer+"]");
 						
 						refBalAmount = totAmt - adjAmt;
 						
@@ -255,7 +287,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 					
 					System.out.println("After confirming sales return ["+retString+"]");
 					
-					if ( retString.indexOf("VTSRTRNCMP") > -1 )
+					if ( retString.indexOf("VTSRTRNCMP") > -1 || retString.indexOf("VTCICONF3") > -1)
 					{
 						System.out.println("Sales return confirm successfully");