Skip to content

B
business-java
Commit 88b55e87 authored by prane's avatar prane
Browse files
Options

changes merged 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179497 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2e9983fc
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 39 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ 88b55e87
...@@ -4923,10 +4923,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -4923,10 +4923,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(!isDetailReq) if(!isDetailReq)
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) //if(dueDate.before(stockDate))
{ if(demand != 0 && dueDate.before(stockDate))
//throw new Exception(); {
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); System.out.println("4927>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---demand["+demand+"]");
throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, demand, " ", " "); adpElement.setDemand(dueDate, demand, " ", " ");
...@@ -5022,10 +5023,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5022,10 +5023,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// 10/11/06 // 10/11/06
ADPElement tempADPElement = (ADPElement) adpeList.get(ctr); ADPElement tempADPElement = (ADPElement) adpeList.get(ctr);
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) //if(dueDate.before(stockDate))
if(demand != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("5027>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---demand["+demand+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
tempADPElement.setDemand(dueDate, demand, " ", " "); tempADPElement.setDemand(dueDate, demand, " ", " ");
...@@ -5780,10 +5782,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5780,10 +5782,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(! (adpElement.getDemand() > 0)) //031016 if(! (adpElement.getDemand() > 0)) //031016
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) //if(dueDate.before(stockDate))
if(demand != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("5786>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---demand["+demand+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, bomReplaceDemand, saleOrderReplaceBom,itemCodeTo); adpElement.setDemand(dueDate, bomReplaceDemand, saleOrderReplaceBom,itemCodeTo);
...@@ -6144,10 +6147,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -6144,10 +6147,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//System.out.println("BASE3155---saleOrder---"+saleOrder+"---lineNo---"+lineNo); //System.out.println("BASE3155---saleOrder---"+saleOrder+"---lineNo---"+lineNo);
//System.out.println("BASE@@@@@5142 tempADPElement.getDemand()["+tempADPElement.getDemand()+"]"); //System.out.println("BASE@@@@@5142 tempADPElement.getDemand()["+tempADPElement.getDemand()+"]");
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) //if(dueDate.before(stockDate))
if(demand != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("6153>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---demand["+demand+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
tempADPElement.setDemand(dueDate, demand, saleOrder, lineNo); // comment on 12/01/15 tempADPElement.setDemand(dueDate, demand, saleOrder, lineNo); // comment on 12/01/15
...@@ -6173,10 +6177,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -6173,10 +6177,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
newADPElement.setLineNo(lineNo); newADPElement.setLineNo(lineNo);
//System.out.println("BASE@@@@@5162 newADPElement.getDemand()["+newADPElement.getDemand()+"]"); //System.out.println("BASE@@@@@5162 newADPElement.getDemand()["+newADPElement.getDemand()+"]");
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) //if(dueDate.before(stockDate))
if(demand != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("6183>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---demand["+demand+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
newADPElement.setDemand(dueDate, demand, saleOrder, lineNo); newADPElement.setDemand(dueDate, demand, saleOrder, lineNo);
...@@ -7244,10 +7249,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7244,10 +7249,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if (adpElement.getItemCode().trim().equals(itemCode.trim()) && adpElement.getSiteCode().trim().equals(siteCode.trim())) if (adpElement.getItemCode().trim().equals(itemCode.trim()) && adpElement.getSiteCode().trim().equals(siteCode.trim()))
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7270>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, " ", " "); adpElement.setDemand(dueDate, quantity, " ", " ");
...@@ -7263,10 +7268,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7263,10 +7268,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpElement.setSiteCode(siteCode); adpElement.setSiteCode(siteCode);
adpElement = setAdpeValues(adpElement); adpElement = setAdpeValues(adpElement);
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7289>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, " ", " "); adpElement.setDemand(dueDate, quantity, " ", " ");
...@@ -7800,6 +7805,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7800,6 +7805,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueNode = valueNode.getNextSibling(); valueNode = valueNode.getNextSibling();
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
System.out.println("7825>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
}
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
if (isBomReplace) if (isBomReplace)
{ {
System.out.println("12/06/14 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "]"); System.out.println("12/06/14 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "]");
...@@ -7878,10 +7890,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7878,10 +7890,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(isBomReplace) if(isBomReplace)
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7904>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
}
//throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, " ", " "); adpElement.setDemand(dueDate, quantity, " ", " ");
...@@ -7890,10 +7906,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7890,10 +7906,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
else else
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7920>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); //throw new ITMException(new Exception("dueDate is less than stockDate"));
if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
}
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, saleOrder, itemCode); adpElement.setDemand(dueDate, quantity, saleOrder, itemCode);
...@@ -7929,10 +7949,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7929,10 +7949,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("12/06/14 setting demand 2 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]"); System.out.println("12/06/14 setting demand 2 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]");
} }
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7963>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); //throw new ITMException(new Exception("dueDate is less than stockDate"));
if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
}
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, saleOrder, lineNo); adpElement.setDemand(dueDate, quantity, saleOrder, lineNo);
...@@ -7957,10 +7981,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7957,10 +7981,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(isBomReplace) if(isBomReplace)
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("7995>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, " ", " "); adpElement.setDemand(dueDate, quantity, " ", " ");
...@@ -7968,10 +7992,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7968,10 +7992,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
else else
{ {
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start] //Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(dueDate.before(stockDate)) if(quantity != 0 && dueDate.before(stockDate))
{ {
//throw new Exception(); System.out.println("8006>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
throw new ITMException(new Exception("dueDate is less than stockDate["+dueDate+"]")); throw new ITMException(new Exception("dueDate is less than stockDate"));
} }
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End] //Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
newADPElement.setDemand(dueDate, quantity, saleOrder, lineNo); newADPElement.setDemand(dueDate, quantity, saleOrder, lineNo);
...@@ -12739,6 +12763,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -12739,6 +12763,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
} }
//Changed by Pavan R on 19/JAN/2K18[End] //Changed by Pavan R on 19/JAN/2K18[End]
// if(flag) // if(flag)
// { // {
row.getCell(0).setCellValue(siteCode); row.getCell(0).setCellValue(siteCode);
......
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