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,42 +247,6 @@ 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);
 					
-					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' ";
-					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1, invoiceID);
-					rs = pstmt.executeQuery();
-					while(rs.next())
-					{
-						cnt++;
-						refSer = rs.getString("tran_ser");
-						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;
-						
-						sql = " insert into sreturn_inv (tran_id,line_no,ref_ser,ref_no,ref_bal_amt,adj_amt) values (?,?,?,?,?,?) ";
-						pstmtInsert = conn.prepareStatement(sql);
-						pstmtInsert.setString(1, tranIDSreturn);
-						pstmtInsert.setInt(2, cnt);
-						pstmtInsert.setString(3, "S-INV");
-						pstmtInsert.setString(4, invoiceID);
-						pstmtInsert.setDouble(5, refBalAmount);
-						pstmtInsert.setDouble(6, refBalAmount);
-						pstmtInsert.executeUpdate();
-						if (pstmtInsert != null )
-						{
-							pstmtInsert.close();pstmtInsert = null;
-						}
-					}
-					if (pstmt != null )
-					{
-						pstmt.close();pstmt = null;
-					}
-					
 					SalesReturnConfirm confObj = new SalesReturnConfirm();
 					retString = confObj.confirm(tranIDSreturn,xtraParams,forcedFlag,conn);
 					
@@ -291,6 +256,44 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
 					{
 						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' ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, invoiceID);
+						rs = pstmt.executeQuery();
+						while(rs.next())
+						{
+							cnt++;
+							refSer = rs.getString("tran_ser");
+							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;
+							
+							sql = " insert into sreturn_inv (tran_id,line_no,ref_ser,ref_no,ref_bal_amt,adj_amt) values (?,?,?,?,?,?) ";
+							pstmtInsert = conn.prepareStatement(sql);
+							pstmtInsert.setString(1, tranIDSreturn);
+							pstmtInsert.setInt(2, cnt);
+							pstmtInsert.setString(3, "S-INV");
+							pstmtInsert.setString(4, invoiceID);
+							pstmtInsert.setDouble(5, refBalAmount);
+							pstmtInsert.setDouble(6, refBalAmount);
+							pstmtInsert.executeUpdate();
+							if (pstmtInsert != null )
+							{
+								pstmtInsert.close();pstmtInsert = null;
+							}
+						}
+						if (pstmt != null )
+						{
+							pstmt.close();pstmt = null;
+						}
+						
+						
+						
 						retString = itmDBAccessEJB.getErrorString("","VTINVCNC","","",conn);  
 					}
 					else