added site_code condition in pophelp sql of bom_code and color change for new planned data

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

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

@@ -7464,7 +7464,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				valueXmlString.append("<source_supply protect = '1'>").append("M").append("</source_supply>\r\n");
 				
 				//valueXmlString.append("<previous_item protect = '1'>").append(itemWorderMap.get(itemCodeMap)==null?"":itemWorderMap.get(itemCodeMap).toString()).append("</previous_item>\r\n");
-				
+				valueXmlString.append("<new_planned_supply protect = '1'>").append("Y").append("</new_planned_supply>\r\n");    // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
 				valueXmlString.append("</Detail4>");
 				
 				
@@ -7496,7 +7496,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n");
 				valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n");
 				valueXmlString.append("<source_supply protect = '1'>").append("P").append("</source_supply>\r\n");
-				
+				valueXmlString.append("<new_planned_supply protect = '1'>").append("Y").append("</new_planned_supply>\r\n");     // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
 				valueXmlString.append("</Detail4>");
 				
 				//itemWorderMap.put(itemCode, tranIdCodeMap);   // 18/06/14
@@ -7526,7 +7526,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n");
 				valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n");
 				valueXmlString.append("<source_supply protect = '1'>").append("D").append("</source_supply>\r\n");
-				
+				valueXmlString.append("<new_planned_supply protect = '1'>").append("Y").append("</new_planned_supply>\r\n");    // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
 				valueXmlString.append("</Detail4>");
 				
 			//	itemWorderMap.put(itemCode, tranIdCodeMap);   // 18/06/14
@@ -7556,7 +7556,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n");
 				valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n");
 				valueXmlString.append("<source_supply protect = '1'>").append("P").append("</source_supply>\r\n");
-				
+				valueXmlString.append("<new_planned_supply protect = '1'>").append("Y").append("</new_planned_supply>\r\n");      // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
 				valueXmlString.append("</Detail4>");
 				
 			//	itemWorderMap.put(itemCode, tranIdCodeMap);   // 18/06/14
@@ -8259,7 +8259,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 									}
 									*/
 									valueXmlString.append("<source_supply protect = '1'>").append("<![CDATA[" + sourceSupplyFlag + "]]>").append("</source_supply>\r\n");
-								
+									if(isDetailReq)  // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
+									{
+										valueXmlString.append("<new_planned_supply protect = '1'>").append("N").append("</new_planned_supply>\r\n");     // added by cpatil on 27/08/14 for displaying diffenrent color for new planned
+									}
 									//cpatil-25/08/14-System.out.println("@@@@@@@@@@@@@@@["+itemCode+"] sourceSupplyFlag["+sourceSupplyFlag+"] ");
 									tranSer2="";
 									

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

@@ -1041,10 +1041,10 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 	}
 	
 	
-	public String getBomCodeList(String itemCode,String dbID) throws ITMException 
+	public String getBomCodeList(String itemCode,String siteCode,String dbID) throws ITMException 
 	{
 		System.out.println("itemCode cal------------------["+itemCode+"]");
-		
+		System.out.println("siteCode cal------------------["+siteCode+"]");
 		System.out.println("dbID cal------------------["+dbID+"]");
 		
 		String sql = "";
@@ -1065,10 +1065,11 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 			//if(itemCode == null || itemCode.trim().length() == 0)
 			//{	
 				selectSql = " select bom_code,descr from bom " +
-						" where  active = 'Y' and confirmed = 'Y' and item_code =  ?  order by bom_code ";
+						    " where  active = 'Y' and confirmed = 'Y' and item_code =  ?  and site_code = ?  order by bom_code ";
 				System.out.println("sql:::"+selectSql);
 				pstmt = conn.prepareStatement(selectSql);
 				pstmt.setString(1, itemCode);
+				pstmt.setString(2, siteCode);
 				
 				rs = pstmt.executeQuery();
 				int num = 1;

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

@@ -19,5 +19,5 @@ public interface RunMRPWizLocal extends ValidatorLocal
 	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
 	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
 	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
-	public String getBomCodeList( String itemCode , String dbID) throws RemoteException,ITMException;
+	public String getBomCodeList( String itemCode , String siteCode, String dbID) throws RemoteException,ITMException;
 }

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

@@ -19,5 +19,5 @@ public interface RunMRPWizRemote extends ValidatorRemote
 	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
 	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
 	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
-	public String getBomCodeList( String itemCode , String dbID) throws RemoteException,ITMException;
+	public String getBomCodeList( String itemCode ,String siteCode, String dbID) throws RemoteException,ITMException;
 }

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

@@ -55,7 +55,7 @@ public class RunMrpBomPopHelpBean
 	{
 	}
 	//get item code pop help 
-	public String getBomCodeList( String itemCode , String dbID ) throws ITMException
+	public String getBomCodeList( String itemCode ,String siteCode, String dbID ) throws ITMException
 	{
 		String bomCodeData = "";
 		RunMRPWizRemote runMRPWizRemote = null;
@@ -63,7 +63,7 @@ public class RunMrpBomPopHelpBean
 		{
 			InitialContext ctx = new InitialContext( new AppConnectParm().getProperty() );
 			runMRPWizRemote = (ibase.webitm.ejb.mfg.RunMRPWizRemote)ctx.lookup("ibase/RunMRPWiz/remote");
-			bomCodeData = runMRPWizRemote.getBomCodeList( itemCode ,dbID );
+			bomCodeData = runMRPWizRemote.getBomCodeList( itemCode, siteCode ,dbID );
 			runMRPWizRemote = null;
 			System.out.println("bomCodeData=="+bomCodeData);
 			String xslFileName = getXSLFileName( "mrp_bom_code_wiz_" + this.user_lang + "_" + this.user_country + ".xsl" );