modify for summary calculation

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

webitm-dashboard/ibase/dashboard/mfg/ejb/ProductionVsBudgetReport.java

@@ -172,9 +172,9 @@ public class ProductionVsBudgetReport extends ValidatorEJB implements Production
    							for(int j=0;j<lastDayOfMonth-cntr;j++)
    							{
    							 cntFrBudget++; 
-   							 System.out.println("Budget Counter remaining last dated ===="+cntFrBudget);
+   							 //System.out.println("Budget Counter remaining last dated ===="+cntFrBudget);
    							 xmlData.append("<tran_date  date=\""+(listDate.get(dayCount))+"\">");
-   							 System.out.println("listDate.get(dayCount) case of after date ==="+listDate.get(dayCount));
+   							 //System.out.println("listDate.get(dayCount) case of after date ==="+listDate.get(dayCount));
 	   	   		   			 xmlData.append("<day_quantity quantity=\"0\">");   	   		   					
 	   	   		   			 xmlData.append("<pyr_dayqty>").append("<![CDATA["+prePyrDayQty+"]]>").append("</pyr_dayqty>");	   	   		   					
 	   	   		   			 xmlData.append("<daily_budqty>").append("<![CDATA["+dailyBudgetQty*(cntFrBudget)+"]]>").append("</daily_budqty>");	   	   		   					
@@ -196,23 +196,40 @@ public class ProductionVsBudgetReport extends ValidatorEJB implements Production
    						
    					//Add here for decr pupose	
    	   					
-   		   			  sql="select  g.descr as geol_descr, u.descr as unit_descr  from gencodes g , uom u  where g.FLD_NAME='GEO_LOC' and g.fld_value= ? and u.unit= ?";
-   		   						
+   		   			  //sql="select  g.descr as geol_descr, u.descr as unit_descr  from gencodes g , uom u  where g.FLD_NAME='GEO_LOC' and g.fld_value= ? and u.unit= ?";
+   		   				
+   					 sql="select  descr from gencodes  where FLD_NAME='GEO_LOC' and fld_value= ?";
+   						
    		   			   pstmt1 = conn.prepareStatement(sql); 			
-   				       pstmt1.setString(1,geoLocation);
-   				       pstmt1.setString(2,unit);
+   				       pstmt1.setString(1,geoLocation);   				     
    				       rs1 = pstmt1.executeQuery();
    				       if(rs1.next())
    				       {
    				    	   
-   				    	geol_Descr = checkNull(rs1.getString("geol_descr"))  ; 
-   				    	unit_Descr = checkNull(rs1.getString("unit_descr"))  ; 
+   				    	geol_Descr = checkNull(rs1.getString("descr"))  ; 
+   				    	
    				    	   
-   				       }
-   				       pstmt1.close();
-   					   pstmt1 = null;
-   					   rs1.close();
+   				       }   				       
+   					   pstmt1 = null;   					  
    					   rs1 = null;
+   					  //**************************************************
+   					  sql="select descr from uom where unit= ?";
+						
+		   			   pstmt1 = conn.prepareStatement(sql); 			
+		   			   pstmt1.setString(1,unit);
+				      
+				       rs1 = pstmt1.executeQuery();
+				       if(rs1.next())
+				       {
+				    	   
+				    	unit_Descr = checkNull(rs1.getString("descr"))  ; 
+				    	   
+				       }
+				       pstmt1.close();
+					   pstmt1 = null;
+					   rs1.close();
+					   rs1 = null;   					
+   					   
    					//End here decr pupose for Unit_form and geo_location
    					   
    						cntFrBudget=0;	
@@ -221,8 +238,8 @@ public class ProductionVsBudgetReport extends ValidatorEJB implements Production
    						dayCount=0;
    						preCumQty="0.0";
    						prePyrDayQty="0.0";   						
-   						geoLocationPrevious=geoLocation=checkNull(rs.getString("geo_loc"));
-   						previousUnit=checkNull(rs.getString("unit__form"));
+   						geoLocationPrevious   =geoLocation=checkNull(rs.getString("geo_loc"));
+   						previousUnit         =checkNull(rs.getString("unit__form"));
    						//Add descr
    						geol_Descr="";
    						unit_Descr="";
@@ -274,6 +291,7 @@ public class ProductionVsBudgetReport extends ValidatorEJB implements Production
 			if(count>0)
 			{
 				if(dayCount<lastDayOfMonth){
+					for(int p=dayCount;p<lastDayOfMonth;p++){
 					cntFrBudget++; 
 				    xmlData.append("<tran_date  date=\""+(listDate.get(dayCount))+"\">");
   		   			xmlData.append("<day_quantity quantity=\"0\">");   	   		   					
@@ -282,7 +300,7 @@ public class ProductionVsBudgetReport extends ValidatorEJB implements Production
   		   			xmlData.append("<cur_cumqty>").append("<![CDATA["+preCumQty+"]]>").append("</cur_cumqty>");	   	   		   					
   		   			xmlData.append("</day_quantity>");   					
   		   		    xmlData.append("</tran_date>");
-  		   		    //System.out.println("Budget Counter last graph empty tag===="+cntFrBudget);
+					}
 			}
 			    xmlData.append("</unit_form>");
 			    xmlData.append("</geo_loc>");