Skip to content

B
business-java
Commit 008a7c9d authored by prane's avatar prane
Browse files
Options

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185921... 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185921 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6ce46cc5
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 6 deletions
webitm-mfg/ibase/webitm/ejb/mfg/ExplodeBom.java
View file @ 008a7c9d
......@@ -464,7 +464,8 @@ public class ExplodeBom
valueXmlString.append("<item_code>").append("<![CDATA[").append(itemCodeBomDet).append("]]>").append("</item_code>");
valueXmlString.append("<item_Ref>").append("<![CDATA[").append(itemRef).append("]]>").append("</item_Ref>");
valueXmlString.append("<quantity_Ref>").append("<![CDATA[").append(sQuantity).append("]]>").append("</quantity_Ref>"); //add by rajendra
valueXmlString.append("<quantity>").append("<![CDATA[").append(quantityUpdate).append("]]>").append("</quantity>"); //add by rajendra
//valueXmlString.append("<quantity>").append("<![CDATA[").append(quantityUpdate).append("]]>").append("</quantity>"); //add by rajendra
valueXmlString.append("<quantity>").append("<![CDATA[").append( getRequiredDecimal(quantityUpdate, 3) ).append("]]>").append("</quantity>"); //add by Pavan R on 4jun18
// 24/12/07 manoharan for supp_sour = 'P'
//if ( lineTypeInner.equals("B") )
//{
......@@ -719,6 +720,18 @@ public class ExplodeBom
}
return valueXmlString.toString();
}
public String getRequiredDecimal(double actVal, int prec)//Added by Pavan R on 04jun18
{
String fmtStr = "############0";
String strValue = null;
if (prec > 0)
{
fmtStr = fmtStr + "." + "000000000".substring(0, prec);
}
DecimalFormat decFormat = new DecimalFormat(fmtStr);
System.out.println("getRequiredDecimal---["+actVal+"]");
return decFormat.format(actVal);
}
private String decFormat(double num)
{
NumberFormat nf = new DecimalFormat("##############0.000");
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ 008a7c9d
......@@ -7847,6 +7847,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
if (nodeName.equals("quantity"))
{
//Pavan R 2jun18
quantity = Double.parseDouble(nodeValue);
}
if (nodeName.equals("line_type"))
......@@ -7863,6 +7864,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueNode = valueNode.getNextSibling();
}
System.out.println("7866 from xmlStringitemCode["+itemCode+"]siteCode["+siteCode+"]quantity["+quantity+"]dueDate["+dueDate+"]");
//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)
......@@ -7931,6 +7933,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpeList.add(adpElementN);
}
}*/
if("TPBP0104".equals(itemCode.trim())){
System.out.println(" find--index["+index+"]isDetailReq["+isDetailReq+"]isBomReplace["+isBomReplace+"]");
}
if (index != -1)
{
adpElement = (ADPElement) adpeList.get(index);
......@@ -7970,11 +7976,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
else
{
if("TPBP0104".equals(itemCode.trim()))
{
System.out.println("quantity["+quantity+"]dueDate["+dueDate+"]stockDate["+stockDate+"]dateFrom["+dateFrom+"]");
}
//Added by Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[Start]
if(quantity != 0 && dueDate.before(stockDate))
{
System.out.println("7920>>>DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
//throw new ITMException(new Exception("dueDate is less than stockDate"));
if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
......@@ -7986,6 +7995,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//System.out.println("BASE6459--adpElement.getTimeMrpList().size()"+adpElement.getTimeMrpList().size());
adpeList.set(index, adpElement);
if("TPBP0104".equals(itemCode.trim()))
{
System.out.println("###adpeList["+adpeList+"]");
}
/*ADPElement newADPElement = new ADPElement();
newADPElement.setSiteCode(siteCode);
newADPElement.setItemCode(itemCode);
......@@ -8004,6 +8017,19 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
else
{
//added by Pavan R on 4jun18 start item not set while inserted in xmlString from bom explode()
if(quantity != 0 && dueDate.before(stockDate))
{
System.out.println("8022---->>item_code["+itemCode+"]DueDate["+dueDate+"]----stockDate:["+stockDate+"]---quantity["+quantity+"]");
//throw new ITMException(new Exception("dueDate is less than stockDate"));
if (dueDate.compareTo(dateFrom) < 0)
{
dueDate = dateFrom;
}
}
//added by Pavan R on 4jun18 end
//Pavan R on 2k18-JAN-29 to check where dueDate is less than stockDate[End]
adpElement.setDemand(dueDate, quantity, saleOrder, itemCode);
//Commented by Pavan R 27-apr-18 to check duplicate item in adpelement
/*
if (saleOrder == null || saleOrder.trim().length() == 0 || !"M".equals(adpElement.getSuppSour()))
......@@ -12607,7 +12633,16 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double reqVal = Double.parseDouble(strValue);
return reqVal;
}*/
public double getRequiredDecimal(double actVal, int prec, int x) // this metod added by rajesh k to change number format
{
NumberFormat numberFormat = NumberFormat.getIntegerInstance ();
Double DoubleValue = new Double (actVal);
numberFormat.setMaximumFractionDigits(prec);
String strValue = numberFormat.format(DoubleValue);
strValue = strValue.replaceAll(",","");
double reqVal = Double.parseDouble(strValue);
return reqVal;
}
public String getRequiredDecimal(double actVal, int prec)//Added by chandrashekar on 11-08-14
{
String fmtStr = "############0";
......
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