mrpoptimize yield percentage is conditional in yield flag bases

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

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

@@ -155,7 +155,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 	ArrayList IPD_DIST = new ArrayList();
 
 	String wnName1="";   // chandrakant on 29/4/14
-
+	String yield="";
 	HashMap<String, ArrayList<String>> altitemMap=new HashMap<String, ArrayList<String>>();//Manoj dtd 30/04/2014 to store Alternate item
 
 	HashMap <String,String>itemBomMap=new HashMap<String, String>();
@@ -305,6 +305,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 			siteItemList = genericUtility.getColumnValue("site_item_list", dom);   //added by chandrashekar
 			siteList = genericUtility.getColumnValue("site_list", dom);   //added by chandrashekar
 			itemCodeOnlyList = genericUtility.getColumnValue("item_code_only_list", dom);   // added by cpatil
+			yield = genericUtility.getColumnValue("yield", dom);//added by chandrashekar on 05-Feb-2015
+			if(yield == null || yield.trim().length() == 0)
+			{
+				yield = "Y";
+			}
+			System.out.println("yield>>>>>["+yield+"]");
 			//cpatil-25/08/14-System.out.println("siteList@@@@@@"+siteList);
 
 			String isBomReplaceStr = genericUtility.getColumnValue("isBomReplace", dom);   // added by cpatil on 17/05/14
@@ -1814,6 +1820,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 								//cpatil-25/08/14-System.out.println("levelBom.contains(rs.getString(1))--" + levelBom.contains(rs.getString(1)));
 
 								// Added by Jiten 07/11/06//
+								System.out.println("verifier>>>>>>>>["+verifier+"]");
 								if (verifier != null && verifier.equalsIgnoreCase("Y"))
 								{
 									this.fw.write(cyclicItem.siteCode + "		" + cyclicItem.bomCode + "		" + cyclicItem.itemCode + "		" + rs.getString(1) + "\r\n");
@@ -4860,7 +4867,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 		mfgLeadBasis = adpElement.getMfgLeadBasis();
 		batchSizeLead = adpElement.getBatchSizeLead();
 		// end 22/06/10 manoharan
-
+		System.out.println("yieldPerc>>>>>>>>>["+yieldPerc+"]");
 		//if( isBomReplace )
 		//{
 		//	demand =  bomReplaceDemand;
@@ -4884,7 +4891,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 						// orderOpt.equals("B")
 						// )
 					{
-						runningPlanSupply = runningPlanSupply / 100 * yieldPerc;// added
+						//runningPlanSupply = runningPlanSupply / 100 * yieldPerc;// added
 						// by
 						// jiten
 						// as
@@ -4892,6 +4899,16 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 						// Manoharan
 						// Sir
 						// 01/11/06
+						if ("N".equalsIgnoreCase(yield)) 
+						{
+							runningPlanSupply = runningPlanSupply ;
+							System.out.println("runningPlanSupply>>>["+runningPlanSupply+"]");
+						}
+						else
+						{
+							runningPlanSupply = runningPlanSupply / 100 * yieldPerc;
+						}//Added by chandrashekar on 05-Feb-2015
+						
 					}
 					// 10-04-2006 manoharan
 					// end 10-04-2006 manoharan
@@ -4906,7 +4923,16 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 							// orderOpt.equals("B")
 							// )
 						{
-							quantity = Math.round(((quantity) * 100) / yieldPerc);
+							//quantity = Math.round(((quantity) * 100) / yieldPerc);
+							if ("N".equalsIgnoreCase(yield)) 
+							{
+								quantity = Math.round(quantity );
+								System.out.println("quantity>>>>>>>["+quantity+"]");
+							}
+							else
+							{
+								quantity = Math.round(((quantity) * 100) / yieldPerc);
+							}//Added by chandrashekar on 05-Feb-2015
 						}
 						// 10-04-2006 manoharan