as discussed tajuddin, merge these component in svn

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

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

@@ -8,7 +8,7 @@ import java.util.HashMap;
 public class SiteItemSummaryBean 
 {	
 	private String siteCode = "",itemCode = "",workOrder = "",siteCodeShip = "",transTran = "",
-			locCode = "",lotSl="",lotNo="",lineNoOrder = "";	
+			locCode = "",lotSl="",lotNo="",lineNoOrder = "",critItem = "";	
 	private double otherSiteQty = 0;
 	private double reqQuantity=0;
 	ArrayList stockList = new ArrayList();
@@ -31,6 +31,14 @@ public class SiteItemSummaryBean
 	public void setSiteCodeShip(String siteCodeShip) {
 		this.siteCodeShip = siteCodeShip;
 	}
+	
+   public String getCritItem() {
+		
+		return critItem;
+	}
+	public void setCritItem(String critItem) {
+		this.critItem = critItem;
+	}
 	public String getWorkOrder() {
 		
 		return workOrder;

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

+package ibase.webitm.ejb.mfg;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+
+
+public class SiteItemSummaryBeanNC 
+{	
+	private String siteCode = "",itemCode = "",workOrder = "",siteCodeShip = "",transTran = "",
+			locCode = "",lotSl="",lotNo="",lineNoOrder = "",critItem = "";	
+	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 getCritItem() {
+		
+		return critItem;
+	}
+	public void setCritItem(String critItem) {
+		this.critItem = critItem;
+	}
+	public String getWorkOrder() {
+		
+		return workOrder;
+	}
+	public void setWorkOrder(String workOrder) {
+		this.workOrder = workOrder;
+	}
+	public double getOtherSiteQty(){
+		
+		return otherSiteQty;
+	}
+	public void setOtherSiteQty(double 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)throws Exception 
+	{
+		HashMap oldStockMap = null;
+		int index = indexofStock(hm);
+		System.out.println("index return in setStockValues"+index);
+		double totalQty= 0 ;
+		
+		if(index > -1)
+		{
+			oldStockMap = (HashMap) stockList.get(index);
+			System.out.println("check");
+			totalQty =  Double.parseDouble(oldStockMap.get("QUANTITY").toString());
+			totalQty = totalQty + Double.parseDouble(hm.get("QUANTITY").toString());
+			System.out.println("SO/DO new quantity added="+totalQty);
+			oldStockMap.put("QUANTITY", totalQty);
+			stockList.set(index, oldStockMap);
+			
+		}
+		else
+		{
+			oldStockMap = new HashMap();
+			oldStockMap.put("ITEM_CODE", hm.get("ITEM_CODE"));
+			oldStockMap.put("SITE_CODE", hm.get("SITE_CODE"));
+			oldStockMap.put("LOC_CODE", hm.get("LOC_CODE"));
+			oldStockMap.put("LOT_NO", hm.get("LOT_NO"));
+			oldStockMap.put("LOT_SL", hm.get("LOT_SL"));
+			oldStockMap.put("QUANTITY", hm.get("QUANTITY"));
+			oldStockMap.put("UNIT", hm.get("UNIT"));
+			oldStockMap.put("SITE_CODE__MFG", hm.get("SITE_CODE__MFG"));
+			oldStockMap.put("MFG_DATE", hm.get("MFG_DATE"));
+			oldStockMap.put("EXP_DATE", hm.get("EXP_DATE"));
+			
+			stockList.add(hm);
+			
+		}
+	}
+	public ArrayList getStockList()
+	{
+		return this.stockList;
+	}
+	//Changed by wasim on 11-04-2016 to set allocated quantity with stock details [END]
+	/*public double getSoftAllocQty() {
+		return softAllocQty;
+	}
+	public void setSoftAllocQty(double softAllocQty) {
+		this.softAllocQty = softAllocQty;
+	}
+	public double getNonAllocQty() {
+		return nonAllocQty;
+	}
+	public void setNonAllocQty(double nonAllocQty) {
+		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) {
+		this.itemCode = itemCode;
+	}
+	//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) {
+		this.locCode = locCode;
+	}
+	
+	public int indexofStock(HashMap stockMap)
+	{
+		int index = -1;
+		HashMap hm = null;
+		
+		String itemCode = (String) stockMap.get("ITEM_CODE");
+		String locCode = (String) stockMap.get("LOC_CODE");
+		String lotNo = (String) stockMap.get("LOT_NO");
+		String lotSl = (String) stockMap.get("LOT_SL");
+		String siteCode = (String) stockMap.get("SITE_CODE");
+		
+		for (int ctr = 0; ctr < stockList.size(); ctr++)
+		{
+			hm = (HashMap) stockList.get(ctr);
+			
+			System.out.println("Comparing");
+			System.out.println("Item Code["+itemCode.trim()+"]List["+((String) stockMap.get("ITEM_CODE")).trim()+"]");
+			System.out.println("Site Code["+siteCode.trim()+"]List["+((String) stockMap.get("SITE_CODE")).trim()+"]");
+			System.out.println("Loc Code["+locCode.trim()+"]List["+((String) stockMap.get("LOC_CODE")).trim()+"]");
+			System.out.println("Lot No["+lotNo.trim()+"]List["+((String) stockMap.get("LOT_NO")).trim()+"]");
+			System.out.println("Lot Sl["+lotSl.trim()+"]List["+((String) stockMap.get("LOT_SL")).trim()+"]");
+			
+			if ((((String) hm.get("ITEM_CODE")).trim().equals(itemCode.trim())) && (((String) hm.get("LOC_CODE")).trim().equals(locCode.trim()))
+			&& (((String) hm.get("LOT_NO")).trim().equals(lotNo.trim())) && (((String) hm.get("LOT_SL")).trim().equals(lotSl.trim())) && (((String) hm.get("SITE_CODE")).trim().equals(siteCode.trim())))
+			{
+				index = ctr;
+				break;
+			}
+		}
+		
+		return index;
+	}
+	
+	//Changed by wasim on on 11-04-2016 for get set method for stock update [START]
+	
+	//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) {
+		this.lineNoOrder = lineNoOrder;
+	}
+	//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/WorkOrderDetailBean.java

@@ -18,9 +18,15 @@ public class WorkOrderDetailBean
 			itemRef = "",itemCode = "",bomCode = "",siteCode = "",unit= "",reqType= "",matchPotency= "",
 			usageType= "",allocateType= "",adjPotency= "",considerLotNoIssue= "",locUsageType= "",itemActive= "",
 			round= "",workOrder ="",suppCodeMfg = "",mfgRef,dimension = "",useInvStatus = "",itemCategory = "",sufficient = "N",
-			considerPartialAlt = "",worderType = "";
+			considerPartialAlt = "",worderType = "", lotNo = "";
 	
 	
+	public String getLotNo() {
+		return lotNo;
+	}
+	public void setLotNo(String lotNo) {
+		this.lotNo = lotNo;
+	}
 	public double getUpdQty() {
 		return updQty;
 	}
@@ -286,6 +292,10 @@ public class WorkOrderDetailBean
 	}
 	//Changed by wasim on 24-11-2015 as it was missing on new code given [END]
 	
+	@Override
+	public String toString() {
+		return "Active["+getActive() + "] AdjPotency[" + getAdjPotency() + "] AdjustedQty[" + getAdjustedQty() + "] LotNo[" + getLotNo();
+	}
 	
 	
 }