Commit 35ec4e76 authored by msharma's avatar msharma

Display Made to stock items also for MRP wizard transaction


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94394 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a1d3c9ef
...@@ -4888,6 +4888,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -4888,6 +4888,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// else if (( suppSour.equals("P") || suppSour.equals("C") // else if (( suppSour.equals("P") || suppSour.equals("C")
// )&& matPlan.equals("Y") ) // )&& matPlan.equals("Y") )
System.out.println("15032014---suppSour----"+suppSour+"---matPlan---"+matPlan+"---");
if ((suppSour.equals("P") || suppSour.equals("C")) && matPlan.equals("Y")) if ((suppSour.equals("P") || suppSour.equals("C")) && matPlan.equals("Y"))
{ {
// System.out.println("Indent creation Plan Supply :" + // System.out.println("Indent creation Plan Supply :" +
...@@ -4968,6 +4969,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -4968,6 +4969,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
} }
} }
System.out.println("findEle-----"+findEle);
if (findEle >= 0) if (findEle >= 0)
{ {
indent.quantity += reqQty; indent.quantity += reqQty;
...@@ -5011,6 +5013,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5011,6 +5013,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
indList.add(newIndent); indList.add(newIndent);
} }
} }
System.out.println("orderOpt--------"+orderOpt+"---");
} // (( suppSour.equals("P") || suppSour.equals("C") )&& } // (( suppSour.equals("P") || suppSour.equals("C") )&&
// matPlan.equals("Y") ) // matPlan.equals("Y") )
else if (suppSour.equals("M") && mfgPlan.equals("Y")) else if (suppSour.equals("M") && mfgPlan.equals("Y"))
...@@ -6130,7 +6133,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -6130,7 +6133,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pstmtDistDemand.addBatch(); pstmtDistDemand.addBatch();
pstmtIndent.addBatch(); //Commented by manoj dtd 15/03/2014 pstmtIndent.addBatch();
HashMap valueMap = new HashMap(); HashMap valueMap = new HashMap();
valueMap.put("item_code", itemCode); valueMap.put("item_code", itemCode);
valueMap.put("site_code", siteCode); valueMap.put("site_code", siteCode);
...@@ -6212,7 +6215,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -6212,7 +6215,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pstmtIndDemand.addBatch(); pstmtIndDemand.addBatch();
pstmtIndent.addBatch(); //Commented by manoj dtd 15/03/2014 pstmtIndent.addBatch();
HashMap valueMap = new HashMap(); HashMap valueMap = new HashMap();
valueMap.put("item_code", itemCode); valueMap.put("item_code", itemCode);
valueMap.put("site_code", siteCode); valueMap.put("site_code", siteCode);
......
...@@ -386,11 +386,11 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz ...@@ -386,11 +386,11 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
+" FROM sorder,sorditem, item ,customer" +" FROM sorder,sorditem, item ,customer"
+" WHERE ( sorditem.item_code = item.item_code ) and (sorder.sale_order = sorditem.sale_order ) " +" WHERE ( sorditem.item_code = item.item_code ) and (sorder.sale_order = sorditem.sale_order ) "
+" and (case when sorder.confirmed is null then 'N' else sorder.confirmed end = 'Y' ) " +" and (case when sorder.confirmed is null then 'N' else sorder.confirmed end = 'Y' ) "
// +" and (case when sorditem.consume_fc is null then 'Y' else sorditem.consume_fc end = 'N' )" +" and (case when sorditem.consume_fc is null then 'Y' else sorditem.consume_fc end = 'N' )"
+" and sorditem.site_code >= ? AND sorditem.site_code <= ? " +" and sorditem.site_code >= ? AND sorditem.site_code <= ? "
+" and (sorditem.due_date >= ? ) and (sorditem.due_date <= ? ) " +" and (sorditem.due_date >= ? ) and (sorditem.due_date <= ? ) "
+" and ( case when sorder.status is null then 'P' else sorder.status end = 'P')" +" and ( case when sorder.status is null then 'P' else sorder.status end = 'P')"
+" and item.mfg_type = 'O' " //+" and item.mfg_type = 'O' "
+" and (sorder.cust_code = customer.cust_code )"; +" and (sorder.cust_code = customer.cust_code )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCodeFr); pstmt.setString(1,siteCodeFr);
......
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