midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RollupBillOfMaterial & RollupWorkflow: 

* minor refactoring
* minor optimization
This commit is contained in:
teo_sarca 2008-09-25 14:15:14 +00:00
parent 427d02e4a1
commit 496aa7e25f
2 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
base/src/org/eevolution/process/RollupBillOfMaterial.java
View File

@ -104,35 +104,35 @@ public class RollupBillOfMaterial extends SvrProcess
// check if element cost is of Material Type // check if element cost is of Material Type
if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Material)) if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Material))
{ {
BigDecimal Material = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Material , p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Material = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Material, product);
log.info("Material Cost Low Level:" + Material); log.info("Material Cost Low Level:" + Material);
cost.setCurrentCostPriceLL(Material); cost.setCurrentCostPriceLL(Material);
cost.saveEx(); cost.saveEx();
} }
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Resource)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Resource))
{ {
BigDecimal Labor = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Resource, p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Labor = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Resource, product);
log.info("Labor Cost Low Level:" + Labor); log.info("Labor Cost Low Level:" + Labor);
cost.setCurrentCostPriceLL(Labor); cost.setCurrentCostPriceLL(Labor);
cost.saveEx(); cost.saveEx();
} }
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_BurdenMOverhead)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_BurdenMOverhead))
{ {
BigDecimal Burder = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_BurdenMOverhead , p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Burder = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_BurdenMOverhead, product);
log.info("Burden Cost Low Level:" + Burder); log.info("Burden Cost Low Level:" + Burder);
cost.setCurrentCostPriceLL(Burder); cost.setCurrentCostPriceLL(Burder);
cost.saveEx(); cost.saveEx();
} }
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Overhead)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Overhead))
{ {
BigDecimal Overhead = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Overhead , p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Overhead = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Overhead, product);
log.info("Overhead Cost Low Level:" + Overhead); log.info("Overhead Cost Low Level:" + Overhead);
cost.setCurrentCostPriceLL(Overhead); cost.setCurrentCostPriceLL(Overhead);
cost.saveEx(); cost.saveEx();
} }
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_OutsideProcessing)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_OutsideProcessing))
{ {
BigDecimal Subcontract = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_OutsideProcessing , p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Subcontract = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_OutsideProcessing, product);
log.info("Subcontract Cost Low Level:" + Subcontract); log.info("Subcontract Cost Low Level:" + Subcontract);
cost.setCurrentCostPriceLL(Subcontract); cost.setCurrentCostPriceLL(Subcontract);
cost.saveEx(); cost.saveEx();
@ -141,7 +141,7 @@ public class RollupBillOfMaterial extends SvrProcess
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Distribution)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Distribution))
{ {
BigDecimal Distribution = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Distribution , p_AD_Org_ID , M_Product_ID , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Distribution = getCurrentCostPriceLL(MCostElement.COSTELEMENTTYPE_Distribution, M_Product_ID);
cost.setCurrentCostPriceLL(Distribution); cost.setCurrentCostPriceLL(Distribution);
cost.saveEx(); cost.saveEx();
} }
@ -162,12 +162,11 @@ public class RollupBillOfMaterial extends SvrProcess
* @param C_AcctSchema_ID Account Schema * @param C_AcctSchema_ID Account Schema
* @return CurrentCostPriceLL Sum Current Cost Price Level Low for this Cost Element Type * @return CurrentCostPriceLL Sum Current Cost Price Level Low for this Cost Element Type
*/ */
private BigDecimal getCurrentCostPriceLL(String CostElementType, int AD_Org_ID, MProduct product, private BigDecimal getCurrentCostPriceLL(String CostElementType, MProduct product)
int M_CostType_ID, int C_AcctSchema_ID)
{ {
log.info("ElementType: "+CostElementType); log.info("ElementType: "+CostElementType);
BigDecimal costPriceLL = Env.ZERO; BigDecimal costPriceLL = Env.ZERO;
MPPProductPlanning pp = MPPProductPlanning.find(getCtx(), AD_Org_ID, MPPProductPlanning pp = MPPProductPlanning.find(getCtx(), p_AD_Org_ID,
0, // M_Warehouse_ID 0, // M_Warehouse_ID
0, // S_Resource_ID 0, // S_Resource_ID
product.getM_Product_ID(), product.getM_Product_ID(),
@ -175,13 +174,19 @@ public class RollupBillOfMaterial extends SvrProcess
int PP_Product_BOM_ID = 0; int PP_Product_BOM_ID = 0;
if (pp != null) if (pp != null)
{
PP_Product_BOM_ID = pp.getPP_Product_BOM_ID(); PP_Product_BOM_ID = pp.getPP_Product_BOM_ID();
else }
if (PP_Product_BOM_ID < 0)
{
PP_Product_BOM_ID = MPPProductBOM.getBOMSearchKey(getCtx(), product); PP_Product_BOM_ID = MPPProductBOM.getBOMSearchKey(getCtx(), product);
}
if (PP_Product_BOM_ID <= 0) if (PP_Product_BOM_ID <= 0)
{
return Env.ZERO; return Env.ZERO;
}
MPPProductBOM bom = MPPProductBOM.get(getCtx(), PP_Product_BOM_ID); MPPProductBOM bom = MPPProductBOM.get(getCtx(), PP_Product_BOM_ID);
for (MPPProductBOMLine bomline : bom.getLines()) for (MPPProductBOMLine bomline : bom.getLines())
{ {
// get the rate for this resource // get the rate for this resource
@ -219,7 +224,7 @@ public class RollupBillOfMaterial extends SvrProcess
int yield = pp.getYield(); int yield = pp.getYield();
if(yield != 0) if(yield != 0)
{ {
BigDecimal decimalYield = new BigDecimal(yield/100); BigDecimal decimalYield = new BigDecimal(yield / 100);
costPriceLL = costPriceLL.divide(decimalYield, 4 ,BigDecimal.ROUND_HALF_UP); costPriceLL = costPriceLL.divide(decimalYield, 4 ,BigDecimal.ROUND_HALF_UP);
} }
} }
@ -240,11 +245,13 @@ public class RollupBillOfMaterial extends SvrProcess
params.add(lowLevel); params.add(lowLevel);
params.add(MProduct.PRODUCTTYPE_Item); params.add(MProduct.PRODUCTTYPE_Item);
if (p_M_Product_ID > 0) { if (p_M_Product_ID > 0)
{
whereClause.append(" AND M_Product_ID=?"); whereClause.append(" AND M_Product_ID=?");
params.add(p_M_Product_ID); params.add(p_M_Product_ID);
} }
if (p_M_Product_Category_ID > 0){ else if (p_M_Product_Category_ID > 0)
{
whereClause.append(" AND M_Product_Category_ID=?"); whereClause.append(" AND M_Product_Category_ID=?");
params.add(p_M_Product_Category_ID); params.add(p_M_Product_Category_ID);
} }

134
base/src/org/eevolution/process/RollupWorkflow.java
View File

@ -18,14 +18,17 @@
package org.eevolution.process; package org.eevolution.process;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MClient;
import org.compiere.model.MCost; import org.compiere.model.MCost;
import org.compiere.model.MCostElement; import org.compiere.model.MCostElement;
import org.compiere.model.MProduct; import org.compiere.model.MProduct;
import org.compiere.model.MResource;
import org.compiere.model.MUOM; import org.compiere.model.MUOM;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.process.ProcessInfoParameter; import org.compiere.process.ProcessInfoParameter;
@ -84,6 +87,16 @@ public class RollupWorkflow extends SvrProcess
else else
log.log(Level.SEVERE,"prepare - Unknown Parameter: " + name); log.log(Level.SEVERE,"prepare - Unknown Parameter: " + name);
} }
//
if (p_C_AcctSchema_ID <= 0)
{
p_C_AcctSchema_ID = MClient.get(getCtx(), getAD_Client_ID()).getInfo().getC_AcctSchema1_ID();
}
if (p_M_CostType_ID <= 0)
{
MAcctSchema as = MAcctSchema.get(getCtx(), p_C_AcctSchema_ID);
p_M_CostType_ID = as.getM_CostType_ID();
}
} // prepare } // prepare
/** /**
@ -94,15 +107,22 @@ public class RollupWorkflow extends SvrProcess
protected String doIt() throws Exception protected String doIt() throws Exception
{ {
List<Object> params = new ArrayList<Object>(); List<Object> params = new ArrayList<Object>();
StringBuffer whereClause = new StringBuffer("AD_Client_ID=? AND ProductType=?"); StringBuffer whereClause = new StringBuffer("AD_Client_ID=?");
params.add(getAD_Client_ID()); params.add(getAD_Client_ID());
whereClause.append(" AND ").append(MProduct.COLUMNNAME_ProductType).append("=?");
params.add(MProduct.PRODUCTTYPE_Item); params.add(MProduct.PRODUCTTYPE_Item);
if (p_M_Product_ID > 0) { whereClause.append(" AND ").append(MProduct.COLUMNNAME_IsBOM).append("=?");
params.add(true);
if (p_M_Product_ID > 0)
{
whereClause.append(" AND ").append(MProduct.COLUMNNAME_M_Product_ID).append("=?"); whereClause.append(" AND ").append(MProduct.COLUMNNAME_M_Product_ID).append("=?");
params.add(p_M_Product_ID); params.add(p_M_Product_ID);
} }
if (p_M_Product_Category_ID > 0){ else if (p_M_Product_Category_ID > 0)
{
whereClause.append(" AND ").append(MProduct.COLUMNNAME_M_Product_Category_ID).append("=?"); whereClause.append(" AND ").append(MProduct.COLUMNNAME_M_Product_Category_ID).append("=?");
params.add(p_M_Product_Category_ID); params.add(p_M_Product_Category_ID);
} }
@ -121,14 +141,14 @@ public class RollupWorkflow extends SvrProcess
// check if element cost is of type Labor // check if element cost is of type Labor
if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Resource)) if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_Resource))
{ {
BigDecimal Labor = getCost(MCostElement.COSTELEMENTTYPE_Resource , getAD_Client_ID(), p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Labor = getCost(MCostElement.COSTELEMENTTYPE_Resource, p_AD_Org_ID, product);
log.info("Labor : " + Labor); log.info("Labor : " + Labor);
cost.setCurrentCostPrice(Labor); cost.setCurrentCostPrice(Labor);
cost.saveEx(); cost.saveEx();
} }
else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_BurdenMOverhead)) else if (element.getCostElementType().equals(MCostElement.COSTELEMENTTYPE_BurdenMOverhead))
{ {
BigDecimal Burden = getCost(MCostElement.COSTELEMENTTYPE_BurdenMOverhead, getAD_Client_ID() , p_AD_Org_ID , product , p_M_CostType_ID , p_C_AcctSchema_ID); BigDecimal Burden = getCost(MCostElement.COSTELEMENTTYPE_BurdenMOverhead, p_AD_Org_ID, product);
log.info("Burden : " + Burden); log.info("Burden : " + Burden);
cost.setCurrentCostPrice(Burden); cost.setCurrentCostPrice(Burden);
cost.saveEx(); cost.saveEx();
@ -143,79 +163,83 @@ public class RollupWorkflow extends SvrProcess
* Calculate Cost * Calculate Cost
* @param CostElementType Cost Element Type (Labor and Overhead.) * @param CostElementType Cost Element Type (Labor and Overhead.)
* @param AD_Org_ID Organization * @param AD_Org_ID Organization
* @param MProduct Product * @param MProduct product (BOM)
* @param M_CostType_ID Cost Type * @param M_CostType_ID Cost Type
* @param C_AcctSchema_ID Account Schema * @param C_AcctSchema_ID Account Schema
* @return Cost for this Element * @return Cost for this Element
* @throws Exception if not successful * @throws Exception if not successful
*/ */
private BigDecimal getCost(String CostElementType ,int AD_Client_ID , int AD_Org_ID , MProduct product , int M_CostType_ID , int C_AcctSchema_ID) private BigDecimal getCost(String CostElementType, int AD_Org_ID, MProduct product)
{ {
BigDecimal cost = Env.ZERO; MPPProductPlanning pp = MPPProductPlanning.find(getCtx(), AD_Org_ID, 0, 0, product.get_ID(), get_TrxName());
MPPProductPlanning pp = MPPProductPlanning.find(getCtx(), AD_Org_ID , 0 , 0 , product.getM_Product_ID(), get_TrxName()); int AD_Workflow_ID = 0;
int AD_Workflow_ID = 0; if (pp != null)
if(pp != null ) {
AD_Workflow_ID = pp.getAD_Workflow_ID(); AD_Workflow_ID = pp.getAD_Workflow_ID();
else }
if (AD_Workflow_ID <= 0)
{
AD_Workflow_ID = MWorkflow.getWorkflowSearchKey(getCtx(), product); AD_Workflow_ID = MWorkflow.getWorkflowSearchKey(getCtx(), product);
}
if(AD_Workflow_ID <= 0) if(AD_Workflow_ID <= 0)
{
return Env.ZERO; return Env.ZERO;
}
MWorkflow workflow = MWorkflow.get(getCtx(), AD_Workflow_ID); BigDecimal cost = Env.ZERO;
MWFNode[] nodes = workflow.getNodes(false,getAD_Client_ID()); MWorkflow workflow = MWorkflow.get(getCtx(), AD_Workflow_ID);
MWFNode[] nodes = workflow.getNodes(false, getAD_Client_ID());
for (MWFNode node : nodes) for (MWFNode node : nodes)
{ {
BigDecimal rate = getRate(CostElementType, node.getS_Resource_ID(), AD_Org_ID , C_AcctSchema_ID , M_CostType_ID); BigDecimal rate = getResouceRate(CostElementType, node.getS_Resource_ID(), AD_Org_ID);
String sql = "SELECT CASE WHEN ow.DurationUnit = 's' THEN 1 * ( (onode.SetupTime/ow.QtyBatchSize) + onode.Duration ) WHEN ow.DurationUnit = 'm' THEN 60 * ( (onode.SetupTime/ow.QtyBatchSize) + onode.Duration) WHEN ow.DurationUnit = 'h' THEN 3600 * ( (onode.SetupTime/ow.QtyBatchSize) + onode.Duration) WHEN ow.DurationUnit = 'Y' THEN 31536000 * ( (onode.SetupTime/ow.QtyBatchSize) + onode.Duration) WHEN ow.DurationUnit = 'M' THEN 2592000 * ( (onode.SetupTime/ow.QtyBatchSize) + onode.Duration ) WHEN ow.DurationUnit = 'D' THEN 86400 * ((onode.SetupTime/ow.QtyBatchSize) + onode.Duration) END AS load FROM AD_WF_Node onode INNER JOIN AD_Workflow ow ON (ow.AD_Workflow_ID = onode.AD_Workflow_ID) WHERE onode.AD_WF_Node_ID = ? AND onode.AD_Client_ID = ?" ; if (rate.signum() == 0)
int seconds = DB.getSQLValue(get_TrxName(),sql,node.getAD_WF_Node_ID(),node.getAD_Client_ID()); {
continue;
}
int C_UOM_ID = DB.getSQLValue(get_TrxName(),"SELECT C_UOM_ID FROM M_Product WHERE S_Resource_ID = ? " , node.getS_Resource_ID()); int C_UOM_ID = DB.getSQLValue(get_TrxName(),"SELECT C_UOM_ID FROM M_Product WHERE S_Resource_ID = ? " , node.getS_Resource_ID());
MUOM uom = MUOM.get(getCtx(), C_UOM_ID); MUOM uom = MUOM.get(getCtx(), C_UOM_ID);
if (uom.isHour()) if (uom.isHour())
{ {
BigDecimal time = new BigDecimal(seconds); double hours = (node.getSetupTime() / workflow.getQtyBatchSize().doubleValue() + node.getDuration())
cost = cost.add(time.multiply(rate).divide(new BigDecimal(3600),BigDecimal.ROUND_HALF_UP,12)); * workflow.getDurationBaseSec() / 3600;
log.info("Yes isHour" + seconds); BigDecimal nodeCost = new BigDecimal(hours).multiply(rate).setScale(12, RoundingMode.HALF_UP);
log.info("seconds/3600"+ seconds/3600); cost = cost.add(nodeCost);
log.info("time.multiply(rate)"+ time.multiply(rate)); log.info("Node:" + node.getName() + " CostElementType:"+ CostElementType +" Duration(H):" + hours + " rate:" + rate + " NodeCost:" + nodeCost +" =>Cost:"+cost);
log.info("Cost" + cost); }
} else
log.info("Node" + node.getName() + " CostElementType"+ CostElementType +" Duration=" + node.getDuration() + " rate:" + rate + " Cost:" + cost); {
throw new AdempiereException("@NotSupported@ @C_UOM_ID@="+uom.getName());
}
} }
return cost; return cost;
} }
/** /**
* get Rate for this Resource * Get Rate for this Resource
* @param CostElementType Cost Element Type (Labor and Overhead.) * @param CostElementType Cost Element Type (Labor and Overhead.)
* @param S_Resource_ID Respurce * @param S_Resource_ID Resource
* @param AD_Org_ID Organization * @param AD_Org_ID Organization
* @param C_AcctSchema_ID Account Schema
* @param M_CostType_ID Cost Type
* @return Rate for Resource * @return Rate for Resource
* @throws Exception if not successful * @throws Exception if not successful
*/ */
private BigDecimal getRate(String CostElementType , int S_Resource_ID , int AD_Org_ID , int C_AcctSchema_ID ,int M_CostType_ID) private BigDecimal getResouceRate(String CostElementType, int S_Resource_ID, int AD_Org_ID)
{ {
MResource resource = MResource.get(getCtx(), S_Resource_ID); final String sql = "SELECT SUM(c."+MCost.COLUMNNAME_CurrentCostPrice+")"
MProduct product = resource.getProduct(); +" FROM M_Cost c, M_CostElement ce, M_Product p"
MCost[] costs = MCost.getCosts(getCtx() , getAD_Client_ID(), p_AD_Org_ID , product.getM_Product_ID() , p_M_CostType_ID , p_C_AcctSchema_ID , get_TrxName()); +" WHERE c.AD_Client_ID=? AND c.AD_Org_ID=?"
if (costs != null) +" AND c."+MCost.COLUMNNAME_C_AcctSchema_ID+"=?"
{ +" AND c."+MCost.COLUMNNAME_M_CostType_ID+"=?"
BigDecimal rate = Env.ZERO; // Cost Element Type
+" AND ce."+MCostElement.COLUMNNAME_M_CostElement_ID+"=c."+MCost.COLUMNNAME_M_CostElement_ID
for (MCost cost: costs) +" AND ce."+MCostElement.COLUMNNAME_CostElementType+"=?"
{ // Product / Resource
MCostElement element = new MCostElement(getCtx(), cost .getM_CostElement_ID(), get_TrxName()); +" AND p."+MProduct.COLUMNNAME_M_Product_ID+"=c."+MCost.COLUMNNAME_M_Product_ID
// check if element cost is of type Labor +" AND p."+MProduct.COLUMNNAME_S_Resource_ID+"=?"
if (element.getCostElementType().equals(CostElementType)) ;
{ BigDecimal rate = DB.getSQLValueBD(get_TrxName(), sql, getAD_Client_ID(), AD_Org_ID,
rate = rate.add(cost.getCurrentCostPrice()); p_C_AcctSchema_ID, p_M_CostType_ID,
log.info("Org" + AD_Org_ID + "S_Resource" + S_Resource_ID + "C_AcctSchema_ID " + C_AcctSchema_ID); CostElementType, S_Resource_ID);
log.info("Element rate=" + CostElementType + "rate:" + rate); return (rate != null ? rate : Env.ZERO);
}
}
return rate;
}
return Env.ZERO;
} }
} }