Commit d7381efb authored by prane's avatar prane

added item series consideration changes while populating item code

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212756 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e56e28ac
...@@ -2140,7 +2140,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -2140,7 +2140,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpQueryMSTmp = adpQueryMSTmp.replaceAll("@madetoorder@", madeToOrder); adpQueryMSTmp = adpQueryMSTmp.replaceAll("@madetoorder@", madeToOrder);
adpQueryMSTmp = adpQueryMSTmp.replaceAll("@madetostock@", madeToStock); adpQueryMSTmp = adpQueryMSTmp.replaceAll("@madetostock@", madeToStock);
adpQueryMSTmp = adpQueryMSTmp.replaceAll("@rundate@", dbRunDate); adpQueryMSTmp = adpQueryMSTmp.replaceAll("@rundate@", dbRunDate);
//Added Pavan Rane 27NOV19[to consider itemser while pupulating item] start
adpQueryMSTmp = adpQueryMSTmp.replaceAll("@itemserfr@", itemSerFrom);
adpQueryMSTmp = adpQueryMSTmp.replaceAll("@itemserto@", itemSerTo);
//Added Pavan Rane 27NOV19[to consider itemser while pupulating item] End
adpQueryMOTmp = checkNull(externalSqlMap.get("madeToOrderMOOracle")); adpQueryMOTmp = checkNull(externalSqlMap.get("madeToOrderMOOracle"));
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@fromdate@", dbDateFrom); adpQueryMOTmp = adpQueryMOTmp.replaceAll("@fromdate@", dbDateFrom);
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@todate@", dbDateTo); adpQueryMOTmp = adpQueryMOTmp.replaceAll("@todate@", dbDateTo);
...@@ -2149,6 +2154,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -2149,6 +2154,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@madetostock@", madeToStock); adpQueryMOTmp = adpQueryMOTmp.replaceAll("@madetostock@", madeToStock);
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@rundate@", dbRunDate); adpQueryMOTmp = adpQueryMOTmp.replaceAll("@rundate@", dbRunDate);
//Added Pavan Rane 27NOV19[to consider itemser while pupulating item] start
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@itemserfr@", itemSerFrom);
adpQueryMOTmp = adpQueryMOTmp.replaceAll("@itemserto@", itemSerTo);
//Added Pavan Rane 27NOV19[to consider itemser while pupulating item] End
/**---Change suggested Sm sir -----------*/ /**---Change suggested Sm sir -----------*/
//String SqlDet = "SELECT COUNT(*) FROM BOMDET B, BOM A WHERE B.BOM_CODE = A.BOM_CODE " //String SqlDet = "SELECT COUNT(*) FROM BOMDET B, BOM A WHERE B.BOM_CODE = A.BOM_CODE "
// + " AND B.ITEM_CODE = ? AND A.CONFIRMED = 'Y' AND A.ACTIVE = 'Y' " ; // + " AND B.ITEM_CODE = ? AND A.CONFIRMED = 'Y' AND A.ACTIVE = 'Y' " ;
...@@ -5201,9 +5211,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5201,9 +5211,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// made to order // made to order
// don't process here // don't process here
//System.out.println("BASEpopulateDemandSupply...called....siteCode--["+siteCode+"]itemCode-["+itemCode+"]itemCodeTo-["+itemCodeTo+"]"); //System.out.println("BASEpopulateDemandSupply...called....siteCode--["+siteCode+"]itemCode-["+itemCode+"]itemCodeTo-["+itemCodeTo+"]");
BaseLogger.log( "3", null, null, "BASEpopulateDemandSupply...called....siteCode--["+siteCode+"]itemCode-["+itemCode+"]itemCodeTo-["+itemCodeTo+"]"); BaseLogger.log( "3", null, null, "BASEpopulateDemandSupply...called....siteCode--["+siteCode+"]itemCode-["+itemCode+"]itemCodeTo-["+itemCodeTo+"]+adpElement.getMfgType()["+adpElement.getMfgType()+"]");
//System.out.println("madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType()); //System.out.println("madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType());
BaseLogger.log( "3", null, null, "madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType()); //BaseLogger.log( "3", null, null, "madeToOrder---"+madeToOrder+"----adpElement.getMfgType()----"+adpElement.getMfgType());
/* Commented by Manoj dtd 30/12/2013 calling same method for all items /* Commented by Manoj dtd 30/12/2013 calling same method for all items
if ("0".equals(madeToOrder) && "O".equals(adpElement.getMfgType())) if ("0".equals(madeToOrder) && "O".equals(adpElement.getMfgType()))
{ {
...@@ -5879,7 +5889,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5879,7 +5889,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpElement.setDemand(dueDate, bomReplaceDemand, " ", " "); adpElement.setDemand(dueDate, bomReplaceDemand, " ", " ");
} }
*/ */
BaseLogger.log("0",null,null,"Populate Demand completed...................."+demandSupplyList); //BaseLogger.log("0",null,null,"Populate Demand completed...................."+demandSupplyList);
} catch (SQLException se) } catch (SQLException se)
{ {
//System.out.println("SQLException :RunMRPPrcEJB : populateDemandSupply(ADPElement).." + se.getMessage()); //System.out.println("SQLException :RunMRPPrcEJB : populateDemandSupply(ADPElement).." + se.getMessage());
......
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