Connection related changes for sales budget wizard.

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

webitm-fin/ibase/webitm/ejb/fin/SalesBudgetCustWizEJB.java

@@ -4,6 +4,7 @@ import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -403,7 +404,7 @@ public class SalesBudgetCustWizEJB extends ValidatorEJB
 		String childNodeName = null,custCode="",posCode="",custName="",posD="",posDescr="",itmDes="",priceDesc="";
 		int childNodeListLength=0;
 		int ctr=0,count=1;
-		String chgTerm="",siteCode="",currDate="",userId="",itemCode="",itemUnit="",rate="",nullVar="";
+		String chgTerm="",siteCode="",currDate="",userId="",itemCode="",itemUnit="",rate="",nullVar="",itemDescr="";
 		ArrayList<String> acctPrdlist=new ArrayList<String>();
 		try
 		{
@@ -652,14 +653,16 @@ public class SalesBudgetCustWizEJB extends ValidatorEJB
 
 
 						//Item
-						String sql2 = "SELECT ITEM_CODE, UNIT FROM ITEM WHERE ITEM_SER = ?";
+						String sql2 = "SELECT ITEM_CODE,DESCR,UNIT,SH_DESCR FROM ITEM WHERE ITEM_SER = ?";
 						pstmt = conn.prepareStatement( sql2 );
 						pstmt.setString(1, itemSer);
 						rs = pstmt.executeQuery();
 						while (rs.next())
 						{
 							itemCode = rs.getString("ITEM_CODE");
+							itemDescr = rs.getString("SH_DESCR");
 							itemUnit = rs.getString("UNIT");
+							System.out.println("ITEM_CODE"+itemCode+"  item_desc" + itemDescr);
 
 							String sql5 = "SELECT RATE FROM PRICELIST WHERE ITEM_CODE = ?";
 							pstmt2 = conn.prepareStatement( sql5 );
@@ -681,6 +684,7 @@ public class SalesBudgetCustWizEJB extends ValidatorEJB
 								valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
 								valueXmlString.append("<prd_code><![CDATA[" + acctPrdlist.get(i) + "]]></prd_code>");
 								valueXmlString.append("<item_code><![CDATA[" + itemCode + "]]></item_code>");
+								valueXmlString.append("<item_descr><![CDATA[" + itemDescr + "]]></item_descr>");
 								valueXmlString.append("<item_ser><![CDATA[" + itemSer + "]]></item_ser>");
 								valueXmlString.append("<quantity><![CDATA[" + initialQnty + "]]></quantity>");
 								valueXmlString.append("<unit><![CDATA[" + itemUnit + "]]></unit>");
@@ -705,6 +709,28 @@ public class SalesBudgetCustWizEJB extends ValidatorEJB
 		catch(Exception e){
 			e.printStackTrace();
 		}
+		finally
+		{
+			try {
+				if (rs!= null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if(pstmt!=null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				if( conn != null && ! conn.isClosed() )
+				{
+					conn.close();
+					conn = null;
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		}
 		return valueXmlString.toString();
 	}