changes done For Material Requirement HTML wizard Transaction[MF3KSUN005]

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

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

@@ -144,6 +144,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 	String sorderList = "0";//Manoj dtd 17/10/2013
 	String itemCodeList = "0";//Manoj dtd 17/10/2013
 	boolean isDetailReq = false;//Manoj dtd 17/10/2013
+	String siteItemList = "0";//chandrashekar 0n 04/04/2014
+	boolean isRequirement = false;//Chandrashekar 04/04/2014
 	
 	ArrayList IPD_INDEPENDENT = new ArrayList();
 	ArrayList IPD_INDENT = new ArrayList();
@@ -227,6 +229,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 		{
 			isDetailReq=true;
 		}
+		if("w_requirement".equalsIgnoreCase(windowName))
+		{
+			isRequirement=true;
+		}
 
 		if (genericUtility == null)
 		{
@@ -252,6 +258,7 @@ 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
 			// Added by Jiten 07/11/06
 			// this.fw = new
 			// FileWriter(CommonConstants.JBOSSHOME+"\\log\\RepeatBom.log");
@@ -378,7 +385,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				return errString;
 			}
 
-			/* Added by sachin on 26/6/13 */
+			/* Added by sachin on 26/6/13 
 
 			if (wnName.equals("w_requirement"))
 			{
@@ -388,8 +395,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					return xmlDataString.toString();
 				}
 			}
-			/* End Added by sachin on 26/6/13 */
-
+			 End Added by sachin on 26/6/13 
+			 */
 			errString = generatePlanDemand();
 			if (errString != null && errString.trim().length() > 0)
 			{
@@ -1042,6 +1049,19 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					//	subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDER WHERE SALE_ORDER IN("+sorderList+") ";
 					subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDDET WHERE SALE_ORDER||ITEM_CODE IN("+itemCodeList+") )";
 				}
+			}else if(isRequirement)
+			{
+				if ((CommonConstants.DB_NAME).equalsIgnoreCase("db2"))   /// chandrashekar added for Requirement wizard on 04/04/14
+				{
+					
+					//subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE FROM SITEITEM WHERE CONCAT(SITE_CODE,ITEM_CODE) IN("+siteItemList+"))";
+					subQuery=" AND CONCAT(A.SITE_CODE,A.ITEM_CODE)IN("+siteItemList+")";
+				}
+				else
+				{ 
+					subQuery=" AND (A.SITE_CODE||A.ITEM_CODE IN("+siteItemList+"))";
+					
+				}
 			}
 			
 			if ((CommonConstants.DB_NAME).equalsIgnoreCase("db2"))
@@ -6929,11 +6949,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					// End changes by Gulzar on 4/18/2012
 
 					// added by akhilesh on
-					count++;
+					//count++; commented by chandrashekar
 					System.out.println("@@@@@@@@@@@isDetailReq["+isDetailReq+"]");
 					if(isDetailReq)  // cpatil
 					{
-						
+						//count++;
 						System.out.println("@@@@@@@@@["+siteCode+"]["+itemCode+ "]@@@@@@@@@sorderItemSet["+sorderItemSet+"]saleOrder["+saleOrder+"]isDetailReq["+isDetailReq+"]");
 						if( sorderItemSet != null && sorderItemSet.contains(siteCode+itemCode))   // +saleOrder
 						{
@@ -6946,12 +6966,27 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 							sorderItemSet.add(  siteCode+itemCode );  //+saleOrder
 						}
 					}
+					if(isRequirement)  // Chandrashekar
+					{
+						
+						System.out.println("@@@@@@@@@["+siteCode+"]["+itemCode+ "]@@@@@@@@@sorderItemSet["+sorderItemSet+"]saleOrder["+saleOrder+"]isRequirement["+isRequirement+"]");
+						if( sorderItemSet != null && sorderItemSet.contains(siteCode+itemCode))   // +saleOrder
+						{
+							System.out.println("@@@@@@@@@@@@@@@@@@@ continue");
+							continue;
+						}
+						else
+						{
+							System.out.println("@@@@@@@@@ added ["+siteCode+"]["+itemCode+"]["+saleOrder+"]@@@@@");
+							sorderItemSet.add(  siteCode+itemCode );  //+saleOrder
+						}
+					}
 
 					System.out.println("@@@@@@@@ test continue not found--["+siteCode+"]-["+itemCode+"]--@@sorderItemSet["+sorderItemSet+"]");
 
 					//valueXmlString.append("<Detail" + context + " domID='" + count + "' >\r\n");
 					if(!(isDetailReq))
-					{	
+					{	count++;
 						valueXmlString.append("<Detail" + context + " domID='" + count + "' >\r\n");
 					}
 					else