ejb updated for MRP Requirement Wizard[MF3KSUN005]

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

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

@@ -117,6 +117,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 		String siteCodeFr = "";
 		String siteCodeTo = "";
 		String siteItemList="";
+		String siteList="";
 		String tranidIncrement="";
 		String bomCode="";
 
@@ -459,10 +460,18 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 						System.out.println("siteCode=="+siteCode+"itemCode=="+itemCode);
 						System.out.println("ctr1=="+ctr1);
 						if(ctr1 > 0)
+						{
 							siteItemList = siteItemList + ",'"+siteCode.trim()+itemCode.trim()+"'" ;
+							siteList = siteList + ",'"+siteCode.trim()+"'" ;
+						}
 						else
+						{
 							siteItemList = "'"+siteCode.trim()+itemCode.trim()+"'" ;
+							siteList = "'"+siteCode.trim()+"'" ;
+						}
+							
 						System.out.println("siteItemList=="+siteItemList);
+						System.out.println("siteList=="+siteList);
 					}
 
 					StringBuffer argData = new StringBuffer();
@@ -472,6 +481,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 					argData.append("<date_from>").append(fromDate).append("</date_from>\r\n");
 					argData.append("<date_to>").append(toDate).append("</date_to>\r\n");
 					argData.append("<site_item_list>").append(siteItemList).append("</site_item_list>\r\n");//chandrashekar 0n 19-03-2014
+					argData.append("<site_list>").append(siteList).append("</site_list>\r\n");//chandrashekar on 10-07-2014
 					argData.append("<site_code__from>").append(siteCodeFr).append("</site_code__from>\r\n");
 					argData.append("<site_code__to>").append(siteCodeTo).append("</site_code__to\r\n>");
 					argData.append("<item_code__from>").append(itemCodeFr).append("</item_code__from>\r\n");

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

@@ -146,6 +146,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 	String itemCodeList = "0";//Manoj dtd 17/10/2013
 	boolean isDetailReq = false;//Manoj dtd 17/10/2013
 	String siteItemList = "0";//chandrashekar 0n 04/04/2014
+	String siteList = "0";//chandrashekar 0n 10/07/2014
 	boolean isRequirement = false;//Chandrashekar 04/04/2014
 	
 	ArrayList IPD_INDEPENDENT = new ArrayList();
@@ -299,6 +300,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 			//sorderList= genericUtility.getColumnValue("sale_order_list", dom);
 			itemCodeList = genericUtility.getColumnValue("item_code_list", dom);   // added by cpatil
 			siteItemList = genericUtility.getColumnValue("site_item_list", dom);   //added by chandrashekar
+			siteList = genericUtility.getColumnValue("site_list", dom);   //added by chandrashekar
+			
+			System.out.println("siteList@@@@@@"+siteList);
 			
 			String isBomReplaceStr = genericUtility.getColumnValue("isBomReplace", dom);   // added by cpatil on 17/05/14
 			
@@ -1171,19 +1175,26 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 			sql = sql + "CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END ";
 			sql = sql + "FROM SITEITEM ";
 			sql = sql + "WHERE ";
-			sql = sql + "CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END >= ? ";
-			sql = sql + "AND CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END <= ?";
-
-			pstmt = conn.prepareStatement(sql);
-			if( !(isBomReplace))   //added by cpatil for bom replacement
+			if(isDetailReq)
 			{
-				pstmt.setString(1, siteCodeFrom);
-				pstmt.setString(2, siteCodeTo);
-			}
-			else
+				sql = sql + "CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END >= ? ";
+				sql = sql + "AND CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END <= ?";
+
+				pstmt = conn.prepareStatement(sql);
+				if( !(isBomReplace))   //added by cpatil for bom replacement
+				{
+					pstmt.setString(1, siteCodeFrom);
+					pstmt.setString(2, siteCodeTo);
+				}
+				else
+				{
+					pstmt.setString(1, siteCode1);
+					pstmt.setString(2, siteCode1);
+				}
+			}else if(isRequirement)
 			{
-				pstmt.setString(1, siteCode1);
-				pstmt.setString(2, siteCode1);
+				sql = sql + "CASE WHEN SITE_CODE__PLAN IS NULL THEN SITE_CODE ELSE SITE_CODE__PLAN END  IN("+siteList+") ";
+				pstmt = conn.prepareStatement(sql);
 			}
 			rs = pstmt.executeQuery();