added sorder date

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

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

@@ -654,7 +654,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				custCodeBil="",dlvAdd1="",dlvAdd2="",dlvAdd3="",despId="",remarksDes="",noArtDes="",sorderNo="",
 				siteCodeShip="",availableYn="",addUser="",chgUserL="",chgTermL="";
 		ArrayList<String> addUsersList=new ArrayList<String>();
-		Date orderDt = null,statusDate=null,mfgDate=null,expiryDate=null;
+		Date orderDt = null,statusDate=null,mfgDate=null,expiryDate=null,sOrdDate=null;
 		try
 		{   
 			sdf=new SimpleDateFormat(genutility.getApplDateFormat());
@@ -740,7 +740,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									sql="select d.desp_id,d.site_code,d.desp_date,d.curr_code,d.exch_rate,d.trans_mode,d.curr_code__frt,d.curr_code__ins,d.stan_code,"
 											+ "d.state_code__dlv,d.dlv_city,d.dlv_pin,d.count_code__dlv,d.dlv_add1,d.dlv_add2,d.dlv_add3,"
 											+ "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.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date"
 											+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order  and d.add_user = ?";
 
 									pstmt=conn.prepareStatement(sql);
@@ -748,6 +748,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									pstmt.setString(2,addUser);
 									rs = pstmt.executeQuery();
 									if(rs.next()){
+										System.out.println("Data found3334455...................");
 										despId=checkNull(rs.getString("desp_id"));
 										siteCode = checkNull(rs.getString("site_code"));
 										currencyCode = checkNull(rs.getString("curr_code"));
@@ -778,17 +779,29 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 
 										remarksDes=checkNull(rs.getString("remarks"));
 										noArtDes=checkNull(rs.getString("no_art"));
+										sOrdDate=rs.getDate("order_date");	
 										
 									}
-									
+									if(rs!=null){
+									rs.close();
+									rs=null;
+									}
+									if(pstmt!=null){
+									pstmt.close();
+									pstmt=null;
+									}
+									System.out.println("tranCode----->>["+tranCode+"]");
 									System.out.println("orderDt----->>["+orderDt+"]");
+									System.out.println("sOrdDate----->>["+sOrdDate+"]");
 									System.out.println("custCodeDlv----->>["+custCodeDlv+"]");
 									valueXmlString.append("<Detail2 domID='" + count + "'  objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
 									valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
 									valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
 									if(orderDt != null){
-										valueXmlString.append("<desp_date><![CDATA["+ sdf.format(orderDt).toString() +"]]></desp_date>");
-										valueXmlString.append("<sord_date><![CDATA["+ sdf.format(orderDt).toString() +"]]></sord_date>");
+										valueXmlString.append("<desp_date><![CDATA["+ sdf.format(orderDt).toString() +"]]></desp_date>");										
+									}
+									if(sOrdDate != null){
+									valueXmlString.append("<sord_date><![CDATA["+ sdf.format(sOrdDate).toString() +"]]></sord_date>");
 									}
 									valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>");
 									valueXmlString.append("<cust_code><![CDATA["+ custCode +"]]></cust_code>");
@@ -835,23 +848,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									valueXmlString.append("<tran_name><![CDATA["+ tranName +"]]></tran_name>");
 
 									valueXmlString.append("<remarks><![CDATA["+ remarksDes +"]]></remarks>");
-									valueXmlString.append("<no_art><![CDATA["+ noArtDes +"]]></no_art>");
-									
-									
+									valueXmlString.append("<no_art><![CDATA["+ noArtDes +"]]></no_art>");								
 									
 									valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>"); 
 									valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
 									valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
 									
 									valueXmlString.append("</Detail2>");
-									if(rs!=null){
-										rs.close();
-										rs=null;
-									}
-									if(pstmt!=null){
-										pstmt.close();
-										pstmt=null;
-									}
+									
 								}
 							}