changes merged to head from branch

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

webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java

@@ -4873,11 +4873,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 
 				// 18-11-2006 manoharan if dueDate < dateFrom then set the
 				// dueDate as dateFrom
-
-				if (dueDate.compareTo(dateFrom) < 0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if (dueDate.compareTo(dateFrom) < 0)
 				{
 					dueDate = dateFrom;
-				}
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 				// end 18-11-2006 manoharan
 				// if else condition added by Jiten as per Manoharan Sir
 				// 02/11/06
@@ -5934,10 +5935,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				lineNo = rs.getString(2);
 				rsItemCode = rs.getString(3);
 				dueDate = rs.getTimestamp(4);
-				if(dueDate.compareTo(today)<0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if(dueDate.compareTo(today)<0)
 				{
 					dueDate=today;
-				}
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 				demand = rs.getDouble(5);
 				supply = rs.getDouble(6);
 				stockQty = rs.getDouble(7);
@@ -6016,11 +6019,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				//adpElement.setLineNo(lineNo);
 
 				// cpatil end
-				if (dueDate.compareTo(dateFrom) < 0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if (dueDate.compareTo(dateFrom) < 0)
 				{
 					dueDate = dateFrom;
-				}
-
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 				String bomitemCode1=""; //031016
 				for(int ctr=0;ctr<adpeList.size();ctr++)
 				{
@@ -12601,12 +12605,32 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 
 					insertRow++;
 					row = sheet.createRow(insertRow);
-					for (int j = 0; j < titles.length; j++)
+					
+					//Chnaged by Pavan R on 19/JAN/2K18[Start] to set color of record
+					/*for (int j = 0; j < titles.length; j++)
 					{
 						//cell = row.createCell((short) j);
 						cell = row.createCell((int) j);
-					}
-
+					}*/
+					HSSFCellStyle styleDateClr = wb.createCellStyle();
+					HSSFCellStyle styleClr = wb.createCellStyle();
+					HSSFFont fontClr = wb.createFont();
+					fontClr.setColor(HSSFColor.RED.index);
+					styleClr.setFont(fontClr);					
+					
+					for (int j = 0; j < titles.length; j++)
+					{						
+						if(demand != 0 && dueDate.before(dateFrom))
+						{
+							cell = row.createCell((int) j);
+							cell.setCellStyle(styleClr);
+							styleDateClr = styleClr;
+						}else
+						{											
+							cell = row.createCell((int) j);
+						}
+					}									
+					//Changed by Pavan R on 19/JAN/2K18[End]
 					// if(flag)
 					// {
 					row.getCell(0).setCellValue(siteCode);
@@ -12628,10 +12652,25 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					row.getCell(12).setCellValue(pendDRQty);
 					// End Changes by Gulzar on 4/27/2012
 
-					cell = row.getCell(13);
+					//Changed by Pavan R on 19/JAN/2K18[Start] to set color of record if demand <>0 or dueDate< frDate
+					/*cell = row.getCell(13);
 					cell.setCellValue(HSSFDateUtil.getExcelDate(dueDate));
 					cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-					cell.setCellStyle(cellStyle);
+					cell.setCellStyle(cellStyle);*/					
+					if(demand != 0 && dueDate.before(dateFrom))
+					{
+						cell = row.getCell(13);
+						cell.setCellValue(HSSFDateUtil.getExcelDate(dueDate));
+						styleDateClr.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
+						cell.setCellStyle(styleDateClr);
+					}else
+					{
+						cell = row.getCell(13);
+						cell.setCellValue(HSSFDateUtil.getExcelDate(dueDate));
+						cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
+						cell.setCellStyle(cellStyle);						
+					}
+					//Changed by Pavan R on 19/JAN/2K18[End]
 
 					row.getCell(14).setCellValue(planSupply);
 					row.getCell(15).setCellValue(runningDemand);
@@ -13646,10 +13685,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				pendPOQty = rs.getDouble(7);
 				tranId=rs.getString("tran_id");
 				tranSer=rs.getString("tran_ser");
-				if (dueDate.compareTo(dateFrom) < 0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if (dueDate.compareTo(dateFrom) < 0)
 				{
 					dueDate = dateFrom;
-				}
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 
 
 
@@ -14024,10 +14065,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				rsItemCode = rs.getString(1);
 				rsSiteCode = rs.getString(13);
 				dueDate=rs.getTimestamp(2);
-				if(dueDate.compareTo(today)<0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if(dueDate.compareTo(today)<0)
 				{
 					dueDate=today;
-				}
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 				//rsSiteCode = siteCode;
 				dataBeanObject.setItemCode(rs.getString(1));
 				dataBeanObject.setDueDate(dueDate);
@@ -14207,10 +14250,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				rsItemCode = rs.getString(1);
 				rsSiteCode = rs.getString(13);
 				dueDate=rs.getTimestamp(2);
-				if(dueDate.compareTo(today)<0)
+				//Commented by Pavan R on 19/JAN/2K18[Start]do not changes the dueDate from dateFrom
+				/*if(dueDate.compareTo(today)<0)
 				{
 					dueDate=today;
-				}
+				}*/
+				//[End]Pavan R on 19/JAN/2K18
 				//rsSiteCode = siteCode;
 				dataBeanObject.setItemCode(rs.getString(1));
 				dataBeanObject.setDueDate(dueDate);