D16JBAS001 updated source to insert data in sreturn_inv

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

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

@@ -180,6 +180,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 	            xmlStringHdr.append("<invoice_id><![CDATA[").append(invoiceID).append("]]></invoice_id>");
 	            xmlStringHdr.append("<site_code><![CDATA[").append(loginSiteCode).append("]]></site_code>");
 	            xmlStringHdr.append("<full_ret><![CDATA[").append("Y").append("]]></full_ret>");
+	            xmlStringHdr.append("<udf_str1><![CDATA[").append("MIN_RATE_HIST_NO").append("]]></udf_str1>");
 	            
 	            xmlStringHdr.append("</Detail1>");
 	            
@@ -246,6 +247,15 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 	            	String tranIDSreturn = retString.substring( retString.indexOf("<TranID>")+8, retString.indexOf("</TranID>"));
 					System.out.println("Sales Return Created :"+tranIDSreturn);
 					
+					SalesReturnConfirm confObj = new SalesReturnConfirm();
+					retString = confObj.confirm(tranIDSreturn,xtraParams,forcedFlag,conn);
+					
+					System.out.println("After confirming sales return ["+retString+"]");
+					
+					if ( retString.indexOf("VTSRTRNCMP") > -1 || retString.indexOf("VTCICONF3") > -1)
+					{
+						System.out.println("Sales return confirm successfully");
+						
 						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 = ? and tran_ser = 'S-INV' ";
@@ -282,14 +292,7 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 							pstmt.close();pstmt = null;
 						}
 						
-					SalesReturnConfirm confObj = new SalesReturnConfirm();
-					retString = confObj.confirm(tranIDSreturn,xtraParams,forcedFlag,conn);
-					
-					System.out.println("After confirming sales return ["+retString+"]");
 						
-					if ( retString.indexOf("VTSRTRNCMP") > -1 || retString.indexOf("VTCICONF3") > -1)
-					{
-						System.out.println("Sales return confirm successfully");
 						
 						retString = itmDBAccessEJB.getErrorString("","VTINVCNC","","",conn);  
 					}