Commit 8ef928ba authored by msharma's avatar msharma

Changes done for material requirement


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95858 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 05ad5234
...@@ -1549,6 +1549,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1549,6 +1549,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
ctr = 1; ctr = 1;
//Added by Manoj dtd 30/04/2014 to add Alternate items in list //Added by Manoj dtd 30/04/2014 to add Alternate items in list
if(isDetailReq)
{
pstmt1=conn.prepareStatement("SELECT DISTINCT ITEM_CODE__ALT FROM BOM_ALT WHERE BOM_CODE=? AND ITEM_CODE=?"); pstmt1=conn.prepareStatement("SELECT DISTINCT ITEM_CODE__ALT FROM BOM_ALT WHERE BOM_CODE=? AND ITEM_CODE=?");
pstmt1.setString(1, bomCode); pstmt1.setString(1, bomCode);
pstmt1.setString(2, rs.getString(1)); pstmt1.setString(2, rs.getString(1));
...@@ -1581,6 +1583,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1581,6 +1583,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rs1=null; rs1=null;
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
}
//Ended by Manoj dtd 30/04/2014 to add Alternate items in list //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 ...@@ -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(adpElement.getItemCode()+"---"+adpElement.getSiteCode()+"---"+adpElement.getSaleOrder()+"---"+adpElement.getLineNo());
System.out.println("madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType()); 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()))
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; return;
} }
...@@ -3610,8 +3613,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -3610,8 +3613,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
} }
//End Added by chandrashekar on 09-07-2014 //End Added by chandrashekar on 09-07-2014
*/ adpElement.setSaleOrder(saleOrder); */ //adpElement.setSaleOrder(saleOrder);
adpElement.setLineNo(lineNo); //adpElement.setLineNo(lineNo);
// cpatil end // cpatil end
if (dueDate.compareTo(dateFrom) < 0) if (dueDate.compareTo(dateFrom) < 0)
...@@ -4062,6 +4065,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -4062,6 +4065,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} else } else
{ {
updateDemand(retXMLStr, " ", " "); updateDemand(retXMLStr, " ", " ");
//updateDemand(retXMLStr, adpElement.getSaleOrder(), adpElement.getLineNo());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment