Changes done at Supreme merged

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

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

@@ -329,7 +329,10 @@ class ADPElement
 	
 	public void setBomCodeParent(String bomCodeParent)
 	{
-		this.bomCodeParent = bomCodeParent;
+		if (this.bomCodeParent == null || "null".equals(this.bomCodeParent) || this.bomCodeParent.trim().length() == 0)
+		{
+			this.bomCodeParent = bomCodeParent;
+		}
 	}
 	public String getBomCodeParent()   // setBomCodeParent
 	{
@@ -675,6 +678,7 @@ class ADPElement
 		System.out.println("618---timeMRPArr.size() "+timeMRPArr.size() +"----"+dueDate+"---"+demand+"----"+supply+"----"+stockQty);
 		try
 		{
+			timeEle = -1;
 			if (timeMRPArr.size() > 0)
 			{
 				for (ctr = 0; ctr < timeMRPArr.size(); ctr++)
@@ -712,9 +716,11 @@ class ADPElement
 				timeMRP = (TimeMRP)this.timeMRPArr.get(timeEle);
 				//added by sabyasachi 29.03.2011
 				//timeMRP.setDemand(demand,saleOrder,lineNo);
+				System.out.println("before setDemand() [" + demand + "] supply [" + supply + "]" );
 				timeMRP.setDemand(demand);
 				//end added by sabyasachi 29.03.2011	
 				timeMRP.setSupply(supply);
+				System.out.println("after setSupply()" );
 				// 12/04/10 manoharan MF90BHU001
 				timeMRP.setStockQty(stockQty);
 				timeMRP.setOthSupply(othSupply);
@@ -723,7 +729,9 @@ class ADPElement
 				//timeMRP.setLineNo(lineNo);							
 				this.timeMRPArr.set(timeEle,timeMRP);
 			}
+			System.out.println("before updateRunningDemandSupply()" );
 			updateRunningDemandSupply(dueDate);			
+			System.out.println("after updateRunningDemandSupply()" );
 		}
 		catch(Exception e)
 		{

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

@@ -194,11 +194,12 @@ public class ExplodeBom
 							   considerLotNoIssue = rs.getString(18);
 							   // 11-08-2007 manoharan
 								itemActive = rs.getString("ACTIVE");
-								if (itemActive == null)
+								System.out.println("12/06/14 itemActive before[ " +itemActive + "]");
+								if (itemActive == null || "null".equals(itemActive))
 								{
 									itemActive = "Y";
 								}
-
+								System.out.println("12/06/14 itemActive after[ " +itemActive + "]");
 								sqlInner = "SELECT SUPP_SOUR, BOM_CODE ,UNIT,NET_WEIGHT,item_type,item_ser "		 //added unit,NET_WEIGHT by rajendra
 										 + "FROM  ITEM "
 									 	 + "WHERE ITEM_CODE = ?";
@@ -250,12 +251,12 @@ public class ExplodeBom
 								rsInner = null;//Added by Jiten 13/11/06 -
 								pstmtInner.close();
 								pstmtInner = null;//Added by Jiten 13/11/06 -
-
-								if (siteItemActive == null)
+								System.out.println("12/06/14 siteItemActive [ " +siteItemActive + "]");
+								if (siteItemActive == null || "null".equals(siteItemActive))
 								{
 									siteItemActive = "Y";
 								}
-
+								System.out.println("12/06/14 siteItemActive after[ " +siteItemActive + "]");
 								if ("N".equalsIgnoreCase(itemActive) || "N".equalsIgnoreCase(siteItemActive) )
 								{
 									continue;
@@ -404,7 +405,7 @@ public class ExplodeBom
 					{
 						pstmtInner.close();
 						pstmtInner = null;//Added by Jiten 13/11/06 -
-						sqlInner = "SELECT ITEM_STRU FROM ITEM WHERE ITEM_CODE = ?";
+						sqlInner = "SELECT case when ITEM_STRU is null then 'S' else ITEM_STRU end  FROM ITEM WHERE ITEM_CODE = ?";
 						pstmtInner = conn.prepareStatement(sqlInner);
 						pstmtInner.setString(1,itemCode);
 						rsInner = pstmtInner.executeQuery();

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

@@ -7,7 +7,7 @@ import ibase.webitm.ejb.ValidatorEJB;
 //import ibase.webitm.ejb.bmr.util.Utils;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
-import ibase.webitm.ejb.bmr.util.*;
+//import ibase.webitm.ejb.bmr.util.*;
 import java.util.*;
 
 import java.rmi.RemoteException;