merge from kunal

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

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

 package ibase.webitm.ejb.mfg;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 //import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.GenericUtility;
 //import java.sql.Timestamp;
@@ -79,7 +80,12 @@ class ADPElement
 	//sabyasachi 17-03-2011
 	private String saleOrder;
 	private String lineNo;
+	private String refId;
+	private String detDemand;
 	//end sabyasachi 17-03-2011
+	//Added by manoj dtd 31/10/2013 to store Detail level trace hainv key=tran_id@tran_ser
+	//private HashMap<String, ADPElement> detMap=new HashMap<String, ADPElement>();
+	private ArrayList<HashMap<String, ADPElement>> detList=new ArrayList<HashMap<String, ADPElement>>();
 	
 	public ADPElement()
 	{
@@ -218,8 +224,22 @@ class ADPElement
 	//public void setDemand(java.sql.Timestamp dueDate, double demand)
 	{
 		this.demand += demand;
-		this.saleOrder = saleOrder;
-		this.lineNo = lineNo;
+		//this.saleOrder = saleOrder;
+		//this.lineNo = lineNo;
+		System.out.println("this.refId---"+this.refId);
+		System.out.println("saleOrder---"+saleOrder);
+		if(saleOrder!=null && saleOrder.trim().length()>0)
+		{
+			if(this.refId==null ||this.refId.trim().length()==0)
+				this.refId=saleOrder+"@"+lineNo+"@"+demand;
+			else
+				this.refId+="#"+saleOrder+"@"+lineNo+"@"+demand;
+				
+			
+			
+		}
+			
+		
 		//updateTimeMrp(dueDate, demand, 0, 0, 0,saleOrder,lineNo);
 		updateTimeMrp(dueDate, demand, 0, 0, 0);
 	}
@@ -513,6 +533,39 @@ class ADPElement
 	}
 	//end added by sabyasachi 17-03-11
 
+	/*public void setDetMap(HashMap<String, ADPElement> detMap)
+	{
+		this.detMap=detMap;
+	}
+	public HashMap<String, ADPElement> getDetMap()
+	{
+		return this.detMap;
+	}*/
+	
+	public void setDetList(ArrayList<HashMap<String, ADPElement>> detList)
+	{
+		this.detList=detList;
+	}
+	public ArrayList<HashMap<String, ADPElement>> getDetList()
+	{
+		return this.detList;
+	}
+	public void setRefId(String refId)
+	{
+		this.refId=refId;
+	}
+	public String getRefId()
+	{
+		return this.refId;
+	}
+	public void setDetDemand(String detDemand)
+	{
+		this.detDemand=detDemand;
+	}
+	public String getDetDemand()
+	{
+		return this.detDemand;
+	}
 	//Changes made by Gulzar on 4/18/2012
 	public void setPendingPO(java.sql.Timestamp dueDate, double pendPOQty)
 	{
@@ -562,7 +615,7 @@ class ADPElement
 		int timeEle = -1, ctr;
 		SimpleDateFormat sdt=new SimpleDateFormat("yyyy-MM-dd");
 		dueDate = java.sql.Timestamp.valueOf(sdt.format(dueDate) + " 00:00:00.000");
-		
+		System.out.println("618---timeMRPArr.size() "+timeMRPArr.size() +"----"+dueDate+"---"+demand+"----"+supply+"----"+stockQty);
 		try
 		{
 			if (timeMRPArr.size() > 0)
@@ -581,6 +634,7 @@ class ADPElement
 					}					
 				}
 			}
+			System.out.println("637---timeEle---"+timeEle);
 			if (timeEle == -1)
 			{
 				timeMRP = new TimeMRP();