Changes done for material requirement

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

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

@@ -1549,38 +1549,41 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				ctr = 1;
 
                 //Added by Manoj dtd 30/04/2014 to add Alternate items in list
-				pstmt1=conn.prepareStatement("SELECT DISTINCT ITEM_CODE__ALT FROM BOM_ALT WHERE BOM_CODE=? AND ITEM_CODE=?");
-				pstmt1.setString(1, bomCode);
-				pstmt1.setString(2, rs.getString(1));
-				rs1=pstmt1.executeQuery();
-				while(rs1.next())
+				if(isDetailReq)
 				{
-						ArrayList<String > al=al=new ArrayList<String>();;
-						if(altitemMap.containsKey(rs.getString(1)))
-								{
-									al=altitemMap.get(rs.getString(1));
-								}
-						
-						al.add(rs1.getString(1));
-						altitemMap.put(rs.getString(1), al);
-						itemBomMap.put(rs.getString(1), bomCode);
-						System.out.println("1347---altitemMap.size()----"+altitemMap.size()+"----"+al.get(0)+"---altitemMap---"+altitemMap);
-						System.out.println("1374---itemBomMap.size()----"+itemBomMap.size()+"---itemBomMap---"+itemBomMap);
-						//al.clear();
-						
-						String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
-						itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
-						System.out.println("@@@@ itemCodeDetailMap 1492["+itemCodeDetailMap+"]");
-						
-						String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
-						parentItemMap.put(rs.getString(1), sourceItem );   //18/06/14
-						System.out.println("@@@@ 1552 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
-						
+					pstmt1=conn.prepareStatement("SELECT DISTINCT ITEM_CODE__ALT FROM BOM_ALT WHERE BOM_CODE=? AND ITEM_CODE=?");
+					pstmt1.setString(1, bomCode);
+					pstmt1.setString(2, rs.getString(1));
+					rs1=pstmt1.executeQuery();
+					while(rs1.next())
+					{
+							ArrayList<String > al=al=new ArrayList<String>();;
+							if(altitemMap.containsKey(rs.getString(1)))
+									{
+										al=altitemMap.get(rs.getString(1));
+									}
+							
+							al.add(rs1.getString(1));
+							altitemMap.put(rs.getString(1), al);
+							itemBomMap.put(rs.getString(1), bomCode);
+							System.out.println("1347---altitemMap.size()----"+altitemMap.size()+"----"+al.get(0)+"---altitemMap---"+altitemMap);
+							System.out.println("1374---itemBomMap.size()----"+itemBomMap.size()+"---itemBomMap---"+itemBomMap);
+							//al.clear();
+							
+							String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
+							itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
+							System.out.println("@@@@ itemCodeDetailMap 1492["+itemCodeDetailMap+"]");
+							
+							String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
+							parentItemMap.put(rs.getString(1), sourceItem );   //18/06/14
+							System.out.println("@@@@ 1552 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
+							
+					}
+					rs1.close();
+					rs1=null;
+					pstmt1.close();
+					pstmt1=null;
 				}
-				rs1.close();
-				rs1=null;
-				pstmt1.close();
-				pstmt1=null;
 				//Ended by Manoj dtd 30/04/2014 to add Alternate items in list
 
 			}
@@ -3478,7 +3481,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 			System.out.println(adpElement.getItemCode()+"---"+adpElement.getSiteCode()+"---"+adpElement.getSaleOrder()+"---"+adpElement.getLineNo());
 			System.out.println("madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType());
 			//if (!"0".equals(madeToOrder) || !"O".equals(adpElement.getMfgType()))
-			if ((!"0".equals(madeToOrder) || !"O".equals(adpElement.getMfgType())) && (!isDetailReq && !isRequirement))//Changed By manoj dtd 05/08/2014
+			if ((!"0".equals(madeToOrder) || !"O".equals(adpElement.getMfgType())) && (!isDetailReq && isRequirement))//Changed By manoj dtd 05/08/2014
 			{
 				return;
 			}
@@ -3610,8 +3613,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					}
 				}
 				//End Added by chandrashekar on 09-07-2014
-*/				adpElement.setSaleOrder(saleOrder);
-				adpElement.setLineNo(lineNo);
+*/				//adpElement.setSaleOrder(saleOrder);
+				//adpElement.setLineNo(lineNo);
 
 				// cpatil end
 				if (dueDate.compareTo(dateFrom) < 0)
@@ -4062,6 +4065,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 									} else
 									{
 										updateDemand(retXMLStr, "          ", "   ");
+										//updateDemand(retXMLStr, adpElement.getSaleOrder(), adpElement.getLineNo());
 									}	
 								}