Updated the code

Mohammed/Sales Contract1/SalesContractAMDFromSalesQuotAMD.java

 package ibase.webitm.ejb.dis;
 
+import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
-import ibase.utility.BaseLogger;
-import ibase.utility.E12GenericUtility;
-import ibase.webitm.ejb.ActionHandlerEJB;
-import ibase.webitm.utility.ITMException;
-
-import java.rmi.RemoteException;
-import java.sql.Connection;
-
 import javax.naming.InitialContext;
 
 import ibase.system.config.AppConnectParm;
 import ibase.system.config.ConnDriver;
 import ibase.utility.BaseLogger;
+import ibase.utility.E12GenericUtility;
 import ibase.utility.GenericUtility;
 import ibase.utility.UserInfoBean;
 import ibase.webitm.ejb.ActionHandlerEJB;
@@ -99,7 +93,9 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
         String lineNo         = "";
         String itemCode       = "";
         String quantity       = "";
-        String rate           = "";
+        String quantityO       = "";
+        String unitRate       = "";
+        String unitRateO       = "";
         String lineNoContract = "";
 
         java.sql.Connection        detailConn = null;
@@ -116,7 +112,7 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
             detailConn = connDriver.getConnectDB(userInfo.getTransDB());
 
             pstmt = detailConn.prepareStatement(
-                "SELECT line_no, item_code, quantity, rate FROM sales_quotdet_amd WHERE quot_no = ? AND amd_no = ?");
+                "SELECT line_no, item_code, quantity, quantity_o, unit__rate, unit__rate_o FROM sales_quotdet_amd WHERE quot_no = ? AND amd_no = ?");
             pstmt.setString(1, quotNo);
             pstmt.setString(2, tranID);
             rs = pstmt.executeQuery();
@@ -126,9 +122,11 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
                 lineNo   = checkNull(rs.getString("line_no"));
                 itemCode = checkNull(rs.getString("item_code"));
                 quantity = checkNull(rs.getString("quantity"));
-                rate     = checkNull(rs.getString("rate"));
+                quantityO = checkNull(rs.getString("quantity_o"));
+                unitRate = checkNull(rs.getString("unit__rate"));
+                unitRateO = checkNull(rs.getString("unit__rate_o"));
 
-                BaseLogger.log("3", null, null, "lineNo=[" + lineNo + "] itemCode=[" + itemCode + "] quantity=[" + quantity + "] rate=[" + rate + "]");
+                BaseLogger.log("3", null, null, "lineNo=[" + lineNo + "] itemCode=[" + itemCode + "] quantity=[" + quantity + "] quantity=[" + quantityO + "] unit__rate=[" + unitRate + "] unit__rate=[" + unitRateO + "]");
 
 //                lineNoContract = dbAccessEJB.getDBColumnValue("scontractamddet",
 //                        "line_no__contract",
@@ -142,7 +140,9 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
                 transXML.append("<line_no><![CDATA["           + lineNo        + "]]></line_no>");
                 transXML.append("<item_code><![CDATA["         + itemCode      + "]]></item_code>");
                 transXML.append("<quantity><![CDATA["          + quantity      + "]]></quantity>");
-                transXML.append("<rate><![CDATA["              + rate          + "]]></rate>");
+                transXML.append("<quantity_o><![CDATA["        + quantityO      + "]]></quantity_o>");
+                transXML.append("<unit__rate><![CDATA["        + unitRate          + "]]></unit__rate>");
+                transXML.append("<unit__rate_o><![CDATA["      + unitRate          + "]]></unit__rate_o>");
                 transXML.append("<line_no__contract><![CDATA[" + lineNo + "]]></line_no__contract>");
                 transXML.append("</Detail2>");
             }
@@ -248,9 +248,9 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
         return result;
     }
 
-    public String confirmCreateSalesContract(String tranID, String xtraParam, Connection conn) throws ITMException
+    public String confirmCreateSalesContractAMD(String tranID, String xtraParams, Connection conn) throws ITMException
     {
-		BaseLogger.log("3", null, null, "=== SalesContractFromSalesQuot START ===");
+		BaseLogger.log("3", null, null, "=== confirmCreateSalesContractAMD START 10th april ===");
 	    String result = "";
 	    PreparedStatement pstmt = null;
 	    ResultSet rs = null;
@@ -263,11 +263,11 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
 	            conn = connDriver.getConnectDB(getUserInfo().getTransDB());
 	        }
         	
-            String userCode = genericUtility.getValueFromXTRA_PARAMS(xtraParam, "loginCode");
+            String userCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
             ibase.ejb.CommonDBAccessEJB commonDBAccessEJB = new ibase.ejb.CommonDBAccessEJB();
             UserInfoBean userInfo = commonDBAccessEJB.createUserInfo(userCode);
 
-	        String sql = "SELECT LINE_NO FROM SALES_QUOT_STOCKIST WHERE QUOT_NO=? ORDER BY LINE_NO";
+	        String sql = "SELECT LINE_NO FROM sales_quot_stockist_amd WHERE amd_NO=? ORDER BY LINE_NO";
 
 	        pstmt = conn.prepareStatement(sql);
 	        pstmt.setString(1, tranID);
@@ -297,6 +297,12 @@ public class SalesContractAMDFromSalesQuotAMD extends ActionHandlerEJB
             BaseLogger.log("3", null, null, "Exception in confirmCreateSalesContractAMD. [" + e.getMessage() + "]");
             throw new ITMException(e);
         }
+	    finally
+	    {
+	        try { if(rs != null) rs.close(); } catch(Exception e){}
+	        try { if(pstmt != null) pstmt.close(); } catch(Exception e){}
+	    }
+        BaseLogger.log("3", null, null, "=== confirmCreateSalesContractAMD END ===");
 		return result;
     }