BF2016936 BOM verification while saving BOM lines not working
This commit is contained in:
parent
d16a1a74e7
commit
5a443d4ee9
|
@ -26,7 +26,7 @@ import org.compiere.model.*;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Order Line Model.
|
* Manufacturing Order Line Model.
|
||||||
* <code>
|
* <code>
|
||||||
* MPPProductBOMLine l = new MPPProductBOMLine(bom);
|
* MPPProductBOMLine l = new MPPProductBOMLine(bom);
|
||||||
l.setM_Product_ID(wbl.getM_Product_ID());
|
l.setM_Product_ID(wbl.getM_Product_ID());
|
||||||
|
@ -42,7 +42,7 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
|
|
||||||
|
|
||||||
static private int AD_Client_ID = 0;
|
static private int AD_Client_ID = 0;
|
||||||
static Hashtable tableproduct = new Hashtable();
|
static Hashtable<Integer, Integer> tableproduct = new Hashtable<Integer, Integer>();
|
||||||
private static CLogger s_log = CLogger.getCLogger (MPPProductBOMLine.class);
|
private static CLogger s_log = CLogger.getCLogger (MPPProductBOMLine.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -54,8 +54,7 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
public MPPProductBOMLine(Properties ctx, int PP_Product_BOMLine,String trxName)
|
public MPPProductBOMLine(Properties ctx, int PP_Product_BOMLine,String trxName)
|
||||||
{
|
{
|
||||||
super (ctx, PP_Product_BOMLine,trxName);
|
super (ctx, PP_Product_BOMLine,trxName);
|
||||||
} // MOrderLine
|
} // MPPProductBOMLine
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parent Constructor.
|
* Parent Constructor.
|
||||||
|
@ -121,15 +120,19 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
} // getDescriptionText
|
} // getDescriptionText
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get low leve of a Product
|
* get low level of a Product
|
||||||
* @param ID Product
|
* @param ID Product
|
||||||
* @return int low level
|
* @return int low level
|
||||||
*/
|
*/
|
||||||
public int getLowLevel(int M_Product_ID)
|
public int getLowLevel(int M_Product_ID) throws Exception
|
||||||
{
|
{
|
||||||
AD_Client_ID = Integer.parseInt(Env.getContext(Env.getCtx(), "#AD_Client_ID"));
|
AD_Client_ID = Integer.valueOf(getCtx().getProperty("#AD_Client_ID"));
|
||||||
tableproduct.clear();
|
tableproduct.clear(); //reset tableproduct cache
|
||||||
DefaultMutableTreeNode ibom = iparent(M_Product_ID,0);
|
DefaultMutableTreeNode ibom = null;
|
||||||
|
|
||||||
|
tableproduct.put(M_Product_ID, 0); //insert parent into cache
|
||||||
|
ibom = iparent(M_Product_ID, 0); //start traversing tree
|
||||||
|
|
||||||
return ibom.getDepth();
|
return ibom.getDepth();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,12 +237,12 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a implotion the a product
|
* get an implotion the product
|
||||||
* @param ID Product
|
* @param ID Product
|
||||||
* @param ID BOM
|
* @param ID BOM
|
||||||
* @return DefaultMutableTreeNode Tree with all parent product
|
* @return DefaultMutableTreeNode Tree with all parent product
|
||||||
*/
|
*/
|
||||||
private DefaultMutableTreeNode iparent(int M_Product_ID , int PP_Product_BOM_ID)
|
private DefaultMutableTreeNode iparent(int M_Product_ID , int PP_Product_BOM_ID) throws Exception
|
||||||
{
|
{
|
||||||
|
|
||||||
DefaultMutableTreeNode parent = new DefaultMutableTreeNode(Integer.toString(M_Product_ID) +"|"+ Integer.toString(PP_Product_BOM_ID));
|
DefaultMutableTreeNode parent = new DefaultMutableTreeNode(Integer.toString(M_Product_ID) +"|"+ Integer.toString(PP_Product_BOM_ID));
|
||||||
|
@ -256,7 +259,13 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
|
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
|
// If not the first bom line at this level
|
||||||
|
if(rs.getRow() > 1)
|
||||||
|
{
|
||||||
|
//need to reset tableproduct cache
|
||||||
|
tableproduct.clear();
|
||||||
|
tableproduct.put(M_Product_ID, PP_Product_BOM_ID); //insert parent into cache
|
||||||
|
}
|
||||||
DefaultMutableTreeNode bom = icomponent(rs.getInt(1), M_Product_ID , parent);
|
DefaultMutableTreeNode bom = icomponent(rs.getInt(1), M_Product_ID , parent);
|
||||||
if (bom != null)
|
if (bom != null)
|
||||||
{
|
{
|
||||||
|
@ -275,18 +284,18 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
s_log.log(Level.SEVERE ,"doIt - " + sql + e);
|
s_log.log(Level.SEVERE, "iparent - " + sql + e);
|
||||||
}
|
}
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get a implotion the a product
|
* get an implotion the product
|
||||||
* @param ID Product
|
* @param ID Product
|
||||||
* @param ID BOM
|
* @param ID BOM
|
||||||
* @return DefaultMutableTreeNode Tree with all parent product
|
* @return DefaultMutableTreeNode Tree with all parent product
|
||||||
*/
|
*/
|
||||||
private DefaultMutableTreeNode icomponent(int PP_Product_BOMLine_ID, int M_Product_ID , DefaultMutableTreeNode bom)
|
private DefaultMutableTreeNode icomponent(int PP_Product_BOMLine_ID, int M_Product_ID , DefaultMutableTreeNode bom) throws Exception
|
||||||
{
|
{
|
||||||
|
|
||||||
String sql = new String("SELECT pbom.M_Product_ID , pbom.Value , pbom.PP_Product_BOM_ID FROM PP_Product_BOMLine pboml INNER JOIN PP_Product_BOM pbom ON (pbom.PP_Product_BOM_ID = pboml.PP_Product_BOM_ID) WHERE pbom.IsActive= 'Y' AND pboml.IsActive= 'Y' AND pboml.AD_Client_ID =? AND pboml.PP_Product_BOMLine_ID = ? ");
|
String sql = new String("SELECT pbom.M_Product_ID , pbom.Value , pbom.PP_Product_BOM_ID FROM PP_Product_BOMLine pboml INNER JOIN PP_Product_BOM pbom ON (pbom.PP_Product_BOM_ID = pboml.PP_Product_BOM_ID) WHERE pbom.IsActive= 'Y' AND pboml.IsActive= 'Y' AND pboml.AD_Client_ID =? AND pboml.PP_Product_BOMLine_ID = ? ");
|
||||||
|
@ -301,19 +310,22 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
{
|
{
|
||||||
if (M_Product_ID != rs.getInt(1))
|
if (M_Product_ID != rs.getInt(1))
|
||||||
{
|
{
|
||||||
|
//BOM Loop Error
|
||||||
if(!tableproduct(rs.getInt(1),rs.getInt(3)))
|
if(!tableproduct(rs.getInt(1),rs.getInt(3)))
|
||||||
bom.add(iparent(rs.getInt(1),rs.getInt(3)));
|
bom.add(iparent(rs.getInt(1),rs.getInt(3)));
|
||||||
else
|
else
|
||||||
s_log.log(Level.SEVERE ,"Cycle BOM & Formula:" + rs.getString(2) + "(" + rs.getString(3) + ")");
|
{
|
||||||
//JOptionPane.showMessageDialog(null,"Cycle BOM & Formula:" + rs.getString(2) + "(" + rs.getString(3) + ")", "Error Cycle BOM" , JOptionPane.ERROR_MESSAGE);
|
s_log.saveError("Error", "Cycle BOM & Formula:" + rs.getString(2) + "(" + rs.getString(3) + ")");
|
||||||
|
throw new Exception(CLogger.retrieveError().toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
JOptionPane.showMessageDialog(null,"Componet will be deactivated for BOM & Formula:" + rs.getString(2) + "(" + rs.getString(3) + ")", "Error Cycle BOM" , JOptionPane.ERROR_MESSAGE);
|
//Child = Parent error
|
||||||
MPPProductBOMLine PP_Product_BOMLine = new MPPProductBOMLine(Env.getCtx(), rs.getInt(3),get_TrxName());
|
X_M_Product product = new X_M_Product(getCtx(), M_Product_ID, null);
|
||||||
PP_Product_BOMLine.setIsActive(false);
|
s_log.saveError("Error", "Cycle BOM & Formula:" + rs.getString(2) + "(" + rs.getString(3) + ") - Component: "
|
||||||
PP_Product_BOMLine.save();
|
+ product.getValue() + "(" + product.getM_Product_ID() + ")");
|
||||||
|
throw new Exception(CLogger.retrieveError().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -321,7 +333,7 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
pstmt.close();
|
pstmt.close();
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (SQLException e)
|
||||||
{
|
{
|
||||||
s_log.log(Level.SEVERE ,"doIt - " + sql + e);
|
s_log.log(Level.SEVERE ,"doIt - " + sql + e);
|
||||||
}
|
}
|
||||||
|
@ -333,32 +345,45 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
|
||||||
* find a product in cache
|
* find a product in cache
|
||||||
* @param ID Product
|
* @param ID Product
|
||||||
* @param ID BOM
|
* @param ID BOM
|
||||||
* @return true if product is find
|
* @return true if product is found
|
||||||
*/
|
*/
|
||||||
private static boolean tableproduct(int M_Product_ID, int PP_Product_BOM_ID)
|
private static boolean tableproduct(int M_Product_ID, int PP_Product_BOM_ID)
|
||||||
{
|
{
|
||||||
Integer p = new Integer(M_Product_ID);
|
Integer p = new Integer(M_Product_ID);
|
||||||
Integer bom = new Integer(PP_Product_BOM_ID);
|
Integer bom = new Integer(PP_Product_BOM_ID);
|
||||||
|
|
||||||
if (!tableproduct.containsKey(p))
|
if (tableproduct.containsKey(p))
|
||||||
{
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
tableproduct.put(p , bom);
|
tableproduct.put(p , bom);
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
else return true;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* Before Save
|
* After Save
|
||||||
* @param newRecord new
|
* @param newRecord new
|
||||||
* @return save
|
* @return save
|
||||||
*/
|
*/
|
||||||
protected boolean afterSave(boolean newRecord, boolean success)
|
protected boolean afterSave(boolean newRecord, boolean success)
|
||||||
|
{
|
||||||
|
if (success)
|
||||||
{
|
{
|
||||||
MProduct product = new MProduct(getCtx(), getM_Product_ID(), get_TrxName());
|
MProduct product = new MProduct(getCtx(), getM_Product_ID(), get_TrxName());
|
||||||
product.set_CustomColumn("LowLevel", getLowLevel(getM_Product_ID()));
|
int lowlevel = 0;
|
||||||
product.save();
|
try
|
||||||
return success;
|
{
|
||||||
|
lowlevel = getLowLevel(getM_Product_ID());
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log.saveError("Error", Msg.parseTranslation(getCtx(), e.getMessage()), false);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
product.setLowLevel(lowlevel); //update lowlevel
|
||||||
|
product.save(get_TrxName());
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue