added fuctionality of user wise view rights

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

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

@@ -680,7 +680,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 											+ "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 "
-											+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order and and d.add_user = ?";
+											+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order  and d.add_user = ?";
 
 									pstmt=conn.prepareStatement(sql);
 									pstmt.setString(1,sorderNo);
@@ -777,7 +777,11 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									
 									valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
 									valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
-
+									
+									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();
@@ -791,7 +795,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 							}
 						
 					}else{
-						
+						System.out.println("insert record called................12");						
 						valueXmlString.append(insertNewRecord(sorderNo,currentFormNo,conn));
 						
 					}
@@ -871,9 +875,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				while(rs.next())
 				{
 					addUser = rs.getString("add_user")==null?"":rs.getString("add_user").trim();
-					addUsersList.add(addUser);
-					/*gdistOrder = rs.getString("dist_order")==null?"":rs.getString("dist_order").trim();
-					gdistOrders.add(gdistOrder);*/
+					addUsersList.add(addUser);					
 				}
 				if(rs!=null){
 				rs.close();
@@ -2049,6 +2051,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		 String custCodeBil="",siteCodeShip="",dlvAdd1="",dlvAdd2="",dlvAdd3="",siteCodeDesc="",tranName="",currAppdate="";
 		 Date orderDt=null,statusDate=null;
 		System.out.println("--------no data found in Despatch-------------");
+		System.out.println("chgUser567-------->>["+chgUser+"]");
 		try{
 			sdf=new SimpleDateFormat(genericUtility.getApplDateFormat());
 			currDate = new java.sql.Timestamp(System.currentTimeMillis()) ;