Skip to content

Commit

Permalink
#2868 Add precondition method and correct concatenation in logger
Browse files Browse the repository at this point in the history 
#2868 Make BOMValidate process to work correctly in webui
  • Loading branch information
@cristinamghita
cristinamghita committed Nov 22, 2017
1 parent 09b9944 commit dcfb4b4
Showing 1 changed file with 62 additions and 44 deletions.
106 changes: 62 additions & 44 deletions de.metas.business/src/main/java-legacy/org/compiere/process/BOMValidate.java
View file
Expand Up @@ -31,51 +31,37 @@
import org.eevolution.model.I_PP_Product_BOM;

import de.metas.adempiere.model.I_M_Product;
import de.metas.process.IProcessPrecondition;
import de.metas.process.IProcessPreconditionsContext;
import de.metas.process.JavaProcess;
import de.metas.process.ProcessInfoParameter;
import de.metas.process.Param;
import de.metas.process.ProcessPreconditionsResolution;

/**
* Validate BOM
*
*
* @author Jorg Janke
* @version $Id: BOMValidate.java,v 1.3 2006/07/30 00:51:01 jjanke Exp $
*/
public class BOMValidate extends JavaProcess
public class BOMValidate extends JavaProcess implements IProcessPrecondition
{
/** The Product */

@Param(parameterName = "p_M_Product_Category_ID", mandatory = false)
private int p_M_Product_Category_ID;

@Param(parameterName = "IsReValidate", mandatory = true)
private boolean p_IsReValidate;

private int p_M_Product_ID = 0;
/** Product Category */
private int p_M_Product_Category_ID = 0;
/** Re-Validate */
private boolean p_IsReValidate = false;

/** Product */
private MProduct m_product = null;
/** List of Products */
private ArrayList<MProduct> m_products = null;

/**
* Prepare
*/


@Override
protected void prepare ()
{
ProcessInfoParameter[] para = getParametersAsArray();
for (int i = 0; i < para.length; i++)
{
String name = para[i].getParameterName();
if (para[i].getParameter() == null)
;
else if (name.equals("M_Product_Category_ID"))
p_M_Product_Category_ID = para[i].getParameterAsInt();
else if (name.equals("IsReValidate"))
p_IsReValidate = "Y".equals(para[i].getParameter());
else
log.error("Unknown Parameter: " + name);
}


p_M_Product_ID = getM_Product_ID();
} // prepare
}

private int getM_Product_ID()
{
Expand All @@ -93,14 +79,15 @@ else if (I_PP_Product_BOM.Table_Name.equals(tableName))
{
throw new AdempiereException(StringUtils.formatMessage("Table {} has not yet been implemented to support BOM validation.", tableName));
}

}

/**
* Process
* @return Info
* @throws Exception
*/
@Override
protected String doIt() throws Exception
{
if (p_M_Product_ID != 0)
Expand All @@ -116,21 +103,31 @@ protected String doIt() throws Exception
String sql = "SELECT * FROM M_Product "
+ "WHERE IsBOM='Y' AND ";
if (p_M_Product_Category_ID == 0)
{
sql += "AD_Client_ID=? ";
}
else
{
sql += "M_Product_Category_ID=? ";
}
if (!p_IsReValidate)
{
sql += "AND IsVerified<>'Y' ";
}
sql += "ORDER BY Name";
int AD_Client_ID = Env.getAD_Client_ID(getCtx());
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement (sql, null);
if (p_M_Product_Category_ID == 0)
{
pstmt.setInt (1, AD_Client_ID);
}
else
{
pstmt.setInt(1, p_M_Product_Category_ID);
}
rs = pstmt.executeQuery ();
while (rs.next ())
{
Expand All @@ -151,8 +148,8 @@ protected String doIt() throws Exception
return "#" + counter;
} // doIt



/**
* Validate Product
* @param product product
Expand All @@ -161,32 +158,34 @@ protected String doIt() throws Exception
private String validateProduct (MProduct product)
{
if (!product.isBOM())
{
return product.getName() + " @NotValid@ @M_BOM_ID@";
}
m_product = product;

// Check Old Product BOM Structure
log.info(m_product.getName());
m_products = new ArrayList<MProduct>();
m_products = new ArrayList<>();
if (!validateOldProduct (m_product))
{
m_product.setIsVerified(false);
m_product.save();
return m_product.getName() + " @NotValid@";
}

// New Structure
MBOM[] boms = MBOM.getOfProduct(getCtx(), p_M_Product_ID, get_TrxName(), null);
for (int i = 0; i < boms.length; i++)
{
m_products = new ArrayList<MProduct>();
m_products = new ArrayList<>();
if (!validateBOM(boms[i]))
{
m_product.setIsVerified(false);
m_product.save();
return m_product.getName() + " " + boms[i].getName() + " @NotValid@";
}
}

// OK
m_product.setIsVerified(true);
m_product.save();
Expand All @@ -202,11 +201,13 @@ private String validateProduct (MProduct product)
private boolean validateOldProduct (MProduct product)
{
if (!product.isBOM())
{
return true;
}
//
if (m_products.contains(product))
{
log.warn(m_product.getName() + " recursively includes " + product.getName());
log.warn("{} recursively includes {}", m_product.getName(), product.getName());
return false;
}
m_products.add(product);
Expand All @@ -218,9 +219,13 @@ private boolean validateOldProduct (MProduct product)
MProductBOM productsBOM = productsBOMs[i];
MProduct pp = new MProduct(getCtx(), productsBOM.getM_ProductBOM_ID(), get_TrxName());
if (!pp.isBOM())
{
log.trace(pp.getName());
}
else if (!validateOldProduct(pp))
{
return false;
}
}
return true;
} // validateOldProduct
Expand All @@ -238,7 +243,9 @@ private boolean validateBOM (MBOM bom)
MBOMProduct BOMproduct = BOMproducts[i];
MProduct pp = new MProduct(getCtx(), BOMproduct.getM_BOMProduct_ID(), get_TrxName());
if (pp.isBOM())
{
return validateProduct(pp, bom.getBOMType(), bom.getBOMUse());
}
}
return true;
} // validateBOM
Expand All @@ -253,19 +260,21 @@ private boolean validateBOM (MBOM bom)
private boolean validateProduct (MProduct product, String BOMType, String BOMUse)
{
if (!product.isBOM())
{
return true;
}
//
String restriction = "BOMType='" + BOMType + "' AND BOMUse='" + BOMUse + "'";
MBOM[] boms = MBOM.getOfProduct(getCtx(), p_M_Product_ID, get_TrxName(),
restriction);
if (boms.length != 1)
{
log.warn(restriction + " - Length=" + boms.length);
log.warn("{} - Length={}", restriction, boms.length);
return false;
}
if (m_products.contains(product))
{
log.warn(m_product.getName() + " recursively includes " + product.getName());
log.warn("{} recursively includes {}", m_product.getName(), product.getName());
return false;
}
m_products.add(product);
Expand All @@ -278,9 +287,18 @@ private boolean validateProduct (MProduct product, String BOMType, String BOMUse
MBOMProduct BOMproduct = BOMproducts[i];
MProduct pp = new MProduct(getCtx(), BOMproduct.getM_BOMProduct_ID(), get_TrxName());
if (pp.isBOM())
{
return validateProduct(pp, bom.getBOMType(), bom.getBOMUse());
}
}
return true;
} // validateProduct


@Override
public ProcessPreconditionsResolution checkPreconditionsApplicable(IProcessPreconditionsContext context)
{
// TODO Auto-generated method stub
return null;
}

} // BOMValidate

0 comments on commit dcfb4b4

Please sign in to comment.