Changed by Rohan on 13-10-12 for hazardous material

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

webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java

@@ -48,6 +48,7 @@ public class ConsolidatToDoc {
 		ResultSet rs2 = null;
 		String target = "";
 		String source = "";
+		String user = "";
 		//Changed by Rohan on 06-10-12 to define variable for hazmap report.end
 		
 		PreparedStatement pstmt = null, pstmt1 = null,pstmtHdr = null;
@@ -88,6 +89,8 @@ public class ConsolidatToDoc {
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			java.util.Date sysDate = new java.util.Date();
 			String sysDateStr = sdf.format(sysDate);
+			//Changed by rohna on 13-10-12 to user from xtraparam
+			user = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");	
 
 			if(ptcn == null || ptcn.trim().length() == 0)
 			{
@@ -881,7 +884,7 @@ public class ConsolidatToDoc {
 									System.out.println("CURRENT REF ID ["+refIdList+"]");
 									pstmt2.setString(1,refIdList);
 									rs2 = pstmt2.executeQuery(); 
-									System.out.println("after excute query---------------");
+									
 									while(rs2.next())
 									{
 										
@@ -943,10 +946,10 @@ public class ConsolidatToDoc {
 											reportObjName = disCommon.getDisparams("999999","HAZMAT_LABLE_OBJ_NAME",conn);
 											errString = generateReport(ptcn,reportObjName,"Label",conn,xtraParams);
 											
-											
 											target = CommonConstants.JBOSSHOME+File.separator+"server"+File.separator+"default"+File.separator+
 									        		"deploy"+File.separator+"ibase.ear"+File.separator+"ibase.war"+File.separator+"webitm"+File.separator+
-									        		"reports"+File.separator+"hazardous";
+									        		"reports"+File.separator+"hazardous"+File.separator+user;
+											
 											
 											File dir=new File(target);
 											boolean exists = dir.exists();
@@ -967,7 +970,8 @@ public class ConsolidatToDoc {
 												System.out.println(" Lable report genetrated successfully");
 												source = CommonConstants.JBOSSHOME+File.separator+"server"+File.separator+"default"+File.separator+
 										        		"deploy"+File.separator+"ibase.ear"+File.separator+"ibase.war"+File.separator+"webitm"+File.separator+
-										        		"reports"+File.separator+"finalreport"+File.separator+"BASE"+File.separator+ptcn+"_Label.pdf";
+										        		"reports"+File.separator+"finalreport"+File.separator+user+File.separator+ptcn+"_Label.pdf";
+												
 										        File sourceFile = new File(source);
 										        String name = sourceFile.getName();
 										     
@@ -989,12 +993,11 @@ public class ConsolidatToDoc {
 												System.out.println(" Form report genetrated successfully");
 												source = CommonConstants.JBOSSHOME+File.separator+"server"+File.separator+"default"+File.separator+
 										        		"deploy"+File.separator+"ibase.ear"+File.separator+"ibase.war"+File.separator+"webitm"+File.separator+
-										        		"reports"+File.separator+"finalreport"+File.separator+"BASE"+File.separator+ptcn+"_Form.pdf";
+										        		"reports"+File.separator+"finalreport"+File.separator+user+File.separator+ptcn+"_Form.pdf";
+												
 										        File sourceFile = new File(source);
 										        String name = sourceFile.getName();
 										     
-										        System.out.println("NAME of form report"+name);
-										        //File targetFile = new File(target+File.separator+name);
 										        if(sourceFile.renameTo(new File(target+File.separator+sourceFile.getName())))
 										        {
 									    		   System.out.println(ptcn+"+_Form move succesfully");
@@ -1003,8 +1006,7 @@ public class ConsolidatToDoc {
 										        {
 									    		   System.out.println(ptcn+"_Form is failed to move");
 										        }
-										        //copy file from one location to other
-										        //FileUtils.copyFile(sourceFile, targetFile);
+										        
 											}		
 										}	
 									 }//while close
@@ -1137,7 +1139,7 @@ public class ConsolidatToDoc {
 			{
 				if(conn != null && isError)
 				{
-					
+					System.out.println("rollbacking the changes*************");
 					conn.rollback();
 				}
 			}