freight added

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

webitm-dis/ibase/webitm/ejb/dis/DespatchWiz.java

@@ -684,8 +684,9 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 			try {
 				if (conn != null) {
 					conn.close();
-				}
 					conn = null;
+				}
+				
 			} catch (Exception d) {
 				d.printStackTrace();
 			}
@@ -861,7 +862,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 											+ "d.tran_code,d.stan_code__init,d.status,d.status_remarks,d.remarks,d.no_art,d.status_date,d.cust_code,d.cust_code__dlv,"
 											+ "s.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date,d.gross_weight,d.nett_weight,d.tare_weight,d.no_art,"
 											+ "d.eff_date,d.confirmed,d.chg_date,d.chg_term,d.chg_user,d.licence_no,d.licence_no_1,d.licence_no_2,d.licence_no_3,"	// Sandesh 2-Oct-2014
-											+ "d.licence_date_1,d.licence_date_2,d.licence_date_3,d.available_yn,d.insurance "							// Sandesh 2-Oct-2014
+											+ "d.licence_date_1,d.licence_date_2,d.licence_date_3,d.available_yn,d.insurance,d.freight "							// Sandesh 2-Oct-2014
 											+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order  and d.add_user = ?";
 
 									pstmt=conn.prepareStatement(sql);
@@ -1841,9 +1842,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						pstmt = null;
 					}
 					conn.close(); 
-				}
 					conn = null;
 				}
+				
+			}
 			catch(Exception d)
 			{
 				d.printStackTrace();