changes related to firmplan as per new requirements

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

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

@@ -10,36 +10,56 @@ public class SiteItemSummaryBean
 	private String siteCode = "",itemCode = "",workOrder = "",siteCodeShip = "",transTran = "",
 			locCode = "",lotSl="",lotNo="",lineNoOrder = "";	
 	private double otherSiteQty = 0;
+	private double reqQuantity=0;
 	ArrayList stockList = new ArrayList();
 	
 	public String getTransTran() {
+		
+		
+		
 		return transTran;
+		
 	}
 	public void setTransTran(String transTran) {
 		this.transTran = transTran;
 	}
 	
 	public String getSiteCodeShip() {
+		
 		return siteCodeShip;
 	}
 	public void setSiteCodeShip(String siteCodeShip) {
 		this.siteCodeShip = siteCodeShip;
 	}
 	public String getWorkOrder() {
+		
 		return workOrder;
 	}
 	public void setWorkOrder(String workOrder) {
 		this.workOrder = workOrder;
 	}
 	public double getOtherSiteQty(){
+		
 		return otherSiteQty;
 	}
 	public void setOtherSiteQty(double otherSiteQty)
 	{
-		 this.otherSiteQty = otherSiteQty;
+		System.out.println("before:::" + this.otherSiteQty);
+		 this.otherSiteQty += otherSiteQty;
+		 System.out.println("after:::" + this.otherSiteQty);
+	}
+public double getReqQuantity(){
+		
+		return reqQuantity;
+	}
+	public void setReqQuantity(double reqQuantity)
+	{
+		System.out.println("before required:::" + this.reqQuantity);
+		 this.reqQuantity += reqQuantity;
+		 System.out.println("after required:::" + this.reqQuantity);
 	}
 	//Changed by wasim on 11-04-2016 to set allocated quantity with stock details [START]
-	public void setStockValues(HashMap hm) 
+	public void setStockValues(HashMap hm)throws Exception 
 	{
 		HashMap oldStockMap = null;
 		int index = indexofStock(hm);
@@ -55,6 +75,7 @@ public class SiteItemSummaryBean
 			System.out.println("SO/DO new quantity added="+totalQty);
 			oldStockMap.put("QUANTITY", totalQty);
 			stockList.set(index, oldStockMap);
+			
 		}
 		else
 		{
@@ -71,6 +92,7 @@ public class SiteItemSummaryBean
 			oldStockMap.put("EXP_DATE", hm.get("EXP_DATE"));
 			
 			stockList.add(hm);
+			
 		}
 	}
 	public ArrayList getStockList()
@@ -91,12 +113,14 @@ public class SiteItemSummaryBean
 		this.nonAllocQty = nonAllocQty;
 	}*/
 	public String getSiteCode() {
+		
 		return siteCode;
 	}
 	public void setSiteCode(String siteCode) {
 		this.siteCode = siteCode;
 	}
 	public String getItemCode() {
+		
 		return itemCode;
 	}
 	public void setItemCode(String itemCode) {
@@ -104,18 +128,23 @@ public class SiteItemSummaryBean
 	}
 	//Changed by wasim on 11-04-2016 for get set method for stock update [START]
 	public String getLotNo() {
+		
 		return lotNo;
 	}
 	public void setLotNo(String lotNo) {
+		
 		this.lotNo = lotNo;
 	}
+	
 	public String getLotSl() {
+		
 		return lotSl;
 	}
 	public void setLotSl(String lotSl) {
 		this.lotSl = lotSl;
 	}
 	public String getLocCode() {
+		
 		return locCode;
 	}
 	public void setLocCode(String locCode) {
@@ -159,6 +188,7 @@ public class SiteItemSummaryBean
 	
 	//Changed by wasim on on 13-07-2016 for get set method for line number order [START]
 	public String getLineNoOrder() {
+		
 		return lineNoOrder;
 	}
 	public void setLineNoOrder(String lineNoOrder) {
@@ -166,4 +196,11 @@ public class SiteItemSummaryBean
 	}
 	//Changed by wasim on on 11-04-2016 for get set method for line number order [END]
 	
+	
+	
+	/*@Override
+	public String toString() {
+		return "qty[" +this.getOtherSiteQty()+ "] lotno in site item bean[" +this.getLotNo()+ "]";
+	}*/
+	
 }

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

@@ -8,7 +8,7 @@ import java.text.SimpleDateFormat;
 public class WorderStkBean 
 {
 	private double potencyAdj = 0,stkQuantityNew = 0,updQty = 0,qtyAdj = 0,reserveStkQty = 0;
-	private double allocQty = 0,stkQuantity = 0,stkPotencyPerc = 0,actualAllocQty = 0,requiredQty = 0;
+	private double allocQty = 0,stkQuantity = 0,stkPotencyPerc = 0,actualAllocQty = 0;
 	java.sql.Timestamp expDate = null,mfgDate = null;
 	private String locCode = "",lotNo = "",lotSl = "",siteCode = "",itemCode = "",itemRef = "",alternate = "",itemDescr = "",
 			workOrder = "",expLevel = "",critItem = "",unit = "",dimension = "",reserveStk = "",reserveStkTranId = "",
@@ -204,14 +204,8 @@ public class WorderStkBean
 	public void setStkQuantity(double stkQuantity) {
 		this.stkQuantity = stkQuantity;
 	}
-	/*
-	public double getRequiredQuantity() {
-		return requiredQty;
-	}
-	public void setRequiredQuantity(double requiredQty) {
-		this.requiredQty = requiredQty;
-	}
-	*/
+	
+	
 	public String getCritItem() {
 		return critItem;
 	}
@@ -258,6 +252,12 @@ public class WorderStkBean
 		return quantity;
 	}
 	
+	@Override
+	public String toString() {
+		return " in work order bean Item Code:[" + this.getItemCode() +"], Lot No:["+ this.getLotNo() +"], lotsl [" + this.getLotSl() + "], loccode [" + this.getLocCode() +"]";
+	}
+	
+	
 	/* 31-may-16 manoharan Comparator for sorting the list by work_order,exp_lev, exp_date*/
     public static Comparator<WorderStkBean> WoStkBeanComparator = new Comparator<WorderStkBean>() {
 
@@ -282,5 +282,7 @@ public class WorderStkBean
 		   //return KeyStockBean2.compareTo(KeyStockBean1);
 		}
 	};
+	
+	
 
 }