For Requirement calculations change by demand condition in demandsupplymaterialReqOracle.sql

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

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

@@ -3586,8 +3586,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				{
 					ADPElement adpElement = (ADPElement) tempList.get(ctr);
 					// adpElement =
+					if(!isRequirement)
+					{
 						populateMTODemandSupply(adpElement.getSiteCode(), adpElement.getItemCode(), adpElement);
 					}
+				}
 				tempList.clear();
 				tempList = null;
 			}
@@ -4008,12 +4011,15 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				if (rsItemCode != null && rsItemCode.trim().equalsIgnoreCase(itemCode.trim()))
 				{
 					System.out.println("dueDate---demand---supply"+dueDate+"---"+demand+"---"+supply);
-
+					System.out.println("madeToOrder>>>>>>>"+madeToOrder+"mfg type>>>>>>"+adpElement.getMfgType());
 					//Condition added by Manoj dtd 30/12/2013 to set emand =0
-					if("0".equals(madeToOrder) && "O".equals(adpElement.getMfgType()))
+					if(!isRequirement)
 					{
-						demand=0;
+						if ("0".equals(madeToOrder) && "O".equals(adpElement.getMfgType()))
+						{
+							demand = 0;
 						}
+					}//change by chandrashekar on 06-may-2014
 
 					if(!isDetailReq)
 					{
@@ -10060,10 +10066,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				double planSupplySum = 0,independentDemandSum = 0;
 				double runningDemandSum = 0,runningPlanSupplySum = 0;
 				double runningSupplySum = 0,planSupplySumSum = 0;
-
+				int timeCtrLength=0;
 				//for (int timeCtr = 0; timeCtr < timeMRParr.size(); timeCtr++)
-
-				for (int timeCtr = 0; timeCtr < 1 ; timeCtr++)
+				if(isDetailReq)
+				{
+					timeCtrLength=1;
+				}
+				else
+				{
+					timeCtrLength= timeMRParr.size();
+				}
+				for (int timeCtr = 0; timeCtr < timeCtrLength ; timeCtr++)
 				{
 					if( timeMRParr.size() > 0) 
 					{	
@@ -10077,6 +10090,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 						System.out.println("demandSum["+demandSum+"]");
 						supply = timeMrp.getSupply();
 						supplySum = supplySum+supply;
+						System.out.println("supplySum>>>["+supplySum+"]");
 						planSupply = timeMrp.getPlanSupply();
 						planSupplySum = planSupplySum+planSupply;
 						runningDemand = timeMrp.getRunningDemand();