diff --git a/base/src/org/eevolution/model/CalloutMRP.java b/base/src/org/eevolution/model/CalloutMRP.java index f20471bc77..000a700aae 100644 --- a/base/src/org/eevolution/model/CalloutMRP.java +++ b/base/src/org/eevolution/model/CalloutMRP.java @@ -107,13 +107,14 @@ public class CalloutMRP extends CalloutEngine if (IsSOTrx) { - mrp.setType("D"); - mrp.setTypeMRP("SOO"); + mrp.setOrderType(MPPMRP.ORDERTYPE_SalesOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Demand); } else { - mrp.setType("S"); + mrp.setOrderType(MPPMRP.ORDERTYPE_MaterialRequisition); mrp.setTypeMRP("POO"); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); } mrp.save(); } @@ -200,8 +201,8 @@ public class CalloutMRP extends CalloutEngine mrp.setM_Product_ID(M_Product_ID); mrp.setM_Warehouse_ID(M_Warehouse_ID); //mrp.setS_Resource_ID(); - mrp.setType("S"); - mrp.setTypeMRP("MOP"); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); + mrp.setOrderType(MPPMRP.ORDERTYPE_ManufacturingOrder); mrp.save(); } @@ -288,8 +289,8 @@ public class CalloutMRP extends CalloutEngine mrp.setM_Product_ID(M_Product_ID); mrp.setM_Warehouse_ID(M_Warehouse_ID); //mrp.setS_Resource_ID(); - mrp.setType("D"); - mrp.setTypeMRP("MOP"); + mrp.setOrderType(MPPMRP.TYPEMRP_Demand); + mrp.setOrderType(MPPMRP.ORDERTYPE_ManufacturingOrder); mrp.save(); } diff --git a/base/src/org/eevolution/model/I_C_TaxBase.java b/base/src/org/eevolution/model/I_C_TaxBase.java index e504a509c9..bdfbc46c20 100644 --- a/base/src/org/eevolution/model/I_C_TaxBase.java +++ b/base/src/org/eevolution/model/I_C_TaxBase.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for C_TaxBase * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_C_TaxBase { diff --git a/base/src/org/eevolution/model/I_C_TaxDefinition.java b/base/src/org/eevolution/model/I_C_TaxDefinition.java index cad988056a..9d99acd4c0 100644 --- a/base/src/org/eevolution/model/I_C_TaxDefinition.java +++ b/base/src/org/eevolution/model/I_C_TaxDefinition.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for C_TaxDefinition * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_C_TaxDefinition { diff --git a/base/src/org/eevolution/model/I_C_TaxGroup.java b/base/src/org/eevolution/model/I_C_TaxGroup.java index e243133d08..44c8398b98 100644 --- a/base/src/org/eevolution/model/I_C_TaxGroup.java +++ b/base/src/org/eevolution/model/I_C_TaxGroup.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for C_TaxGroup * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_C_TaxGroup { diff --git a/base/src/org/eevolution/model/I_C_TaxType.java b/base/src/org/eevolution/model/I_C_TaxType.java index 26f302f8ca..5ca9071b67 100644 --- a/base/src/org/eevolution/model/I_C_TaxType.java +++ b/base/src/org/eevolution/model/I_C_TaxType.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for C_TaxType * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_C_TaxType { diff --git a/base/src/org/eevolution/model/I_DD_NetworkDistribution.java b/base/src/org/eevolution/model/I_DD_NetworkDistribution.java index afb138482b..46a238b9c1 100644 --- a/base/src/org/eevolution/model/I_DD_NetworkDistribution.java +++ b/base/src/org/eevolution/model/I_DD_NetworkDistribution.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for DD_NetworkDistribution * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_DD_NetworkDistribution { diff --git a/base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java b/base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java index a9cbb2353c..d1aaaadcb2 100644 --- a/base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java +++ b/base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for DD_NetworkDistributionLine * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_DD_NetworkDistributionLine { diff --git a/base/src/org/eevolution/model/I_DD_Order.java b/base/src/org/eevolution/model/I_DD_Order.java index 775d0b1153..603a99f08f 100644 --- a/base/src/org/eevolution/model/I_DD_Order.java +++ b/base/src/org/eevolution/model/I_DD_Order.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for DD_Order * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_DD_Order { diff --git a/base/src/org/eevolution/model/I_DD_OrderLine.java b/base/src/org/eevolution/model/I_DD_OrderLine.java index 39c3f54e56..3079f19613 100644 --- a/base/src/org/eevolution/model/I_DD_OrderLine.java +++ b/base/src/org/eevolution/model/I_DD_OrderLine.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for DD_OrderLine * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_DD_OrderLine { diff --git a/base/src/org/eevolution/model/I_EXP_Format.java b/base/src/org/eevolution/model/I_EXP_Format.java index dee407976c..09c4ef632a 100644 --- a/base/src/org/eevolution/model/I_EXP_Format.java +++ b/base/src/org/eevolution/model/I_EXP_Format.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for EXP_Format * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_EXP_Format { diff --git a/base/src/org/eevolution/model/I_EXP_FormatLine.java b/base/src/org/eevolution/model/I_EXP_FormatLine.java index 4fc3c4aa9e..56757a0ffd 100644 --- a/base/src/org/eevolution/model/I_EXP_FormatLine.java +++ b/base/src/org/eevolution/model/I_EXP_FormatLine.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for EXP_FormatLine * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_EXP_FormatLine { diff --git a/base/src/org/eevolution/model/I_EXP_Processor.java b/base/src/org/eevolution/model/I_EXP_Processor.java index f9e1fe803f..9018ec50af 100644 --- a/base/src/org/eevolution/model/I_EXP_Processor.java +++ b/base/src/org/eevolution/model/I_EXP_Processor.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for EXP_Processor * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_EXP_Processor { diff --git a/base/src/org/eevolution/model/I_EXP_ProcessorParameter.java b/base/src/org/eevolution/model/I_EXP_ProcessorParameter.java index 6b687b398b..17a7e22255 100644 --- a/base/src/org/eevolution/model/I_EXP_ProcessorParameter.java +++ b/base/src/org/eevolution/model/I_EXP_ProcessorParameter.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for EXP_ProcessorParameter * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_EXP_ProcessorParameter { diff --git a/base/src/org/eevolution/model/I_EXP_Processor_Type.java b/base/src/org/eevolution/model/I_EXP_Processor_Type.java index f7b72b179d..3137b0126d 100644 --- a/base/src/org/eevolution/model/I_EXP_Processor_Type.java +++ b/base/src/org/eevolution/model/I_EXP_Processor_Type.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for EXP_Processor_Type * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_EXP_Processor_Type { diff --git a/base/src/org/eevolution/model/I_HR_Attribute.java b/base/src/org/eevolution/model/I_HR_Attribute.java index 5319ac4c86..9c6e42bbea 100644 --- a/base/src/org/eevolution/model/I_HR_Attribute.java +++ b/base/src/org/eevolution/model/I_HR_Attribute.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Attribute * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Attribute { diff --git a/base/src/org/eevolution/model/I_HR_Concept.java b/base/src/org/eevolution/model/I_HR_Concept.java index 3f98d175a2..de93a0187b 100644 --- a/base/src/org/eevolution/model/I_HR_Concept.java +++ b/base/src/org/eevolution/model/I_HR_Concept.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Concept * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Concept { diff --git a/base/src/org/eevolution/model/I_HR_Concept_Acct.java b/base/src/org/eevolution/model/I_HR_Concept_Acct.java index 0bb3d9da98..08e54b3d86 100644 --- a/base/src/org/eevolution/model/I_HR_Concept_Acct.java +++ b/base/src/org/eevolution/model/I_HR_Concept_Acct.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Concept_Acct * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Concept_Acct { diff --git a/base/src/org/eevolution/model/I_HR_Concept_Category.java b/base/src/org/eevolution/model/I_HR_Concept_Category.java index 123cb459f5..c2278978ff 100644 --- a/base/src/org/eevolution/model/I_HR_Concept_Category.java +++ b/base/src/org/eevolution/model/I_HR_Concept_Category.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Concept_Category * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Concept_Category { diff --git a/base/src/org/eevolution/model/I_HR_Contract.java b/base/src/org/eevolution/model/I_HR_Contract.java index 4dd4d255c6..46ab133507 100644 --- a/base/src/org/eevolution/model/I_HR_Contract.java +++ b/base/src/org/eevolution/model/I_HR_Contract.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Contract * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Contract { diff --git a/base/src/org/eevolution/model/I_HR_Department.java b/base/src/org/eevolution/model/I_HR_Department.java index 59d6d4abc0..dd300940d1 100644 --- a/base/src/org/eevolution/model/I_HR_Department.java +++ b/base/src/org/eevolution/model/I_HR_Department.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Department * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Department { diff --git a/base/src/org/eevolution/model/I_HR_Employee.java b/base/src/org/eevolution/model/I_HR_Employee.java index eb47d1a276..38a97c9847 100644 --- a/base/src/org/eevolution/model/I_HR_Employee.java +++ b/base/src/org/eevolution/model/I_HR_Employee.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Employee * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Employee { diff --git a/base/src/org/eevolution/model/I_HR_Job.java b/base/src/org/eevolution/model/I_HR_Job.java index b2a4e13007..5687eced16 100644 --- a/base/src/org/eevolution/model/I_HR_Job.java +++ b/base/src/org/eevolution/model/I_HR_Job.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Job * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Job { diff --git a/base/src/org/eevolution/model/I_HR_List.java b/base/src/org/eevolution/model/I_HR_List.java index a4d3c12367..d5842989e3 100644 --- a/base/src/org/eevolution/model/I_HR_List.java +++ b/base/src/org/eevolution/model/I_HR_List.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_List * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_List { diff --git a/base/src/org/eevolution/model/I_HR_ListLine.java b/base/src/org/eevolution/model/I_HR_ListLine.java index b80d78f34a..fe87f4fc1b 100644 --- a/base/src/org/eevolution/model/I_HR_ListLine.java +++ b/base/src/org/eevolution/model/I_HR_ListLine.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_ListLine * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_ListLine { diff --git a/base/src/org/eevolution/model/I_HR_ListType.java b/base/src/org/eevolution/model/I_HR_ListType.java index f6eebb6343..73992d40e2 100644 --- a/base/src/org/eevolution/model/I_HR_ListType.java +++ b/base/src/org/eevolution/model/I_HR_ListType.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_ListType * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_ListType { diff --git a/base/src/org/eevolution/model/I_HR_ListVersion.java b/base/src/org/eevolution/model/I_HR_ListVersion.java index 64b66e56be..a3af1840ec 100644 --- a/base/src/org/eevolution/model/I_HR_ListVersion.java +++ b/base/src/org/eevolution/model/I_HR_ListVersion.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_ListVersion * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_ListVersion { diff --git a/base/src/org/eevolution/model/I_HR_Movement.java b/base/src/org/eevolution/model/I_HR_Movement.java index 2e090dac21..488f04ed2f 100644 --- a/base/src/org/eevolution/model/I_HR_Movement.java +++ b/base/src/org/eevolution/model/I_HR_Movement.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Movement * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Movement { diff --git a/base/src/org/eevolution/model/I_HR_Payroll.java b/base/src/org/eevolution/model/I_HR_Payroll.java index 91f2f8b12f..7f57766fc1 100644 --- a/base/src/org/eevolution/model/I_HR_Payroll.java +++ b/base/src/org/eevolution/model/I_HR_Payroll.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Payroll * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Payroll { diff --git a/base/src/org/eevolution/model/I_HR_PayrollConcept.java b/base/src/org/eevolution/model/I_HR_PayrollConcept.java index 95c2bada5e..23ecfe137f 100644 --- a/base/src/org/eevolution/model/I_HR_PayrollConcept.java +++ b/base/src/org/eevolution/model/I_HR_PayrollConcept.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_PayrollConcept * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_PayrollConcept { diff --git a/base/src/org/eevolution/model/I_HR_Period.java b/base/src/org/eevolution/model/I_HR_Period.java index e646114ca4..3db47a97d3 100644 --- a/base/src/org/eevolution/model/I_HR_Period.java +++ b/base/src/org/eevolution/model/I_HR_Period.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Period * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Period { diff --git a/base/src/org/eevolution/model/I_HR_Process.java b/base/src/org/eevolution/model/I_HR_Process.java index c47f71d1b1..2cd96cac32 100644 --- a/base/src/org/eevolution/model/I_HR_Process.java +++ b/base/src/org/eevolution/model/I_HR_Process.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Process * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Process { diff --git a/base/src/org/eevolution/model/I_HR_Year.java b/base/src/org/eevolution/model/I_HR_Year.java index c1517ec26f..a53bd80b7d 100644 --- a/base/src/org/eevolution/model/I_HR_Year.java +++ b/base/src/org/eevolution/model/I_HR_Year.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for HR_Year * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_HR_Year { diff --git a/base/src/org/eevolution/model/I_IMP_Processor.java b/base/src/org/eevolution/model/I_IMP_Processor.java index 75883f0c17..775a7e0797 100644 --- a/base/src/org/eevolution/model/I_IMP_Processor.java +++ b/base/src/org/eevolution/model/I_IMP_Processor.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for IMP_Processor * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_IMP_Processor { diff --git a/base/src/org/eevolution/model/I_IMP_ProcessorLog.java b/base/src/org/eevolution/model/I_IMP_ProcessorLog.java index ab59946716..84efea4547 100644 --- a/base/src/org/eevolution/model/I_IMP_ProcessorLog.java +++ b/base/src/org/eevolution/model/I_IMP_ProcessorLog.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for IMP_ProcessorLog * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_IMP_ProcessorLog { diff --git a/base/src/org/eevolution/model/I_IMP_ProcessorParameter.java b/base/src/org/eevolution/model/I_IMP_ProcessorParameter.java index d04d0c3dd4..bc106c51b2 100644 --- a/base/src/org/eevolution/model/I_IMP_ProcessorParameter.java +++ b/base/src/org/eevolution/model/I_IMP_ProcessorParameter.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for IMP_ProcessorParameter * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_IMP_ProcessorParameter { diff --git a/base/src/org/eevolution/model/I_IMP_Processor_Type.java b/base/src/org/eevolution/model/I_IMP_Processor_Type.java index 042043faa3..a180669ced 100644 --- a/base/src/org/eevolution/model/I_IMP_Processor_Type.java +++ b/base/src/org/eevolution/model/I_IMP_Processor_Type.java @@ -38,7 +38,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for IMP_Processor_Type * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_IMP_Processor_Type { diff --git a/base/src/org/eevolution/model/I_PP_Cost_Collector.java b/base/src/org/eevolution/model/I_PP_Cost_Collector.java index b8bd19297e..02a5a01455 100644 --- a/base/src/org/eevolution/model/I_PP_Cost_Collector.java +++ b/base/src/org/eevolution/model/I_PP_Cost_Collector.java @@ -116,19 +116,6 @@ public interface I_PP_Cost_Collector public I_C_Campaign getC_Campaign() throws Exception; - /** Column name C_DocTypeTarget_ID */ - public static final String COLUMNNAME_C_DocTypeTarget_ID = "C_DocTypeTarget_ID"; - - /** Set Target Document Type. - * Target document type for conversing documents - */ - public void setC_DocTypeTarget_ID (int C_DocTypeTarget_ID); - - /** Get Target Document Type. - * Target document type for conversing documents - */ - public int getC_DocTypeTarget_ID(); - /** Column name C_DocType_ID */ public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID"; @@ -142,6 +129,19 @@ public interface I_PP_Cost_Collector */ public int getC_DocType_ID(); + /** Column name C_DocTypeTarget_ID */ + public static final String COLUMNNAME_C_DocTypeTarget_ID = "C_DocTypeTarget_ID"; + + /** Set Target Document Type. + * Target document type for conversing documents + */ + public void setC_DocTypeTarget_ID (int C_DocTypeTarget_ID); + + /** Get Target Document Type. + * Target document type for conversing documents + */ + public int getC_DocTypeTarget_ID(); + /** Column name C_Project_ID */ public static final String COLUMNNAME_C_Project_ID = "C_Project_ID"; @@ -268,36 +268,6 @@ public interface I_PP_Cost_Collector */ public int getM_Locator_ID(); - /** Column name M_Product_ID */ - public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; - - /** Set Product. - * Product, Service, Item - */ - public void setM_Product_ID (int M_Product_ID); - - /** Get Product. - * Product, Service, Item - */ - public int getM_Product_ID(); - - public I_M_Product getM_Product() throws Exception; - - /** Column name M_Warehouse_ID */ - public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID"; - - /** Set Warehouse. - * Storage Warehouse and Service Point - */ - public void setM_Warehouse_ID (int M_Warehouse_ID); - - /** Get Warehouse. - * Storage Warehouse and Service Point - */ - public int getM_Warehouse_ID(); - - public I_M_Warehouse getM_Warehouse() throws Exception; - /** Column name MovementDate */ public static final String COLUMNNAME_MovementDate = "MovementDate"; @@ -337,6 +307,49 @@ public interface I_PP_Cost_Collector */ public String getMovementType(); + /** Column name M_Product_ID */ + public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; + + /** Set Product. + * Product, Service, Item + */ + public void setM_Product_ID (int M_Product_ID); + + /** Get Product. + * Product, Service, Item + */ + public int getM_Product_ID(); + + public I_M_Product getM_Product() throws Exception; + + /** Column name M_Warehouse_ID */ + public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID"; + + /** Set Warehouse. + * Storage Warehouse and Service Point + */ + public void setM_Warehouse_ID (int M_Warehouse_ID); + + /** Get Warehouse. + * Storage Warehouse and Service Point + */ + public int getM_Warehouse_ID(); + + public I_M_Warehouse getM_Warehouse() throws Exception; + + /** Column name Posted */ + public static final String COLUMNNAME_Posted = "Posted"; + + /** Set Posted. + * Posting status + */ + public void setPosted (boolean Posted); + + /** Get Posted. + * Posting status + */ + public boolean isPosted(); + /** Column name PP_Cost_Collector_ID */ public static final String COLUMNNAME_PP_Cost_Collector_ID = "PP_Cost_Collector_ID"; @@ -390,19 +403,6 @@ public interface I_PP_Cost_Collector public org.eevolution.model.I_PP_Order_Workflow getPP_Order_Workflow() throws Exception; - /** Column name Posted */ - public static final String COLUMNNAME_Posted = "Posted"; - - /** Set Posted. - * Posting status - */ - public void setPosted (boolean Posted); - - /** Get Posted. - * Posting status - */ - public boolean isPosted(); - /** Column name Processed */ public static final String COLUMNNAME_Processed = "Processed"; @@ -447,21 +447,6 @@ public interface I_PP_Cost_Collector */ public int getReversal_ID(); - /** Column name S_Resource_ID */ - public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; - - /** Set Resource. - * Resource - */ - public void setS_Resource_ID (int S_Resource_ID); - - /** Get Resource. - * Resource - */ - public int getS_Resource_ID(); - - public I_S_Resource getS_Resource() throws Exception; - /** Column name ScrappedQty */ public static final String COLUMNNAME_ScrappedQty = "ScrappedQty"; @@ -484,6 +469,21 @@ public interface I_PP_Cost_Collector /** Get SetupTimeReal */ public BigDecimal getSetupTimeReal(); + /** Column name S_Resource_ID */ + public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; + + /** Set Resource. + * Resource + */ + public void setS_Resource_ID (int S_Resource_ID); + + /** Get Resource. + * Resource + */ + public int getS_Resource_ID(); + + public I_S_Resource getS_Resource() throws Exception; + /** Column name User1_ID */ public static final String COLUMNNAME_User1_ID = "User1_ID"; diff --git a/base/src/org/eevolution/model/I_PP_MRP.java b/base/src/org/eevolution/model/I_PP_MRP.java index bd44a98121..8384106ab4 100644 --- a/base/src/org/eevolution/model/I_PP_MRP.java +++ b/base/src/org/eevolution/model/I_PP_MRP.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for PP_MRP * @author Trifon Trifonov (generated) - * @version Release 3.5.0 + * @version Release 3.5.1a */ public interface I_PP_MRP { @@ -73,21 +73,6 @@ public interface I_PP_MRP public I_C_BPartner getC_BPartner() throws Exception; - /** Column name C_OrderLine_ID */ - public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID"; - - /** Set Sales Order Line. - * Sales Order Line - */ - public void setC_OrderLine_ID (int C_OrderLine_ID); - - /** Get Sales Order Line. - * Sales Order Line - */ - public int getC_OrderLine_ID(); - - public I_C_OrderLine getC_OrderLine() throws Exception; - /** Column name C_Order_ID */ public static final String COLUMNNAME_C_Order_ID = "C_Order_ID"; @@ -103,27 +88,20 @@ public interface I_PP_MRP public I_C_Order getC_Order() throws Exception; - /** Column name DD_OrderLine_ID */ - public static final String COLUMNNAME_DD_OrderLine_ID = "DD_OrderLine_ID"; + /** Column name C_OrderLine_ID */ + public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID"; - /** Set Distribution Order Line */ - public void setDD_OrderLine_ID (int DD_OrderLine_ID); + /** Set Sales Order Line. + * Sales Order Line + */ + public void setC_OrderLine_ID (int C_OrderLine_ID); - /** Get Distribution Order Line */ - public int getDD_OrderLine_ID(); + /** Get Sales Order Line. + * Sales Order Line + */ + public int getC_OrderLine_ID(); - public org.eevolution.model.I_DD_OrderLine getDD_OrderLine() throws Exception; - - /** Column name DD_Order_ID */ - public static final String COLUMNNAME_DD_Order_ID = "DD_Order_ID"; - - /** Set Distribution Order */ - public void setDD_Order_ID (int DD_Order_ID); - - /** Get Distribution Order */ - public int getDD_Order_ID(); - - public org.eevolution.model.I_DD_Order getDD_Order() throws Exception; + public I_C_OrderLine getC_OrderLine() throws Exception; /** Column name DateConfirm */ public static final String COLUMNNAME_DateConfirm = "DateConfirm"; @@ -196,6 +174,28 @@ public interface I_PP_MRP /** Get DateStartSchedule */ public Timestamp getDateStartSchedule(); + /** Column name DD_Order_ID */ + public static final String COLUMNNAME_DD_Order_ID = "DD_Order_ID"; + + /** Set Distribution Order */ + public void setDD_Order_ID (int DD_Order_ID); + + /** Get Distribution Order */ + public int getDD_Order_ID(); + + public org.eevolution.model.I_DD_Order getDD_Order() throws Exception; + + /** Column name DD_OrderLine_ID */ + public static final String COLUMNNAME_DD_OrderLine_ID = "DD_OrderLine_ID"; + + /** Set Distribution Order Line */ + public void setDD_OrderLine_ID (int DD_OrderLine_ID); + + /** Get Distribution Order Line */ + public int getDD_OrderLine_ID(); + + public org.eevolution.model.I_DD_OrderLine getDD_OrderLine() throws Exception; + /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -235,21 +235,6 @@ public interface I_PP_MRP */ public boolean isAvailable(); - /** Column name M_ForecastLine_ID */ - public static final String COLUMNNAME_M_ForecastLine_ID = "M_ForecastLine_ID"; - - /** Set Forecast Line. - * Forecast Line - */ - public void setM_ForecastLine_ID (int M_ForecastLine_ID); - - /** Get Forecast Line. - * Forecast Line - */ - public int getM_ForecastLine_ID(); - - public I_M_ForecastLine getM_ForecastLine() throws Exception; - /** Column name M_Forecast_ID */ public static final String COLUMNNAME_M_Forecast_ID = "M_Forecast_ID"; @@ -265,6 +250,21 @@ public interface I_PP_MRP public I_M_Forecast getM_Forecast() throws Exception; + /** Column name M_ForecastLine_ID */ + public static final String COLUMNNAME_M_ForecastLine_ID = "M_ForecastLine_ID"; + + /** Set Forecast Line. + * Forecast Line + */ + public void setM_ForecastLine_ID (int M_ForecastLine_ID); + + /** Get Forecast Line. + * Forecast Line + */ + public int getM_ForecastLine_ID(); + + public I_M_ForecastLine getM_ForecastLine() throws Exception; + /** Column name M_Product_ID */ public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; @@ -280,21 +280,6 @@ public interface I_PP_MRP public I_M_Product getM_Product() throws Exception; - /** Column name M_RequisitionLine_ID */ - public static final String COLUMNNAME_M_RequisitionLine_ID = "M_RequisitionLine_ID"; - - /** Set Requisition Line. - * Material Requisition Line - */ - public void setM_RequisitionLine_ID (int M_RequisitionLine_ID); - - /** Get Requisition Line. - * Material Requisition Line - */ - public int getM_RequisitionLine_ID(); - - public I_M_RequisitionLine getM_RequisitionLine() throws Exception; - /** Column name M_Requisition_ID */ public static final String COLUMNNAME_M_Requisition_ID = "M_Requisition_ID"; @@ -310,6 +295,21 @@ public interface I_PP_MRP public I_M_Requisition getM_Requisition() throws Exception; + /** Column name M_RequisitionLine_ID */ + public static final String COLUMNNAME_M_RequisitionLine_ID = "M_RequisitionLine_ID"; + + /** Set Requisition Line. + * Material Requisition Line + */ + public void setM_RequisitionLine_ID (int M_RequisitionLine_ID); + + /** Get Requisition Line. + * Material Requisition Line + */ + public int getM_RequisitionLine_ID(); + + public I_M_RequisitionLine getM_RequisitionLine() throws Exception; + /** Column name M_Warehouse_ID */ public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID"; @@ -338,6 +338,24 @@ public interface I_PP_MRP */ public String getName(); + /** Column name OrderType */ + public static final String COLUMNNAME_OrderType = "OrderType"; + + /** Set OrderType */ + public void setOrderType (String OrderType); + + /** Get OrderType */ + public String getOrderType(); + + /** Column name Planner_ID */ + public static final String COLUMNNAME_Planner_ID = "Planner_ID"; + + /** Set Planner */ + public void setPlanner_ID (int Planner_ID); + + /** Get Planner */ + public int getPlanner_ID(); + /** Column name PP_MRP_ID */ public static final String COLUMNNAME_PP_MRP_ID = "PP_MRP_ID"; @@ -369,15 +387,6 @@ public interface I_PP_MRP public org.eevolution.model.I_PP_Order getPP_Order() throws Exception; - /** Column name Planner_ID */ - public static final String COLUMNNAME_Planner_ID = "Planner_ID"; - - /** Set Planner */ - public void setPlanner_ID (int Planner_ID); - - /** Get Planner */ - public int getPlanner_ID(); - /** Column name Priority */ public static final String COLUMNNAME_Priority = "Priority"; @@ -419,19 +428,6 @@ public interface I_PP_MRP public I_S_Resource getS_Resource() throws Exception; - /** Column name Type */ - public static final String COLUMNNAME_Type = "Type"; - - /** Set Type. - * Type of Validation (SQL, Java Script, Java Language) - */ - public void setType (String Type); - - /** Get Type. - * Type of Validation (SQL, Java Script, Java Language) - */ - public String getType(); - /** Column name TypeMRP */ public static final String COLUMNNAME_TypeMRP = "TypeMRP"; diff --git a/base/src/org/eevolution/model/I_PP_Order.java b/base/src/org/eevolution/model/I_PP_Order.java index b7326f40d5..110ccb3134 100644 --- a/base/src/org/eevolution/model/I_PP_Order.java +++ b/base/src/org/eevolution/model/I_PP_Order.java @@ -129,6 +129,19 @@ public interface I_PP_Order public I_C_Campaign getC_Campaign() throws Exception; + /** Column name C_DocType_ID */ + public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID"; + + /** Set Document Type. + * Document type or rules + */ + public void setC_DocType_ID (int C_DocType_ID); + + /** Get Document Type. + * Document type or rules + */ + public int getC_DocType_ID(); + /** Column name C_DocTypeTarget_ID */ public static final String COLUMNNAME_C_DocTypeTarget_ID = "C_DocTypeTarget_ID"; @@ -142,18 +155,18 @@ public interface I_PP_Order */ public int getC_DocTypeTarget_ID(); - /** Column name C_DocType_ID */ - public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID"; + /** Column name CopyFrom */ + public static final String COLUMNNAME_CopyFrom = "CopyFrom"; - /** Set Document Type. - * Document type or rules + /** Set Copy From. + * Copy From Record */ - public void setC_DocType_ID (int C_DocType_ID); + public void setCopyFrom (String CopyFrom); - /** Get Document Type. - * Document type or rules + /** Get Copy From. + * Copy From Record */ - public int getC_DocType_ID(); + public String getCopyFrom(); /** Column name C_OrderLine_ID */ public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID"; @@ -200,19 +213,6 @@ public interface I_PP_Order public I_C_UOM getC_UOM() throws Exception; - /** Column name CopyFrom */ - public static final String COLUMNNAME_CopyFrom = "CopyFrom"; - - /** Set Copy From. - * Copy From Record - */ - public void setCopyFrom (String CopyFrom); - - /** Get Copy From. - * Copy From Record - */ - public String getCopyFrom(); - /** Column name DateConfirm */ public static final String COLUMNNAME_DateConfirm = "DateConfirm"; @@ -410,6 +410,15 @@ public interface I_PP_Order */ public boolean isQtyPercentage(); + /** Column name IsSelected */ + public static final String COLUMNNAME_IsSelected = "IsSelected"; + + /** Set Selected */ + public void setIsSelected (boolean IsSelected); + + /** Get Selected */ + public boolean isSelected(); + /** Column name IsSOTrx */ public static final String COLUMNNAME_IsSOTrx = "IsSOTrx"; @@ -423,15 +432,6 @@ public interface I_PP_Order */ public boolean isSOTrx(); - /** Column name IsSelected */ - public static final String COLUMNNAME_IsSelected = "IsSelected"; - - /** Set Selected */ - public void setIsSelected (boolean IsSelected); - - /** Get Selected */ - public boolean isSelected(); - /** Column name Line */ public static final String COLUMNNAME_Line = "Line"; @@ -510,6 +510,28 @@ public interface I_PP_Order /** Get OrderType */ public String getOrderType(); + /** Column name Planner_ID */ + public static final String COLUMNNAME_Planner_ID = "Planner_ID"; + + /** Set Planner */ + public void setPlanner_ID (int Planner_ID); + + /** Get Planner */ + public int getPlanner_ID(); + + /** Column name Posted */ + public static final String COLUMNNAME_Posted = "Posted"; + + /** Set Posted. + * Posting status + */ + public void setPosted (boolean Posted); + + /** Get Posted. + * Posting status + */ + public boolean isPosted(); + /** Column name PP_Order_ID */ public static final String COLUMNNAME_PP_Order_ID = "PP_Order_ID"; @@ -534,28 +556,6 @@ public interface I_PP_Order public org.eevolution.model.I_PP_Product_BOM getPP_Product_BOM() throws Exception; - /** Column name Planner_ID */ - public static final String COLUMNNAME_Planner_ID = "Planner_ID"; - - /** Set Planner */ - public void setPlanner_ID (int Planner_ID); - - /** Get Planner */ - public int getPlanner_ID(); - - /** Column name Posted */ - public static final String COLUMNNAME_Posted = "Posted"; - - /** Set Posted. - * Posting status - */ - public void setPosted (boolean Posted); - - /** Get Posted. - * Posting status - */ - public boolean isPosted(); - /** Column name PriorityRule */ public static final String COLUMNNAME_PriorityRule = "PriorityRule"; @@ -591,15 +591,6 @@ public interface I_PP_Order /** Get Process Now */ public boolean isProcessing(); - /** Column name QtyBatchSize */ - public static final String COLUMNNAME_QtyBatchSize = "QtyBatchSize"; - - /** Set QtyBatchSize */ - public void setQtyBatchSize (BigDecimal QtyBatchSize); - - /** Get QtyBatchSize */ - public BigDecimal getQtyBatchSize(); - /** Column name QtyBatchs */ public static final String COLUMNNAME_QtyBatchs = "QtyBatchs"; @@ -609,6 +600,15 @@ public interface I_PP_Order /** Get QtyBatchs */ public BigDecimal getQtyBatchs(); + /** Column name QtyBatchSize */ + public static final String COLUMNNAME_QtyBatchSize = "QtyBatchSize"; + + /** Set QtyBatchSize */ + public void setQtyBatchSize (BigDecimal QtyBatchSize); + + /** Get QtyBatchSize */ + public BigDecimal getQtyBatchSize(); + /** Column name QtyDelivered */ public static final String COLUMNNAME_QtyDelivered = "QtyDelivered"; @@ -679,21 +679,6 @@ public interface I_PP_Order /** Get QtyScrap */ public BigDecimal getQtyScrap(); - /** Column name S_Resource_ID */ - public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; - - /** Set Resource. - * Resource - */ - public void setS_Resource_ID (int S_Resource_ID); - - /** Get Resource. - * Resource - */ - public int getS_Resource_ID(); - - public I_S_Resource getS_Resource() throws Exception; - /** Column name ScheduleType */ public static final String COLUMNNAME_ScheduleType = "ScheduleType"; @@ -720,6 +705,21 @@ public interface I_PP_Order */ public String getSerNo(); + /** Column name S_Resource_ID */ + public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; + + /** Set Resource. + * Resource + */ + public void setS_Resource_ID (int S_Resource_ID); + + /** Get Resource. + * Resource + */ + public int getS_Resource_ID(); + + public I_S_Resource getS_Resource() throws Exception; + /** Column name User1_ID */ public static final String COLUMNNAME_User1_ID = "User1_ID"; diff --git a/base/src/org/eevolution/model/I_PP_Order_BOM.java b/base/src/org/eevolution/model/I_PP_Order_BOM.java index 64fc1e4bac..de24f3f321 100644 --- a/base/src/org/eevolution/model/I_PP_Order_BOM.java +++ b/base/src/org/eevolution/model/I_PP_Order_BOM.java @@ -84,6 +84,19 @@ public interface I_PP_Order_BOM */ public String getBOMUse(); + /** Column name CopyFrom */ + public static final String COLUMNNAME_CopyFrom = "CopyFrom"; + + /** Set Copy From. + * Copy From Record + */ + public void setCopyFrom (String CopyFrom); + + /** Get Copy From. + * Copy From Record + */ + public String getCopyFrom(); + /** Column name C_UOM_ID */ public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID"; @@ -99,19 +112,6 @@ public interface I_PP_Order_BOM public I_C_UOM getC_UOM() throws Exception; - /** Column name CopyFrom */ - public static final String COLUMNNAME_CopyFrom = "CopyFrom"; - - /** Set Copy From. - * Copy From Record - */ - public void setCopyFrom (String CopyFrom); - - /** Get Copy From. - * Copy From Record - */ - public String getCopyFrom(); - /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; diff --git a/base/src/org/eevolution/model/I_PP_Order_BOMLine.java b/base/src/org/eevolution/model/I_PP_Order_BOMLine.java index 41e1b67802..1a466f2df3 100644 --- a/base/src/org/eevolution/model/I_PP_Order_BOMLine.java +++ b/base/src/org/eevolution/model/I_PP_Order_BOMLine.java @@ -97,6 +97,19 @@ public interface I_PP_Order_BOMLine */ public String getBackflushGroup(); + /** Column name ComponentType */ + public static final String COLUMNNAME_ComponentType = "ComponentType"; + + /** Set Component Type. + * Component Type for a Bill of Material or Formula + */ + public void setComponentType (String ComponentType); + + /** Get Component Type. + * Component Type for a Bill of Material or Formula + */ + public String getComponentType(); + /** Column name C_UOM_ID */ public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID"; @@ -112,19 +125,6 @@ public interface I_PP_Order_BOMLine public I_C_UOM getC_UOM() throws Exception; - /** Column name ComponentType */ - public static final String COLUMNNAME_ComponentType = "ComponentType"; - - /** Set Component Type. - * Component Type for a Bill of Material or Formula - */ - public void setComponentType (String ComponentType); - - /** Get Component Type. - * Component Type for a Bill of Material or Formula - */ - public String getComponentType(); - /** Column name DateDelivered */ public static final String COLUMNNAME_DateDelivered = "DateDelivered"; @@ -326,15 +326,6 @@ public interface I_PP_Order_BOMLine public I_M_Warehouse getM_Warehouse() throws Exception; - /** Column name PP_Order_BOMLine_ID */ - public static final String COLUMNNAME_PP_Order_BOMLine_ID = "PP_Order_BOMLine_ID"; - - /** Set PP_Order_BOMLine_ID */ - public void setPP_Order_BOMLine_ID (int PP_Order_BOMLine_ID); - - /** Get PP_Order_BOMLine_ID */ - public int getPP_Order_BOMLine_ID(); - /** Column name PP_Order_BOM_ID */ public static final String COLUMNNAME_PP_Order_BOM_ID = "PP_Order_BOM_ID"; @@ -346,6 +337,15 @@ public interface I_PP_Order_BOMLine public org.eevolution.model.I_PP_Order_BOM getPP_Order_BOM() throws Exception; + /** Column name PP_Order_BOMLine_ID */ + public static final String COLUMNNAME_PP_Order_BOMLine_ID = "PP_Order_BOMLine_ID"; + + /** Set PP_Order_BOMLine_ID */ + public void setPP_Order_BOMLine_ID (int PP_Order_BOMLine_ID); + + /** Get PP_Order_BOMLine_ID */ + public int getPP_Order_BOMLine_ID(); + /** Column name PP_Order_ID */ public static final String COLUMNNAME_PP_Order_ID = "PP_Order_ID"; @@ -357,19 +357,6 @@ public interface I_PP_Order_BOMLine public org.eevolution.model.I_PP_Order getPP_Order() throws Exception; - /** Column name QtyBOM */ - public static final String COLUMNNAME_QtyBOM = "QtyBOM"; - - /** Set Quantity. - * Indicate the Quantity use in this BOM - */ - public void setQtyBOM (BigDecimal QtyBOM); - - /** Get Quantity. - * Indicate the Quantity use in this BOM - */ - public BigDecimal getQtyBOM(); - /** Column name QtyBatch */ public static final String COLUMNNAME_QtyBatch = "QtyBatch"; @@ -383,6 +370,19 @@ public interface I_PP_Order_BOMLine */ public BigDecimal getQtyBatch(); + /** Column name QtyBOM */ + public static final String COLUMNNAME_QtyBOM = "QtyBOM"; + + /** Set Quantity. + * Indicate the Quantity use in this BOM + */ + public void setQtyBOM (BigDecimal QtyBOM); + + /** Get Quantity. + * Indicate the Quantity use in this BOM + */ + public BigDecimal getQtyBOM(); + /** Column name QtyDelivered */ public static final String COLUMNNAME_QtyDelivered = "QtyDelivered"; diff --git a/base/src/org/eevolution/model/I_PP_Order_BOMLineMA.java b/base/src/org/eevolution/model/I_PP_Order_BOMLineMA.java index a6f59397d6..f4c1783504 100644 --- a/base/src/org/eevolution/model/I_PP_Order_BOMLineMA.java +++ b/base/src/org/eevolution/model/I_PP_Order_BOMLineMA.java @@ -83,15 +83,6 @@ public interface I_PP_Order_BOMLineMA */ public BigDecimal getMovementQty(); - /** Column name PP_Order_BOMLineMA_ID */ - public static final String COLUMNNAME_PP_Order_BOMLineMA_ID = "PP_Order_BOMLineMA_ID"; - - /** Set PP_Order_BOMLineMA_ID */ - public void setPP_Order_BOMLineMA_ID (int PP_Order_BOMLineMA_ID); - - /** Get PP_Order_BOMLineMA_ID */ - public int getPP_Order_BOMLineMA_ID(); - /** Column name PP_Order_BOMLine_ID */ public static final String COLUMNNAME_PP_Order_BOMLine_ID = "PP_Order_BOMLine_ID"; @@ -102,4 +93,13 @@ public interface I_PP_Order_BOMLineMA public int getPP_Order_BOMLine_ID(); public org.eevolution.model.I_PP_Order_BOMLine getPP_Order_BOMLine() throws Exception; + + /** Column name PP_Order_BOMLineMA_ID */ + public static final String COLUMNNAME_PP_Order_BOMLineMA_ID = "PP_Order_BOMLineMA_ID"; + + /** Set PP_Order_BOMLineMA_ID */ + public void setPP_Order_BOMLineMA_ID (int PP_Order_BOMLineMA_ID); + + /** Get PP_Order_BOMLineMA_ID */ + public int getPP_Order_BOMLineMA_ID(); } diff --git a/base/src/org/eevolution/model/I_PP_Order_Node.java b/base/src/org/eevolution/model/I_PP_Order_Node.java index 6e6f830c07..32b11dc302 100644 --- a/base/src/org/eevolution/model/I_PP_Order_Node.java +++ b/base/src/org/eevolution/model/I_PP_Order_Node.java @@ -58,6 +58,19 @@ public interface I_PP_Order_Node /** Load Meta Data */ + /** Column name Action */ + public static final String COLUMNNAME_Action = "Action"; + + /** Set Action. + * Indicates the Action to be performed + */ + public void setAction (String Action); + + /** Get Action. + * Indicates the Action to be performed + */ + public String getAction(); + /** Column name AD_Column_ID */ public static final String COLUMNNAME_AD_Column_ID = "AD_Column_ID"; @@ -208,19 +221,6 @@ public interface I_PP_Order_Node public I_AD_Workflow getAD_Workflow() throws Exception; - /** Column name Action */ - public static final String COLUMNNAME_Action = "Action"; - - /** Set Action. - * Indicates the Action to be performed - */ - public void setAction (String Action); - - /** Get Action. - * Indicates the Action to be performed - */ - public String getAction(); - /** Column name AttributeName */ public static final String COLUMNNAME_AttributeName = "AttributeName"; @@ -607,21 +607,6 @@ public interface I_PP_Order_Node /** Get QueuingTime */ public int getQueuingTime(); - /** Column name S_Resource_ID */ - public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; - - /** Set Resource. - * Resource - */ - public void setS_Resource_ID (int S_Resource_ID); - - /** Get Resource. - * Resource - */ - public int getS_Resource_ID(); - - public I_S_Resource getS_Resource() throws Exception; - /** Column name SetupTime */ public static final String COLUMNNAME_SetupTime = "SetupTime"; @@ -666,6 +651,21 @@ public interface I_PP_Order_Node */ public String getSplitElement(); + /** Column name S_Resource_ID */ + public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; + + /** Set Resource. + * Resource + */ + public void setS_Resource_ID (int S_Resource_ID); + + /** Get Resource. + * Resource + */ + public int getS_Resource_ID(); + + public I_S_Resource getS_Resource() throws Exception; + /** Column name StartMode */ public static final String COLUMNNAME_StartMode = "StartMode"; diff --git a/base/src/org/eevolution/model/I_PP_Order_NodeNext.java b/base/src/org/eevolution/model/I_PP_Order_NodeNext.java index cdf33e05f3..1f959b0643 100644 --- a/base/src/org/eevolution/model/I_PP_Order_NodeNext.java +++ b/base/src/org/eevolution/model/I_PP_Order_NodeNext.java @@ -146,15 +146,6 @@ public interface I_PP_Order_NodeNext /** Get PP_Order_Next_ID */ public int getPP_Order_Next_ID(); - /** Column name PP_Order_NodeNext_ID */ - public static final String COLUMNNAME_PP_Order_NodeNext_ID = "PP_Order_NodeNext_ID"; - - /** Set PP_Order_NodeNext_ID */ - public void setPP_Order_NodeNext_ID (int PP_Order_NodeNext_ID); - - /** Get PP_Order_NodeNext_ID */ - public int getPP_Order_NodeNext_ID(); - /** Column name PP_Order_Node_ID */ public static final String COLUMNNAME_PP_Order_Node_ID = "PP_Order_Node_ID"; @@ -166,6 +157,15 @@ public interface I_PP_Order_NodeNext public org.eevolution.model.I_PP_Order_Node getPP_Order_Node() throws Exception; + /** Column name PP_Order_NodeNext_ID */ + public static final String COLUMNNAME_PP_Order_NodeNext_ID = "PP_Order_NodeNext_ID"; + + /** Set PP_Order_NodeNext_ID */ + public void setPP_Order_NodeNext_ID (int PP_Order_NodeNext_ID); + + /** Get PP_Order_NodeNext_ID */ + public int getPP_Order_NodeNext_ID(); + /** Column name SeqNo */ public static final String COLUMNNAME_SeqNo = "SeqNo"; diff --git a/base/src/org/eevolution/model/I_PP_Order_Workflow.java b/base/src/org/eevolution/model/I_PP_Order_Workflow.java index 6560cac205..051ac0d500 100644 --- a/base/src/org/eevolution/model/I_PP_Order_Workflow.java +++ b/base/src/org/eevolution/model/I_PP_Order_Workflow.java @@ -58,6 +58,19 @@ public interface I_PP_Order_Workflow /** Load Meta Data */ + /** Column name AccessLevel */ + public static final String COLUMNNAME_AccessLevel = "AccessLevel"; + + /** Set Data Access Level. + * Access Level required + */ + public void setAccessLevel (String AccessLevel); + + /** Get Data Access Level. + * Access Level required + */ + public String getAccessLevel(); + /** Column name AD_Table_ID */ public static final String COLUMNNAME_AD_Table_ID = "AD_Table_ID"; @@ -103,21 +116,6 @@ public interface I_PP_Order_Workflow public I_AD_WF_Responsible getAD_WF_Responsible() throws Exception; - /** Column name AD_WorkflowProcessor_ID */ - public static final String COLUMNNAME_AD_WorkflowProcessor_ID = "AD_WorkflowProcessor_ID"; - - /** Set Workflow Processor. - * Workflow Processor Server - */ - public void setAD_WorkflowProcessor_ID (int AD_WorkflowProcessor_ID); - - /** Get Workflow Processor. - * Workflow Processor Server - */ - public int getAD_WorkflowProcessor_ID(); - - public I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws Exception; - /** Column name AD_Workflow_ID */ public static final String COLUMNNAME_AD_Workflow_ID = "AD_Workflow_ID"; @@ -133,18 +131,20 @@ public interface I_PP_Order_Workflow public I_AD_Workflow getAD_Workflow() throws Exception; - /** Column name AccessLevel */ - public static final String COLUMNNAME_AccessLevel = "AccessLevel"; + /** Column name AD_WorkflowProcessor_ID */ + public static final String COLUMNNAME_AD_WorkflowProcessor_ID = "AD_WorkflowProcessor_ID"; - /** Set Data Access Level. - * Access Level required + /** Set Workflow Processor. + * Workflow Processor Server */ - public void setAccessLevel (String AccessLevel); + public void setAD_WorkflowProcessor_ID (int AD_WorkflowProcessor_ID); - /** Get Data Access Level. - * Access Level required + /** Get Workflow Processor. + * Workflow Processor Server */ - public String getAccessLevel(); + public int getAD_WorkflowProcessor_ID(); + + public I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws Exception; /** Column name Author */ public static final String COLUMNNAME_Author = "Author"; @@ -384,6 +384,19 @@ public interface I_PP_Order_Workflow /** Get QueuingTime */ public int getQueuingTime(); + /** Column name SetupTime */ + public static final String COLUMNNAME_SetupTime = "SetupTime"; + + /** Set Setup Time. + * Setup time before starting Production + */ + public void setSetupTime (int SetupTime); + + /** Get Setup Time. + * Setup time before starting Production + */ + public int getSetupTime(); + /** Column name S_Resource_ID */ public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; @@ -399,18 +412,14 @@ public interface I_PP_Order_Workflow public I_S_Resource getS_Resource() throws Exception; - /** Column name SetupTime */ - public static final String COLUMNNAME_SetupTime = "SetupTime"; + /** Column name ValidateWorkflow */ + public static final String COLUMNNAME_ValidateWorkflow = "ValidateWorkflow"; - /** Set Setup Time. - * Setup time before starting Production - */ - public void setSetupTime (int SetupTime); + /** Set Validate Workflow */ + public void setValidateWorkflow (String ValidateWorkflow); - /** Get Setup Time. - * Setup time before starting Production - */ - public int getSetupTime(); + /** Get Validate Workflow */ + public String getValidateWorkflow(); /** Column name ValidFrom */ public static final String COLUMNNAME_ValidFrom = "ValidFrom"; @@ -438,15 +447,6 @@ public interface I_PP_Order_Workflow */ public Timestamp getValidTo(); - /** Column name ValidateWorkflow */ - public static final String COLUMNNAME_ValidateWorkflow = "ValidateWorkflow"; - - /** Set Validate Workflow */ - public void setValidateWorkflow (String ValidateWorkflow); - - /** Get Validate Workflow */ - public String getValidateWorkflow(); - /** Column name Value */ public static final String COLUMNNAME_Value = "Value"; diff --git a/base/src/org/eevolution/model/I_PP_Product_BOM.java b/base/src/org/eevolution/model/I_PP_Product_BOM.java index d1bbaceca8..2c546415b5 100644 --- a/base/src/org/eevolution/model/I_PP_Product_BOM.java +++ b/base/src/org/eevolution/model/I_PP_Product_BOM.java @@ -58,6 +58,19 @@ public interface I_PP_Product_BOM /** Load Meta Data */ + /** Column name Amt */ + public static final String COLUMNNAME_Amt = "Amt"; + + /** Set Amount. + * Amount + */ + public void setAmt (BigDecimal Amt); + + /** Get Amount. + * Amount + */ + public BigDecimal getAmt(); + /** Column name BOMType */ public static final String COLUMNNAME_BOMType = "BOMType"; @@ -84,6 +97,32 @@ public interface I_PP_Product_BOM */ public String getBOMUse(); + /** Column name CopyFrom */ + public static final String COLUMNNAME_CopyFrom = "CopyFrom"; + + /** Set Copy From. + * Copy From Record + */ + public void setCopyFrom (String CopyFrom); + + /** Get Copy From. + * Copy From Record + */ + public String getCopyFrom(); + + /** Column name Cost */ + public static final String COLUMNNAME_Cost = "Cost"; + + /** Set Cost. + * Cost information + */ + public void setCost (BigDecimal Cost); + + /** Get Cost. + * Cost information + */ + public BigDecimal getCost(); + /** Column name C_UOM_ID */ public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID"; @@ -99,19 +138,6 @@ public interface I_PP_Product_BOM public I_C_UOM getC_UOM() throws Exception; - /** Column name CopyFrom */ - public static final String COLUMNNAME_CopyFrom = "CopyFrom"; - - /** Set Copy From. - * Copy From Record - */ - public void setCopyFrom (String CopyFrom); - - /** Get Copy From. - * Copy From Record - */ - public String getCopyFrom(); - /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -151,6 +177,19 @@ public interface I_PP_Product_BOM */ public String getHelp(); + /** Column name Margin */ + public static final String COLUMNNAME_Margin = "Margin"; + + /** Set Margin %. + * Margin for a product as a percentage + */ + public void setMargin (BigDecimal Margin); + + /** Get Margin %. + * Margin for a product as a percentage + */ + public BigDecimal getMargin(); + /** Column name M_AttributeSetInstance_ID */ public static final String COLUMNNAME_M_AttributeSetInstance_ID = "M_AttributeSetInstance_ID"; @@ -179,6 +218,21 @@ public interface I_PP_Product_BOM public I_M_ChangeNotice getM_ChangeNotice() throws Exception; + /** Column name M_PriceList_Version_ID */ + public static final String COLUMNNAME_M_PriceList_Version_ID = "M_PriceList_Version_ID"; + + /** Set Price List Version. + * Identifies a unique instance of a Price List + */ + public void setM_PriceList_Version_ID (int M_PriceList_Version_ID); + + /** Get Price List Version. + * Identifies a unique instance of a Price List + */ + public int getM_PriceList_Version_ID(); + + public I_M_PriceList_Version getM_PriceList_Version() throws Exception; + /** Column name M_Product_ID */ public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; @@ -220,6 +274,19 @@ public interface I_PP_Product_BOM */ public int getPP_Product_BOM_ID(); + /** Column name Price */ + public static final String COLUMNNAME_Price = "Price"; + + /** Set Price. + * Price + */ + public void setPrice (BigDecimal Price); + + /** Get Price. + * Price + */ + public BigDecimal getPrice(); + /** Column name Processing */ public static final String COLUMNNAME_Processing = "Processing"; diff --git a/base/src/org/eevolution/model/I_PP_Product_BOMLine.java b/base/src/org/eevolution/model/I_PP_Product_BOMLine.java index 51c02a0aca..6202e58368 100644 --- a/base/src/org/eevolution/model/I_PP_Product_BOMLine.java +++ b/base/src/org/eevolution/model/I_PP_Product_BOMLine.java @@ -84,6 +84,19 @@ public interface I_PP_Product_BOMLine */ public String getBackflushGroup(); + /** Column name ComponentType */ + public static final String COLUMNNAME_ComponentType = "ComponentType"; + + /** Set Component Type. + * Component Type for a Bill of Material or Formula + */ + public void setComponentType (String ComponentType); + + /** Get Component Type. + * Component Type for a Bill of Material or Formula + */ + public String getComponentType(); + /** Column name C_UOM_ID */ public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID"; @@ -99,19 +112,6 @@ public interface I_PP_Product_BOMLine public I_C_UOM getC_UOM() throws Exception; - /** Column name ComponentType */ - public static final String COLUMNNAME_ComponentType = "ComponentType"; - - /** Set Component Type. - * Component Type for a Bill of Material or Formula - */ - public void setComponentType (String ComponentType); - - /** Get Component Type. - * Component Type for a Bill of Material or Formula - */ - public String getComponentType(); - /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -272,19 +272,6 @@ public interface I_PP_Product_BOMLine public I_M_Product getM_Product() throws Exception; - /** Column name PP_Product_BOMLine_ID */ - public static final String COLUMNNAME_PP_Product_BOMLine_ID = "PP_Product_BOMLine_ID"; - - /** Set BOM Line. - * BOM Line - */ - public void setPP_Product_BOMLine_ID (int PP_Product_BOMLine_ID); - - /** Get BOM Line. - * BOM Line - */ - public int getPP_Product_BOMLine_ID(); - /** Column name PP_Product_BOM_ID */ public static final String COLUMNNAME_PP_Product_BOM_ID = "PP_Product_BOM_ID"; @@ -300,18 +287,18 @@ public interface I_PP_Product_BOMLine public org.eevolution.model.I_PP_Product_BOM getPP_Product_BOM() throws Exception; - /** Column name QtyBOM */ - public static final String COLUMNNAME_QtyBOM = "QtyBOM"; + /** Column name PP_Product_BOMLine_ID */ + public static final String COLUMNNAME_PP_Product_BOMLine_ID = "PP_Product_BOMLine_ID"; - /** Set Quantity. - * Indicate the Quantity use in this BOM + /** Set BOM Line. + * BOM Line */ - public void setQtyBOM (BigDecimal QtyBOM); + public void setPP_Product_BOMLine_ID (int PP_Product_BOMLine_ID); - /** Get Quantity. - * Indicate the Quantity use in this BOM + /** Get BOM Line. + * BOM Line */ - public BigDecimal getQtyBOM(); + public int getPP_Product_BOMLine_ID(); /** Column name QtyBatch */ public static final String COLUMNNAME_QtyBatch = "QtyBatch"; @@ -326,6 +313,19 @@ public interface I_PP_Product_BOMLine */ public BigDecimal getQtyBatch(); + /** Column name QtyBOM */ + public static final String COLUMNNAME_QtyBOM = "QtyBOM"; + + /** Set Quantity. + * Indicate the Quantity use in this BOM + */ + public void setQtyBOM (BigDecimal QtyBOM); + + /** Get Quantity. + * Indicate the Quantity use in this BOM + */ + public BigDecimal getQtyBOM(); + /** Column name Scrap */ public static final String COLUMNNAME_Scrap = "Scrap"; @@ -364,4 +364,17 @@ public interface I_PP_Product_BOMLine * Valid to including this date (last day) */ public Timestamp getValidTo(); + + /** Column name Value */ + public static final String COLUMNNAME_Value = "Value"; + + /** Set Search Key. + * Search key for the record in the format required - must be unique + */ + public void setValue (String Value); + + /** Get Search Key. + * Search key for the record in the format required - must be unique + */ + public String getValue(); } diff --git a/base/src/org/eevolution/model/I_PP_Product_Planning.java b/base/src/org/eevolution/model/I_PP_Product_Planning.java index 45ac06a8fd..3afc801db9 100644 --- a/base/src/org/eevolution/model/I_PP_Product_Planning.java +++ b/base/src/org/eevolution/model/I_PP_Product_Planning.java @@ -246,6 +246,15 @@ public interface I_PP_Product_Planning /** Get Order Qty */ public BigDecimal getOrder_Qty(); + /** Column name Planner_ID */ + public static final String COLUMNNAME_Planner_ID = "Planner_ID"; + + /** Set Planner */ + public void setPlanner_ID (int Planner_ID); + + /** Get Planner */ + public int getPlanner_ID(); + /** Column name PP_Product_BOM_ID */ public static final String COLUMNNAME_PP_Product_BOM_ID = "PP_Product_BOM_ID"; @@ -270,14 +279,18 @@ public interface I_PP_Product_Planning /** Get PP_Product_Planning_ID */ public int getPP_Product_Planning_ID(); - /** Column name Planner_ID */ - public static final String COLUMNNAME_Planner_ID = "Planner_ID"; + /** Column name SafetyStock */ + public static final String COLUMNNAME_SafetyStock = "SafetyStock"; - /** Set Planner */ - public void setPlanner_ID (int Planner_ID); + /** Set Safety Stock Qty. + * Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs + */ + public void setSafetyStock (BigDecimal SafetyStock); - /** Get Planner */ - public int getPlanner_ID(); + /** Get Safety Stock Qty. + * Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs + */ + public BigDecimal getSafetyStock(); /** Column name S_Resource_ID */ public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID"; @@ -294,19 +307,6 @@ public interface I_PP_Product_Planning public I_S_Resource getS_Resource() throws Exception; - /** Column name SafetyStock */ - public static final String COLUMNNAME_SafetyStock = "SafetyStock"; - - /** Set Safety Stock Qty. - * Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs - */ - public void setSafetyStock (BigDecimal SafetyStock); - - /** Get Safety Stock Qty. - * Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs - */ - public BigDecimal getSafetyStock(); - /** Column name TimeFence */ public static final String COLUMNNAME_TimeFence = "TimeFence"; diff --git a/base/src/org/eevolution/model/I_PP_WF_Node_Asset.java b/base/src/org/eevolution/model/I_PP_WF_Node_Asset.java index d91a84bea8..47573e01a4 100644 --- a/base/src/org/eevolution/model/I_PP_WF_Node_Asset.java +++ b/base/src/org/eevolution/model/I_PP_WF_Node_Asset.java @@ -57,21 +57,6 @@ public interface I_PP_WF_Node_Asset /** Load Meta Data */ - /** Column name AD_WF_Node_ID */ - public static final String COLUMNNAME_AD_WF_Node_ID = "AD_WF_Node_ID"; - - /** Set Node. - * Workflow Node (activity), step or process - */ - public void setAD_WF_Node_ID (int AD_WF_Node_ID); - - /** Get Node. - * Workflow Node (activity), step or process - */ - public int getAD_WF_Node_ID(); - - public I_AD_WF_Node getAD_WF_Node() throws Exception; - /** Column name A_Asset_ID */ public static final String COLUMNNAME_A_Asset_ID = "A_Asset_ID"; @@ -87,6 +72,21 @@ public interface I_PP_WF_Node_Asset public I_A_Asset getA_Asset() throws Exception; + /** Column name AD_WF_Node_ID */ + public static final String COLUMNNAME_AD_WF_Node_ID = "AD_WF_Node_ID"; + + /** Set Node. + * Workflow Node (activity), step or process + */ + public void setAD_WF_Node_ID (int AD_WF_Node_ID); + + /** Get Node. + * Workflow Node (activity), step or process + */ + public int getAD_WF_Node_ID(); + + public I_AD_WF_Node getAD_WF_Node() throws Exception; + /** Column name PP_WF_Node_Asset_ID */ public static final String COLUMNNAME_PP_WF_Node_Asset_ID = "PP_WF_Node_Asset_ID"; diff --git a/base/src/org/eevolution/model/I_QM_Specification.java b/base/src/org/eevolution/model/I_QM_Specification.java index ae2bf06224..67a213635c 100644 --- a/base/src/org/eevolution/model/I_QM_Specification.java +++ b/base/src/org/eevolution/model/I_QM_Specification.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for QM_Specification * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_QM_Specification { diff --git a/base/src/org/eevolution/model/I_QM_SpecificationLine.java b/base/src/org/eevolution/model/I_QM_SpecificationLine.java index eacba89536..7b1416b61b 100644 --- a/base/src/org/eevolution/model/I_QM_SpecificationLine.java +++ b/base/src/org/eevolution/model/I_QM_SpecificationLine.java @@ -39,7 +39,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for QM_SpecificationLine * @author Trifon Trifonov (generated) - * @version Release 3.5.1a + * @version Release 3.5.0 */ public interface I_QM_SpecificationLine { diff --git a/base/src/org/eevolution/model/I_RV_PP_WIP.java b/base/src/org/eevolution/model/I_RV_PP_WIP.java index 1df3386eb4..77c5a6f18e 100644 --- a/base/src/org/eevolution/model/I_RV_PP_WIP.java +++ b/base/src/org/eevolution/model/I_RV_PP_WIP.java @@ -33,8 +33,7 @@ package org.eevolution.model; import java.math.BigDecimal; - -import org.compiere.model.MTable; +import org.compiere.model.*; import org.compiere.util.KeyNamePair; /** Generated Interface for RV_PP_WIP diff --git a/base/src/org/eevolution/model/MDDOrder.java b/base/src/org/eevolution/model/MDDOrder.java index cb1124191e..d8b76effeb 100644 --- a/base/src/org/eevolution/model/MDDOrder.java +++ b/base/src/org/eevolution/model/MDDOrder.java @@ -681,13 +681,13 @@ public class MDDOrder extends X_DD_Order implements DocAction } } // Warehouse Org - if (newRecord + /*if (newRecord || is_ValueChanged("AD_Org_ID") || is_ValueChanged("M_Warehouse_ID")) { MWarehouse wh = MWarehouse.get(getCtx(), getM_Warehouse_ID()); if (wh.getAD_Org_ID() != getAD_Org_ID()) log.saveWarning("WarehouseOrgConflict", ""); - } + }*/ // Reservations in Warehouse if (!newRecord && is_ValueChanged("M_Warehouse_ID")) { diff --git a/base/src/org/eevolution/model/MPPMRP.java b/base/src/org/eevolution/model/MPPMRP.java index 9c88b645fe..9f016f0631 100644 --- a/base/src/org/eevolution/model/MPPMRP.java +++ b/base/src/org/eevolution/model/MPPMRP.java @@ -187,8 +187,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Product_ID(fl.getM_Product_ID()); mrp.setM_Warehouse_ID(fl.getM_Warehouse_ID()); mrp.setDocStatus("IP"); - mrp.setType("D"); - mrp.setTypeMRP("FCT"); + mrp.setOrderType(MPPMRP.ORDERTYPE_Forecast); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Demand); mrp.save(); } @@ -271,13 +271,13 @@ public class MPPMRP extends X_PP_MRP if (ol.getParent().isSOTrx()) { - mrp.setType("D"); - mrp.setTypeMRP("SOO"); + mrp.setOrderType(MPPMRP.ORDERTYPE_SalesOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Demand); } else { - mrp.setType("S"); - mrp.setTypeMRP("POO"); + mrp.setOrderType(MPPMRP.ORDERTYPE_PurchaseOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); } mrp.save(); @@ -373,7 +373,7 @@ public class MPPMRP extends X_PP_MRP } - sql = new String("SELECT * FROM PP_MRP WHERE Type = 'S' AND TypeMRP='MOP' AND PP_Order_ID = ? "); + sql = new String("SELECT * FROM PP_MRP WHERE TypeMRP = 'S' AND OrderType='MOP' AND PP_Order_ID = ? "); MPPMRP mrp = null; @@ -417,8 +417,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Product_ID(o.getM_Product_ID()); mrp.setM_Warehouse_ID(o.getM_Warehouse_ID()); mrp.setS_Resource_ID(o.getS_Resource_ID()); - mrp.setType("S"); - mrp.setTypeMRP("MOP"); + mrp.setOrderType(MPPMRP.ORDERTYPE_ManufacturingOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); mrp.setDocStatus(o.getDocStatus()); mrp.save(); } @@ -469,7 +469,7 @@ public class MPPMRP extends X_PP_MRP return; } - sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.Type = 'D' AND mrp.TypeMRP='MOP' AND mrp.PP_Order_BOMLine_ID = ? "); + sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.TypeMRP = 'D' AND mrp.OrderType='MOP' AND mrp.PP_Order_BOMLine_ID = ? "); MPPOrder o = obl.getParent(); MPPMRP mrp = null; @@ -514,8 +514,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Warehouse_ID(obl.getM_Warehouse_ID()); mrp.setS_Resource_ID(o.getS_Resource_ID()); mrp.setDocStatus(o.getDocStatus()); - mrp.setType("D"); - mrp.setTypeMRP("MOP"); + mrp.setOrderType(MPPMRP.ORDERTYPE_ManufacturingOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Demand); mrp.save(); } @@ -558,7 +558,7 @@ public class MPPMRP extends X_PP_MRP return; } - sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.Type = 'D' AND mrp.TypeMRP='DOO' AND mrp.DD_OrderLine_ID = ? "); + sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.TypeMRP = 'D' AND mrp.OrderType='DOO' AND mrp.DD_OrderLine_ID = ? "); MPPMRP mrp = null; MLocator source = MLocator.get( m_ctx , ol.getM_Locator_ID()); MLocator target = MLocator.get( m_ctx , ol.getM_LocatorTo_ID()); @@ -599,8 +599,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Product_ID(ol.getM_Product_ID()); mrp.setM_Warehouse_ID(source.getM_Warehouse_ID()); mrp.setDocStatus(ol.getParent().getDocStatus()); - mrp.setType("D"); - mrp.setTypeMRP("DOO"); + mrp.setOrderType(MPPMRP.ORDERTYPE_DistributionOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Demand); mrp.save(); } @@ -614,7 +614,7 @@ public class MPPMRP extends X_PP_MRP log.log(Level.SEVERE, "doIt - " + sql , ex); } - sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.Type = 'S' AND mrp.TypeMRP='DOO' AND mrp.DD_OrderLine_ID = ? "); + sql = new String("SELECT * FROM PP_MRP mrp WHERE mrp.TypeMRP = 'S' AND mrp.OrderType='DOO' AND mrp.DD_OrderLine_ID = ? "); pstmt = null; @@ -654,8 +654,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Product_ID(ol.getM_Product_ID()); mrp.setM_Warehouse_ID(target.getM_Warehouse_ID()); mrp.setDocStatus(ol.getParent().getDocStatus()); - mrp.setType("S"); - mrp.setTypeMRP("DOO"); + mrp.setOrderType(MPPMRP.ORDERTYPE_DistributionOrder); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); mrp.save(); } @@ -728,8 +728,8 @@ public class MPPMRP extends X_PP_MRP mrp.setM_Product_ID(rl.getM_Product_ID()); mrp.setM_Warehouse_ID(r.getM_Warehouse_ID()); mrp.setDocStatus(r.getDocStatus()); - mrp.setType("S"); - mrp.setTypeMRP("POR"); + mrp.setOrderType(MPPMRP.ORDERTYPE_MaterialRequisition); + mrp.setTypeMRP(MPPMRP.TYPEMRP_Supply); mrp.setIsAvailable(true); mrp.save(); diff --git a/base/src/org/eevolution/model/X_C_TaxBase.java b/base/src/org/eevolution/model/X_C_TaxBase.java index 2434fb8917..b4751adec4 100644 --- a/base/src/org/eevolution/model/X_C_TaxBase.java +++ b/base/src/org/eevolution/model/X_C_TaxBase.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for C_TaxBase * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_C_TaxBase extends PO implements I_C_TaxBase, I_Persistent { diff --git a/base/src/org/eevolution/model/X_C_TaxDefinition.java b/base/src/org/eevolution/model/X_C_TaxDefinition.java index 36e756f911..41c1325929 100644 --- a/base/src/org/eevolution/model/X_C_TaxDefinition.java +++ b/base/src/org/eevolution/model/X_C_TaxDefinition.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for C_TaxDefinition * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persistent { diff --git a/base/src/org/eevolution/model/X_C_TaxGroup.java b/base/src/org/eevolution/model/X_C_TaxGroup.java index 4c822292d5..98154c00e4 100644 --- a/base/src/org/eevolution/model/X_C_TaxGroup.java +++ b/base/src/org/eevolution/model/X_C_TaxGroup.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for C_TaxGroup * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_C_TaxGroup extends PO implements I_C_TaxGroup, I_Persistent { diff --git a/base/src/org/eevolution/model/X_C_TaxType.java b/base/src/org/eevolution/model/X_C_TaxType.java index 34a96e5ab9..67afa15d4e 100644 --- a/base/src/org/eevolution/model/X_C_TaxType.java +++ b/base/src/org/eevolution/model/X_C_TaxType.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for C_TaxType * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_C_TaxType extends PO implements I_C_TaxType, I_Persistent { diff --git a/base/src/org/eevolution/model/X_DD_NetworkDistribution.java b/base/src/org/eevolution/model/X_DD_NetworkDistribution.java index 9fdf4a7a1d..764882891f 100644 --- a/base/src/org/eevolution/model/X_DD_NetworkDistribution.java +++ b/base/src/org/eevolution/model/X_DD_NetworkDistribution.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for DD_NetworkDistribution * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_DD_NetworkDistribution extends PO implements I_DD_NetworkDistribution, I_Persistent { diff --git a/base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java b/base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java index f9ffd627b8..ce229f7c15 100644 --- a/base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java +++ b/base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java @@ -28,7 +28,7 @@ import org.compiere.util.Env; /** Generated Model for DD_NetworkDistributionLine * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_DD_NetworkDistributionLine extends PO implements I_DD_NetworkDistributionLine, I_Persistent { diff --git a/base/src/org/eevolution/model/X_DD_Order.java b/base/src/org/eevolution/model/X_DD_Order.java index 5eaeb5ee95..d0c003ec7d 100644 --- a/base/src/org/eevolution/model/X_DD_Order.java +++ b/base/src/org/eevolution/model/X_DD_Order.java @@ -29,7 +29,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for DD_Order * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_DD_Order extends PO implements I_DD_Order, I_Persistent { diff --git a/base/src/org/eevolution/model/X_DD_OrderLine.java b/base/src/org/eevolution/model/X_DD_OrderLine.java index 32c6167258..e83710959c 100644 --- a/base/src/org/eevolution/model/X_DD_OrderLine.java +++ b/base/src/org/eevolution/model/X_DD_OrderLine.java @@ -29,7 +29,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for DD_OrderLine * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_DD_OrderLine extends PO implements I_DD_OrderLine, I_Persistent { diff --git a/base/src/org/eevolution/model/X_EXP_Format.java b/base/src/org/eevolution/model/X_EXP_Format.java index c355fb2ae1..d4f7519b16 100644 --- a/base/src/org/eevolution/model/X_EXP_Format.java +++ b/base/src/org/eevolution/model/X_EXP_Format.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for EXP_Format * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_EXP_Format extends PO implements I_EXP_Format, I_Persistent { diff --git a/base/src/org/eevolution/model/X_EXP_FormatLine.java b/base/src/org/eevolution/model/X_EXP_FormatLine.java index 57d5538a30..200d8ad9c0 100644 --- a/base/src/org/eevolution/model/X_EXP_FormatLine.java +++ b/base/src/org/eevolution/model/X_EXP_FormatLine.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for EXP_FormatLine * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_EXP_FormatLine extends PO implements I_EXP_FormatLine, I_Persistent { diff --git a/base/src/org/eevolution/model/X_EXP_Processor.java b/base/src/org/eevolution/model/X_EXP_Processor.java index a75d23005f..c56c66e9e9 100644 --- a/base/src/org/eevolution/model/X_EXP_Processor.java +++ b/base/src/org/eevolution/model/X_EXP_Processor.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for EXP_Processor * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_EXP_Processor extends PO implements I_EXP_Processor, I_Persistent { diff --git a/base/src/org/eevolution/model/X_EXP_ProcessorParameter.java b/base/src/org/eevolution/model/X_EXP_ProcessorParameter.java index 00d934ace1..61364406ff 100644 --- a/base/src/org/eevolution/model/X_EXP_ProcessorParameter.java +++ b/base/src/org/eevolution/model/X_EXP_ProcessorParameter.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for EXP_ProcessorParameter * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_EXP_ProcessorParameter extends PO implements I_EXP_ProcessorParameter, I_Persistent { diff --git a/base/src/org/eevolution/model/X_EXP_Processor_Type.java b/base/src/org/eevolution/model/X_EXP_Processor_Type.java index 67a84d6efb..6a8e9b58a8 100644 --- a/base/src/org/eevolution/model/X_EXP_Processor_Type.java +++ b/base/src/org/eevolution/model/X_EXP_Processor_Type.java @@ -23,7 +23,7 @@ import org.compiere.model.*; /** Generated Model for EXP_Processor_Type * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_EXP_Processor_Type extends PO implements I_EXP_Processor_Type, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Attribute.java b/base/src/org/eevolution/model/X_HR_Attribute.java index 6b05285deb..6b0fa79a76 100644 --- a/base/src/org/eevolution/model/X_HR_Attribute.java +++ b/base/src/org/eevolution/model/X_HR_Attribute.java @@ -28,7 +28,7 @@ import org.compiere.util.Env; /** Generated Model for HR_Attribute * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Attribute extends PO implements I_HR_Attribute, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Concept.java b/base/src/org/eevolution/model/X_HR_Concept.java index 5a7beda97a..0d6dd73106 100644 --- a/base/src/org/eevolution/model/X_HR_Concept.java +++ b/base/src/org/eevolution/model/X_HR_Concept.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Concept * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Concept extends PO implements I_HR_Concept, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Concept_Acct.java b/base/src/org/eevolution/model/X_HR_Concept_Acct.java index 97949c2a95..ecf5553e7f 100644 --- a/base/src/org/eevolution/model/X_HR_Concept_Acct.java +++ b/base/src/org/eevolution/model/X_HR_Concept_Acct.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for HR_Concept_Acct * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Concept_Acct extends PO implements I_HR_Concept_Acct, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Concept_Category.java b/base/src/org/eevolution/model/X_HR_Concept_Category.java index 4f5fe679c2..f180f25aa9 100644 --- a/base/src/org/eevolution/model/X_HR_Concept_Category.java +++ b/base/src/org/eevolution/model/X_HR_Concept_Category.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Concept_Category * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Concept_Category extends PO implements I_HR_Concept_Category, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Contract.java b/base/src/org/eevolution/model/X_HR_Contract.java index 9a2a073768..a22cb5e63d 100644 --- a/base/src/org/eevolution/model/X_HR_Contract.java +++ b/base/src/org/eevolution/model/X_HR_Contract.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Contract * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Contract extends PO implements I_HR_Contract, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Department.java b/base/src/org/eevolution/model/X_HR_Department.java index 4678d0cf9e..ec19101832 100644 --- a/base/src/org/eevolution/model/X_HR_Department.java +++ b/base/src/org/eevolution/model/X_HR_Department.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Department * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Department extends PO implements I_HR_Department, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Employee.java b/base/src/org/eevolution/model/X_HR_Employee.java index 93d13f3ab4..adce4db7ed 100644 --- a/base/src/org/eevolution/model/X_HR_Employee.java +++ b/base/src/org/eevolution/model/X_HR_Employee.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Employee * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Employee extends PO implements I_HR_Employee, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Job.java b/base/src/org/eevolution/model/X_HR_Job.java index 8b5075c046..9081ee6a66 100644 --- a/base/src/org/eevolution/model/X_HR_Job.java +++ b/base/src/org/eevolution/model/X_HR_Job.java @@ -26,7 +26,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Job * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Job extends PO implements I_HR_Job, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_List.java b/base/src/org/eevolution/model/X_HR_List.java index 6eb2fcaac7..740676ff71 100644 --- a/base/src/org/eevolution/model/X_HR_List.java +++ b/base/src/org/eevolution/model/X_HR_List.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_List * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_List extends PO implements I_HR_List, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_ListLine.java b/base/src/org/eevolution/model/X_HR_ListLine.java index 8ea0918799..4411df355c 100644 --- a/base/src/org/eevolution/model/X_HR_ListLine.java +++ b/base/src/org/eevolution/model/X_HR_ListLine.java @@ -28,7 +28,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_ListLine * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_ListLine extends PO implements I_HR_ListLine, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_ListType.java b/base/src/org/eevolution/model/X_HR_ListType.java index 6a4c99ffbc..ba09b365ff 100644 --- a/base/src/org/eevolution/model/X_HR_ListType.java +++ b/base/src/org/eevolution/model/X_HR_ListType.java @@ -24,7 +24,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_ListType * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_ListType extends PO implements I_HR_ListType, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_ListVersion.java b/base/src/org/eevolution/model/X_HR_ListVersion.java index 3fe8f4eb07..402af42678 100644 --- a/base/src/org/eevolution/model/X_HR_ListVersion.java +++ b/base/src/org/eevolution/model/X_HR_ListVersion.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_ListVersion * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_ListVersion extends PO implements I_HR_ListVersion, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Movement.java b/base/src/org/eevolution/model/X_HR_Movement.java index 8f8c50cf34..32b47e7e3c 100644 --- a/base/src/org/eevolution/model/X_HR_Movement.java +++ b/base/src/org/eevolution/model/X_HR_Movement.java @@ -29,7 +29,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Movement * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Movement extends PO implements I_HR_Movement, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Payroll.java b/base/src/org/eevolution/model/X_HR_Payroll.java index 9b31d6d7d1..82aed25802 100644 --- a/base/src/org/eevolution/model/X_HR_Payroll.java +++ b/base/src/org/eevolution/model/X_HR_Payroll.java @@ -26,7 +26,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Payroll * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Payroll extends PO implements I_HR_Payroll, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_PayrollConcept.java b/base/src/org/eevolution/model/X_HR_PayrollConcept.java index a430a86c81..f9d35c2330 100644 --- a/base/src/org/eevolution/model/X_HR_PayrollConcept.java +++ b/base/src/org/eevolution/model/X_HR_PayrollConcept.java @@ -26,7 +26,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_PayrollConcept * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_PayrollConcept extends PO implements I_HR_PayrollConcept, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Period.java b/base/src/org/eevolution/model/X_HR_Period.java index 4eb1b4eede..384a88f17d 100644 --- a/base/src/org/eevolution/model/X_HR_Period.java +++ b/base/src/org/eevolution/model/X_HR_Period.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Period * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Period extends PO implements I_HR_Period, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Process.java b/base/src/org/eevolution/model/X_HR_Process.java index e53fc9a5c9..29928996a7 100644 --- a/base/src/org/eevolution/model/X_HR_Process.java +++ b/base/src/org/eevolution/model/X_HR_Process.java @@ -27,7 +27,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for HR_Process * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Process extends PO implements I_HR_Process, I_Persistent { diff --git a/base/src/org/eevolution/model/X_HR_Year.java b/base/src/org/eevolution/model/X_HR_Year.java index 57038a5dc7..9c254d0639 100644 --- a/base/src/org/eevolution/model/X_HR_Year.java +++ b/base/src/org/eevolution/model/X_HR_Year.java @@ -26,7 +26,7 @@ import org.compiere.model.*; /** Generated Model for HR_Year * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_HR_Year extends PO implements I_HR_Year, I_Persistent { diff --git a/base/src/org/eevolution/model/X_IMP_Processor.java b/base/src/org/eevolution/model/X_IMP_Processor.java index 118f5cb5f5..cf46157cac 100644 --- a/base/src/org/eevolution/model/X_IMP_Processor.java +++ b/base/src/org/eevolution/model/X_IMP_Processor.java @@ -26,7 +26,7 @@ import org.compiere.model.*; /** Generated Model for IMP_Processor * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_IMP_Processor extends PO implements I_IMP_Processor, I_Persistent { diff --git a/base/src/org/eevolution/model/X_IMP_ProcessorLog.java b/base/src/org/eevolution/model/X_IMP_ProcessorLog.java index a735a0156c..0d63704ac9 100644 --- a/base/src/org/eevolution/model/X_IMP_ProcessorLog.java +++ b/base/src/org/eevolution/model/X_IMP_ProcessorLog.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for IMP_ProcessorLog * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_IMP_ProcessorLog extends PO implements I_IMP_ProcessorLog, I_Persistent { diff --git a/base/src/org/eevolution/model/X_IMP_ProcessorParameter.java b/base/src/org/eevolution/model/X_IMP_ProcessorParameter.java index f653dc25b7..9d6fd1ca93 100644 --- a/base/src/org/eevolution/model/X_IMP_ProcessorParameter.java +++ b/base/src/org/eevolution/model/X_IMP_ProcessorParameter.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for IMP_ProcessorParameter * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_IMP_ProcessorParameter extends PO implements I_IMP_ProcessorParameter, I_Persistent { diff --git a/base/src/org/eevolution/model/X_IMP_Processor_Type.java b/base/src/org/eevolution/model/X_IMP_Processor_Type.java index bf3789b59e..0308cfd286 100644 --- a/base/src/org/eevolution/model/X_IMP_Processor_Type.java +++ b/base/src/org/eevolution/model/X_IMP_Processor_Type.java @@ -23,7 +23,7 @@ import org.compiere.model.*; /** Generated Model for IMP_Processor_Type * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_IMP_Processor_Type extends PO implements I_IMP_Processor_Type, I_Persistent { diff --git a/base/src/org/eevolution/model/X_PP_Cost_Collector.java b/base/src/org/eevolution/model/X_PP_Cost_Collector.java index ea976856db..06fe5be858 100644 --- a/base/src/org/eevolution/model/X_PP_Cost_Collector.java +++ b/base/src/org/eevolution/model/X_PP_Cost_Collector.java @@ -44,20 +44,20 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe super (ctx, PP_Cost_Collector_ID, trxName); /** if (PP_Cost_Collector_ID == 0) { - setC_DocTypeTarget_ID (0); setC_DocType_ID (0); + setC_DocTypeTarget_ID (0); setDateAcct (new Timestamp(System.currentTimeMillis())); // @#Date@ setM_Locator_ID (0); - setM_Product_ID (0); - setM_Warehouse_ID (0); setMovementDate (new Timestamp(System.currentTimeMillis())); // @#Date@ setMovementQty (Env.ZERO); // 0 + setM_Product_ID (0); + setM_Warehouse_ID (0); + setPosted (false); setPP_Cost_Collector_ID (0); setPP_Order_ID (0); - setPosted (false); setProcessed (false); setS_Resource_ID (0); } */ @@ -233,30 +233,6 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } - /** C_DocTypeTarget_ID AD_Reference_ID=53233 */ - public static final int C_DOCTYPETARGET_ID_AD_Reference_ID=53233; - /** Set Target Document Type. - @param C_DocTypeTarget_ID - Target document type for conversing documents - */ - public void setC_DocTypeTarget_ID (int C_DocTypeTarget_ID) - { - if (C_DocTypeTarget_ID < 1) - throw new IllegalArgumentException ("C_DocTypeTarget_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_C_DocTypeTarget_ID, Integer.valueOf(C_DocTypeTarget_ID)); - } - - /** Get Target Document Type. - @return Target document type for conversing documents - */ - public int getC_DocTypeTarget_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_DocTypeTarget_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** C_DocType_ID AD_Reference_ID=53233 */ public static final int C_DOCTYPE_ID_AD_Reference_ID=53233; /** Set Document Type. @@ -281,6 +257,30 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } + /** C_DocTypeTarget_ID AD_Reference_ID=53233 */ + public static final int C_DOCTYPETARGET_ID_AD_Reference_ID=53233; + /** Set Target Document Type. + @param C_DocTypeTarget_ID + Target document type for conversing documents + */ + public void setC_DocTypeTarget_ID (int C_DocTypeTarget_ID) + { + if (C_DocTypeTarget_ID < 1) + throw new IllegalArgumentException ("C_DocTypeTarget_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_C_DocTypeTarget_ID, Integer.valueOf(C_DocTypeTarget_ID)); + } + + /** Get Target Document Type. + @return Target document type for conversing documents + */ + public int getC_DocTypeTarget_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_DocTypeTarget_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public I_C_Project getC_Project() throws Exception { Class clazz = MTable.getClass(I_C_Project.Table_Name); @@ -588,90 +588,6 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } - public I_M_Product getM_Product() throws Exception - { - Class clazz = MTable.getClass(I_M_Product.Table_Name); - I_M_Product result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_M_Product)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Product_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Product. - @param M_Product_ID - Product, Service, Item - */ - public void setM_Product_ID (int M_Product_ID) - { - if (M_Product_ID < 1) - throw new IllegalArgumentException ("M_Product_ID is mandatory."); - set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID)); - } - - /** Get Product. - @return Product, Service, Item - */ - public int getM_Product_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Get Record ID/ColumnName - @return ID/ColumnName pair - */ - public KeyNamePair getKeyNamePair() - { - return new KeyNamePair(get_ID(), String.valueOf(getM_Product_ID())); - } - - public I_M_Warehouse getM_Warehouse() throws Exception - { - Class clazz = MTable.getClass(I_M_Warehouse.Table_Name); - I_M_Warehouse result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_M_Warehouse)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Warehouse_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Warehouse. - @param M_Warehouse_ID - Storage Warehouse and Service Point - */ - public void setM_Warehouse_ID (int M_Warehouse_ID) - { - if (M_Warehouse_ID < 1) - throw new IllegalArgumentException ("M_Warehouse_ID is mandatory."); - set_Value (COLUMNNAME_M_Warehouse_ID, Integer.valueOf(M_Warehouse_ID)); - } - - /** Get Warehouse. - @return Storage Warehouse and Service Point - */ - public int getM_Warehouse_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_M_Warehouse_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Movement Date. @param MovementDate Date a product was moved in or out of inventory @@ -763,6 +679,114 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return (String)get_Value(COLUMNNAME_MovementType); } + public I_M_Product getM_Product() throws Exception + { + Class clazz = MTable.getClass(I_M_Product.Table_Name); + I_M_Product result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_M_Product)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Product_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Product. + @param M_Product_ID + Product, Service, Item + */ + public void setM_Product_ID (int M_Product_ID) + { + if (M_Product_ID < 1) + throw new IllegalArgumentException ("M_Product_ID is mandatory."); + set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID)); + } + + /** Get Product. + @return Product, Service, Item + */ + public int getM_Product_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Get Record ID/ColumnName + @return ID/ColumnName pair + */ + public KeyNamePair getKeyNamePair() + { + return new KeyNamePair(get_ID(), String.valueOf(getM_Product_ID())); + } + + public I_M_Warehouse getM_Warehouse() throws Exception + { + Class clazz = MTable.getClass(I_M_Warehouse.Table_Name); + I_M_Warehouse result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_M_Warehouse)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Warehouse_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Warehouse. + @param M_Warehouse_ID + Storage Warehouse and Service Point + */ + public void setM_Warehouse_ID (int M_Warehouse_ID) + { + if (M_Warehouse_ID < 1) + throw new IllegalArgumentException ("M_Warehouse_ID is mandatory."); + set_Value (COLUMNNAME_M_Warehouse_ID, Integer.valueOf(M_Warehouse_ID)); + } + + /** Get Warehouse. + @return Storage Warehouse and Service Point + */ + public int getM_Warehouse_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_Warehouse_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Posted. + @param Posted + Posting status + */ + public void setPosted (boolean Posted) + { + set_Value (COLUMNNAME_Posted, Boolean.valueOf(Posted)); + } + + /** Get Posted. + @return Posting status + */ + public boolean isPosted () + { + Object oo = get_Value(COLUMNNAME_Posted); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set PP_Cost_Collector_ID. @param PP_Cost_Collector_ID PP_Cost_Collector_ID */ public void setPP_Cost_Collector_ID (int PP_Cost_Collector_ID) @@ -925,30 +949,6 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } - /** Set Posted. - @param Posted - Posting status - */ - public void setPosted (boolean Posted) - { - set_Value (COLUMNNAME_Posted, Boolean.valueOf(Posted)); - } - - /** Get Posted. - @return Posting status - */ - public boolean isPosted () - { - Object oo = get_Value(COLUMNNAME_Posted); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Processed. @param Processed The document has been processed @@ -1036,6 +1036,43 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } + /** Set Scrapped Quantity. + @param ScrappedQty + The Quantity scrapped due to QA issues + */ + public void setScrappedQty (BigDecimal ScrappedQty) + { + set_Value (COLUMNNAME_ScrappedQty, ScrappedQty); + } + + /** Get Scrapped Quantity. + @return The Quantity scrapped due to QA issues + */ + public BigDecimal getScrappedQty () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ScrappedQty); + if (bd == null) + return Env.ZERO; + return bd; + } + + /** Set SetupTimeReal. + @param SetupTimeReal SetupTimeReal */ + public void setSetupTimeReal (BigDecimal SetupTimeReal) + { + set_Value (COLUMNNAME_SetupTimeReal, SetupTimeReal); + } + + /** Get SetupTimeReal. + @return SetupTimeReal */ + public BigDecimal getSetupTimeReal () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_SetupTimeReal); + if (bd == null) + return Env.ZERO; + return bd; + } + public I_S_Resource getS_Resource() throws Exception { Class clazz = MTable.getClass(I_S_Resource.Table_Name); @@ -1074,43 +1111,6 @@ public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Pe return ii.intValue(); } - /** Set Scrapped Quantity. - @param ScrappedQty - The Quantity scrapped due to QA issues - */ - public void setScrappedQty (BigDecimal ScrappedQty) - { - set_Value (COLUMNNAME_ScrappedQty, ScrappedQty); - } - - /** Get Scrapped Quantity. - @return The Quantity scrapped due to QA issues - */ - public BigDecimal getScrappedQty () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ScrappedQty); - if (bd == null) - return Env.ZERO; - return bd; - } - - /** Set SetupTimeReal. - @param SetupTimeReal SetupTimeReal */ - public void setSetupTimeReal (BigDecimal SetupTimeReal) - { - set_Value (COLUMNNAME_SetupTimeReal, SetupTimeReal); - } - - /** Get SetupTimeReal. - @return SetupTimeReal */ - public BigDecimal getSetupTimeReal () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_SetupTimeReal); - if (bd == null) - return Env.ZERO; - return bd; - } - /** User1_ID AD_Reference_ID=286 */ public static final int USER1_ID_AD_Reference_ID=286; /** Set User List 1. diff --git a/base/src/org/eevolution/model/X_PP_MRP.java b/base/src/org/eevolution/model/X_PP_MRP.java index 9d8f27f472..f07bacc323 100644 --- a/base/src/org/eevolution/model/X_PP_MRP.java +++ b/base/src/org/eevolution/model/X_PP_MRP.java @@ -29,7 +29,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for PP_MRP * @author Adempiere (generated) - * @version Release 3.5.0 - $Id$ */ + * @version Release 3.5.1a - $Id$ */ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent { @@ -119,45 +119,6 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } - public I_C_OrderLine getC_OrderLine() throws Exception - { - Class clazz = MTable.getClass(I_C_OrderLine.Table_Name); - I_C_OrderLine result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_C_OrderLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_OrderLine_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Sales Order Line. - @param C_OrderLine_ID - Sales Order Line - */ - public void setC_OrderLine_ID (int C_OrderLine_ID) - { - if (C_OrderLine_ID < 1) - set_Value (COLUMNNAME_C_OrderLine_ID, null); - else - set_Value (COLUMNNAME_C_OrderLine_ID, Integer.valueOf(C_OrderLine_ID)); - } - - /** Get Sales Order Line. - @return Sales Order Line - */ - public int getC_OrderLine_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_OrderLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_Order getC_Order() throws Exception { Class clazz = MTable.getClass(I_C_Order.Table_Name); @@ -197,14 +158,14 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } - public org.eevolution.model.I_DD_OrderLine getDD_OrderLine() throws Exception + public I_C_OrderLine getC_OrderLine() throws Exception { - Class clazz = MTable.getClass(org.eevolution.model.I_DD_OrderLine.Table_Name); - org.eevolution.model.I_DD_OrderLine result = null; + Class clazz = MTable.getClass(I_C_OrderLine.Table_Name); + I_C_OrderLine result = null; try { Constructor constructor = null; constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (org.eevolution.model.I_DD_OrderLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getDD_OrderLine_ID()), get_TrxName()}); + result = (I_C_OrderLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_OrderLine_ID()), get_TrxName()}); } catch (Exception e) { log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); @@ -213,57 +174,24 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return result; } - /** Set Distribution Order Line. - @param DD_OrderLine_ID Distribution Order Line */ - public void setDD_OrderLine_ID (int DD_OrderLine_ID) + /** Set Sales Order Line. + @param C_OrderLine_ID + Sales Order Line + */ + public void setC_OrderLine_ID (int C_OrderLine_ID) { - if (DD_OrderLine_ID < 1) - set_Value (COLUMNNAME_DD_OrderLine_ID, null); + if (C_OrderLine_ID < 1) + set_Value (COLUMNNAME_C_OrderLine_ID, null); else - set_Value (COLUMNNAME_DD_OrderLine_ID, Integer.valueOf(DD_OrderLine_ID)); + set_Value (COLUMNNAME_C_OrderLine_ID, Integer.valueOf(C_OrderLine_ID)); } - /** Get Distribution Order Line. - @return Distribution Order Line */ - public int getDD_OrderLine_ID () + /** Get Sales Order Line. + @return Sales Order Line + */ + public int getC_OrderLine_ID () { - Integer ii = (Integer)get_Value(COLUMNNAME_DD_OrderLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - public org.eevolution.model.I_DD_Order getDD_Order() throws Exception - { - Class clazz = MTable.getClass(org.eevolution.model.I_DD_Order.Table_Name); - org.eevolution.model.I_DD_Order result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (org.eevolution.model.I_DD_Order)constructor.newInstance(new Object[] {getCtx(), new Integer(getDD_Order_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Distribution Order. - @param DD_Order_ID Distribution Order */ - public void setDD_Order_ID (int DD_Order_ID) - { - if (DD_Order_ID < 1) - set_Value (COLUMNNAME_DD_Order_ID, null); - else - set_Value (COLUMNNAME_DD_Order_ID, Integer.valueOf(DD_Order_ID)); - } - - /** Get Distribution Order. - @return Distribution Order */ - public int getDD_Order_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_DD_Order_ID); + Integer ii = (Integer)get_Value(COLUMNNAME_C_OrderLine_ID); if (ii == null) return 0; return ii.intValue(); @@ -377,6 +305,78 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return (Timestamp)get_Value(COLUMNNAME_DateStartSchedule); } + public org.eevolution.model.I_DD_Order getDD_Order() throws Exception + { + Class clazz = MTable.getClass(org.eevolution.model.I_DD_Order.Table_Name); + org.eevolution.model.I_DD_Order result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (org.eevolution.model.I_DD_Order)constructor.newInstance(new Object[] {getCtx(), new Integer(getDD_Order_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Distribution Order. + @param DD_Order_ID Distribution Order */ + public void setDD_Order_ID (int DD_Order_ID) + { + if (DD_Order_ID < 1) + set_Value (COLUMNNAME_DD_Order_ID, null); + else + set_Value (COLUMNNAME_DD_Order_ID, Integer.valueOf(DD_Order_ID)); + } + + /** Get Distribution Order. + @return Distribution Order */ + public int getDD_Order_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_DD_Order_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + public org.eevolution.model.I_DD_OrderLine getDD_OrderLine() throws Exception + { + Class clazz = MTable.getClass(org.eevolution.model.I_DD_OrderLine.Table_Name); + org.eevolution.model.I_DD_OrderLine result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (org.eevolution.model.I_DD_OrderLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getDD_OrderLine_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Distribution Order Line. + @param DD_OrderLine_ID Distribution Order Line */ + public void setDD_OrderLine_ID (int DD_OrderLine_ID) + { + if (DD_OrderLine_ID < 1) + set_Value (COLUMNNAME_DD_OrderLine_ID, null); + else + set_Value (COLUMNNAME_DD_OrderLine_ID, Integer.valueOf(DD_OrderLine_ID)); + } + + /** Get Distribution Order Line. + @return Distribution Order Line */ + public int getDD_OrderLine_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_DD_OrderLine_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Description. @param Description Optional short description of the record @@ -447,45 +447,6 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return false; } - public I_M_ForecastLine getM_ForecastLine() throws Exception - { - Class clazz = MTable.getClass(I_M_ForecastLine.Table_Name); - I_M_ForecastLine result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_M_ForecastLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_ForecastLine_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Forecast Line. - @param M_ForecastLine_ID - Forecast Line - */ - public void setM_ForecastLine_ID (int M_ForecastLine_ID) - { - if (M_ForecastLine_ID < 1) - set_Value (COLUMNNAME_M_ForecastLine_ID, null); - else - set_Value (COLUMNNAME_M_ForecastLine_ID, Integer.valueOf(M_ForecastLine_ID)); - } - - /** Get Forecast Line. - @return Forecast Line - */ - public int getM_ForecastLine_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_M_ForecastLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_M_Forecast getM_Forecast() throws Exception { Class clazz = MTable.getClass(I_M_Forecast.Table_Name); @@ -525,6 +486,45 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } + public I_M_ForecastLine getM_ForecastLine() throws Exception + { + Class clazz = MTable.getClass(I_M_ForecastLine.Table_Name); + I_M_ForecastLine result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_M_ForecastLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_ForecastLine_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Forecast Line. + @param M_ForecastLine_ID + Forecast Line + */ + public void setM_ForecastLine_ID (int M_ForecastLine_ID) + { + if (M_ForecastLine_ID < 1) + set_Value (COLUMNNAME_M_ForecastLine_ID, null); + else + set_Value (COLUMNNAME_M_ForecastLine_ID, Integer.valueOf(M_ForecastLine_ID)); + } + + /** Get Forecast Line. + @return Forecast Line + */ + public int getM_ForecastLine_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ForecastLine_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public I_M_Product getM_Product() throws Exception { Class clazz = MTable.getClass(I_M_Product.Table_Name); @@ -564,45 +564,6 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } - public I_M_RequisitionLine getM_RequisitionLine() throws Exception - { - Class clazz = MTable.getClass(I_M_RequisitionLine.Table_Name); - I_M_RequisitionLine result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_M_RequisitionLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_RequisitionLine_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Requisition Line. - @param M_RequisitionLine_ID - Material Requisition Line - */ - public void setM_RequisitionLine_ID (int M_RequisitionLine_ID) - { - if (M_RequisitionLine_ID < 1) - set_Value (COLUMNNAME_M_RequisitionLine_ID, null); - else - set_Value (COLUMNNAME_M_RequisitionLine_ID, Integer.valueOf(M_RequisitionLine_ID)); - } - - /** Get Requisition Line. - @return Material Requisition Line - */ - public int getM_RequisitionLine_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_M_RequisitionLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_M_Requisition getM_Requisition() throws Exception { Class clazz = MTable.getClass(I_M_Requisition.Table_Name); @@ -642,6 +603,45 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } + public I_M_RequisitionLine getM_RequisitionLine() throws Exception + { + Class clazz = MTable.getClass(I_M_RequisitionLine.Table_Name); + I_M_RequisitionLine result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_M_RequisitionLine)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_RequisitionLine_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Requisition Line. + @param M_RequisitionLine_ID + Material Requisition Line + */ + public void setM_RequisitionLine_ID (int M_RequisitionLine_ID) + { + if (M_RequisitionLine_ID < 1) + set_Value (COLUMNNAME_M_RequisitionLine_ID, null); + else + set_Value (COLUMNNAME_M_RequisitionLine_ID, Integer.valueOf(M_RequisitionLine_ID)); + } + + /** Get Requisition Line. + @return Material Requisition Line + */ + public int getM_RequisitionLine_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_RequisitionLine_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public I_M_Warehouse getM_Warehouse() throws Exception { Class clazz = MTable.getClass(I_M_Warehouse.Table_Name); @@ -711,6 +711,63 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return new KeyNamePair(get_ID(), getName()); } + /** OrderType AD_Reference_ID=53229 */ + public static final int ORDERTYPE_AD_Reference_ID=53229; + /** Forecast = FCT */ + public static final String ORDERTYPE_Forecast = "FCT"; + /** Manufacturing Order = MOP */ + public static final String ORDERTYPE_ManufacturingOrder = "MOP"; + /** Purchase Order = POO */ + public static final String ORDERTYPE_PurchaseOrder = "POO"; + /** Material Requisition = POR */ + public static final String ORDERTYPE_MaterialRequisition = "POR"; + /** Sales Order = SOO */ + public static final String ORDERTYPE_SalesOrder = "SOO"; + /** Distribution Order = DOO */ + public static final String ORDERTYPE_DistributionOrder = "DOO"; + /** Set OrderType. + @param OrderType OrderType */ + public void setOrderType (String OrderType) + { + + if (OrderType == null || OrderType.equals("FCT") || OrderType.equals("MOP") || OrderType.equals("POO") || OrderType.equals("POR") || OrderType.equals("SOO") || OrderType.equals("DOO")); else throw new IllegalArgumentException ("OrderType Invalid value - " + OrderType + " - Reference_ID=53229 - FCT - MOP - POO - POR - SOO - DOO"); + if (OrderType != null && OrderType.length() > 3) + { + log.warning("Length > 3 - truncated"); + OrderType = OrderType.substring(0, 3); + } + set_Value (COLUMNNAME_OrderType, OrderType); + } + + /** Get OrderType. + @return OrderType */ + public String getOrderType () + { + return (String)get_Value(COLUMNNAME_OrderType); + } + + /** Planner_ID AD_Reference_ID=286 */ + public static final int PLANNER_ID_AD_Reference_ID=286; + /** Set Planner. + @param Planner_ID Planner */ + public void setPlanner_ID (int Planner_ID) + { + if (Planner_ID < 1) + set_Value (COLUMNNAME_Planner_ID, null); + else + set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); + } + + /** Get Planner. + @return Planner */ + public int getPlanner_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set PP_MRP_ID. @param PP_MRP_ID PP_MRP_ID */ public void setPP_MRP_ID (int PP_MRP_ID) @@ -802,28 +859,6 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } - /** Planner_ID AD_Reference_ID=286 */ - public static final int PLANNER_ID_AD_Reference_ID=286; - /** Set Planner. - @param Planner_ID Planner */ - public void setPlanner_ID (int Planner_ID) - { - if (Planner_ID < 1) - set_Value (COLUMNNAME_Planner_ID, null); - else - set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); - } - - /** Get Planner. - @return Planner */ - public int getPlanner_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Priority. @param Priority Indicates if this request is of a high, medium or low priority. @@ -906,38 +941,22 @@ public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent return ii.intValue(); } - /** Set Type. - @param Type - Type of Validation (SQL, Java Script, Java Language) - */ - public void setType (String Type) - { - - if (Type != null && Type.length() > 1) - { - log.warning("Length > 1 - truncated"); - Type = Type.substring(0, 1); - } - set_Value (COLUMNNAME_Type, Type); - } - - /** Get Type. - @return Type of Validation (SQL, Java Script, Java Language) - */ - public String getType () - { - return (String)get_Value(COLUMNNAME_Type); - } - + /** TypeMRP AD_Reference_ID=53230 */ + public static final int TYPEMRP_AD_Reference_ID=53230; + /** Demand = D */ + public static final String TYPEMRP_Demand = "D"; + /** Supply = S */ + public static final String TYPEMRP_Supply = "S"; /** Set TypeMRP. @param TypeMRP TypeMRP */ public void setTypeMRP (String TypeMRP) { - if (TypeMRP != null && TypeMRP.length() > 3) + if (TypeMRP == null || TypeMRP.equals("D") || TypeMRP.equals("S")); else throw new IllegalArgumentException ("TypeMRP Invalid value - " + TypeMRP + " - Reference_ID=53230 - D - S"); + if (TypeMRP != null && TypeMRP.length() > 1) { - log.warning("Length > 3 - truncated"); - TypeMRP = TypeMRP.substring(0, 3); + log.warning("Length > 1 - truncated"); + TypeMRP = TypeMRP.substring(0, 1); } set_Value (COLUMNNAME_TypeMRP, TypeMRP); } diff --git a/base/src/org/eevolution/model/X_PP_Order.java b/base/src/org/eevolution/model/X_PP_Order.java index ebef35839b..1b42cfe80e 100644 --- a/base/src/org/eevolution/model/X_PP_Order.java +++ b/base/src/org/eevolution/model/X_PP_Order.java @@ -62,10 +62,10 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent setIsApproved (false); // N setIsPrinted (false); -// N - setIsSOTrx (false); // N setIsSelected (false); +// N + setIsSOTrx (false); // N setLine (0); setM_Product_ID (0); @@ -278,6 +278,31 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return ii.intValue(); } + /** C_DocType_ID AD_Reference_ID=53233 */ + public static final int C_DOCTYPE_ID_AD_Reference_ID=53233; + /** Set Document Type. + @param C_DocType_ID + Document type or rules + */ + public void setC_DocType_ID (int C_DocType_ID) + { + if (C_DocType_ID < 1) + set_Value (COLUMNNAME_C_DocType_ID, null); + else + set_Value (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID)); + } + + /** Get Document Type. + @return Document type or rules + */ + public int getC_DocType_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** C_DocTypeTarget_ID AD_Reference_ID=53233 */ public static final int C_DOCTYPETARGET_ID_AD_Reference_ID=53233; /** Set Target Document Type. @@ -302,29 +327,27 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return ii.intValue(); } - /** C_DocType_ID AD_Reference_ID=53233 */ - public static final int C_DOCTYPE_ID_AD_Reference_ID=53233; - /** Set Document Type. - @param C_DocType_ID - Document type or rules + /** Set Copy From. + @param CopyFrom + Copy From Record */ - public void setC_DocType_ID (int C_DocType_ID) + public void setCopyFrom (String CopyFrom) { - if (C_DocType_ID < 1) - set_Value (COLUMNNAME_C_DocType_ID, null); - else - set_Value (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID)); + + if (CopyFrom != null && CopyFrom.length() > 1) + { + log.warning("Length > 1 - truncated"); + CopyFrom = CopyFrom.substring(0, 1); + } + set_Value (COLUMNNAME_CopyFrom, CopyFrom); } - /** Get Document Type. - @return Document type or rules + /** Get Copy From. + @return Copy From Record */ - public int getC_DocType_ID () + public String getCopyFrom () { - Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID); - if (ii == null) - return 0; - return ii.intValue(); + return (String)get_Value(COLUMNNAME_CopyFrom); } public I_C_OrderLine getC_OrderLine() throws Exception @@ -443,29 +466,6 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return ii.intValue(); } - /** Set Copy From. - @param CopyFrom - Copy From Record - */ - public void setCopyFrom (String CopyFrom) - { - - if (CopyFrom != null && CopyFrom.length() > 1) - { - log.warning("Length > 1 - truncated"); - CopyFrom = CopyFrom.substring(0, 1); - } - set_Value (COLUMNNAME_CopyFrom, CopyFrom); - } - - /** Get Copy From. - @return Copy From Record - */ - public String getCopyFrom () - { - return (String)get_Value(COLUMNNAME_CopyFrom); - } - /** Set DateConfirm. @param DateConfirm DateConfirm */ public void setDateConfirm (Timestamp DateConfirm) @@ -862,6 +862,27 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return false; } + /** Set Selected. + @param IsSelected Selected */ + public void setIsSelected (boolean IsSelected) + { + set_Value (COLUMNNAME_IsSelected, Boolean.valueOf(IsSelected)); + } + + /** Get Selected. + @return Selected */ + public boolean isSelected () + { + Object oo = get_Value(COLUMNNAME_IsSelected); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Sales Transaction. @param IsSOTrx This is a Sales Transaction @@ -886,27 +907,6 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return false; } - /** Set Selected. - @param IsSelected Selected */ - public void setIsSelected (boolean IsSelected) - { - set_Value (COLUMNNAME_IsSelected, Boolean.valueOf(IsSelected)); - } - - /** Get Selected. - @return Selected */ - public boolean isSelected () - { - Object oo = get_Value(COLUMNNAME_IsSelected); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Line No. @param Line Unique line for this document @@ -1069,6 +1069,52 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return (String)get_Value(COLUMNNAME_OrderType); } + /** Planner_ID AD_Reference_ID=286 */ + public static final int PLANNER_ID_AD_Reference_ID=286; + /** Set Planner. + @param Planner_ID Planner */ + public void setPlanner_ID (int Planner_ID) + { + if (Planner_ID < 1) + set_Value (COLUMNNAME_Planner_ID, null); + else + set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); + } + + /** Get Planner. + @return Planner */ + public int getPlanner_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Posted. + @param Posted + Posting status + */ + public void setPosted (boolean Posted) + { + set_Value (COLUMNNAME_Posted, Boolean.valueOf(Posted)); + } + + /** Get Posted. + @return Posting status + */ + public boolean isPosted () + { + Object oo = get_Value(COLUMNNAME_Posted); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set PP_Order_ID. @param PP_Order_ID PP_Order_ID */ public void setPP_Order_ID (int PP_Order_ID) @@ -1126,52 +1172,6 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return ii.intValue(); } - /** Planner_ID AD_Reference_ID=286 */ - public static final int PLANNER_ID_AD_Reference_ID=286; - /** Set Planner. - @param Planner_ID Planner */ - public void setPlanner_ID (int Planner_ID) - { - if (Planner_ID < 1) - set_Value (COLUMNNAME_Planner_ID, null); - else - set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); - } - - /** Get Planner. - @return Planner */ - public int getPlanner_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set Posted. - @param Posted - Posting status - */ - public void setPosted (boolean Posted) - { - set_Value (COLUMNNAME_Posted, Boolean.valueOf(Posted)); - } - - /** Get Posted. - @return Posting status - */ - public boolean isPosted () - { - Object oo = get_Value(COLUMNNAME_Posted); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** PriorityRule AD_Reference_ID=154 */ public static final int PRIORITYRULE_AD_Reference_ID=154; /** High = 3 */ @@ -1253,23 +1253,6 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return false; } - /** Set QtyBatchSize. - @param QtyBatchSize QtyBatchSize */ - public void setQtyBatchSize (BigDecimal QtyBatchSize) - { - set_ValueNoCheck (COLUMNNAME_QtyBatchSize, QtyBatchSize); - } - - /** Get QtyBatchSize. - @return QtyBatchSize */ - public BigDecimal getQtyBatchSize () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBatchSize); - if (bd == null) - return Env.ZERO; - return bd; - } - /** Set QtyBatchs. @param QtyBatchs QtyBatchs */ public void setQtyBatchs (BigDecimal QtyBatchs) @@ -1287,6 +1270,23 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return bd; } + /** Set QtyBatchSize. + @param QtyBatchSize QtyBatchSize */ + public void setQtyBatchSize (BigDecimal QtyBatchSize) + { + set_ValueNoCheck (COLUMNNAME_QtyBatchSize, QtyBatchSize); + } + + /** Get QtyBatchSize. + @return QtyBatchSize */ + public BigDecimal getQtyBatchSize () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBatchSize); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Delivered Quantity. @param QtyDelivered Delivered Quantity @@ -1409,44 +1409,6 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return bd; } - public I_S_Resource getS_Resource() throws Exception - { - Class clazz = MTable.getClass(I_S_Resource.Table_Name); - I_S_Resource result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_S_Resource)constructor.newInstance(new Object[] {getCtx(), new Integer(getS_Resource_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Resource. - @param S_Resource_ID - Resource - */ - public void setS_Resource_ID (int S_Resource_ID) - { - if (S_Resource_ID < 1) - throw new IllegalArgumentException ("S_Resource_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID)); - } - - /** Get Resource. - @return Resource - */ - public int getS_Resource_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Schedule Type. @param ScheduleType Type of schedule @@ -1493,6 +1455,44 @@ public class X_PP_Order extends PO implements I_PP_Order, I_Persistent return (String)get_Value(COLUMNNAME_SerNo); } + public I_S_Resource getS_Resource() throws Exception + { + Class clazz = MTable.getClass(I_S_Resource.Table_Name); + I_S_Resource result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_S_Resource)constructor.newInstance(new Object[] {getCtx(), new Integer(getS_Resource_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Resource. + @param S_Resource_ID + Resource + */ + public void setS_Resource_ID (int S_Resource_ID) + { + if (S_Resource_ID < 1) + throw new IllegalArgumentException ("S_Resource_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID)); + } + + /** Get Resource. + @return Resource + */ + public int getS_Resource_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** User1_ID AD_Reference_ID=134 */ public static final int USER1_ID_AD_Reference_ID=134; /** Set User List 1. diff --git a/base/src/org/eevolution/model/X_PP_Order_BOM.java b/base/src/org/eevolution/model/X_PP_Order_BOM.java index 2063ae6b8c..e7f0b46671 100644 --- a/base/src/org/eevolution/model/X_PP_Order_BOM.java +++ b/base/src/org/eevolution/model/X_PP_Order_BOM.java @@ -158,6 +158,29 @@ public class X_PP_Order_BOM extends PO implements I_PP_Order_BOM, I_Persistent return (String)get_Value(COLUMNNAME_BOMUse); } + /** Set Copy From. + @param CopyFrom + Copy From Record + */ + public void setCopyFrom (String CopyFrom) + { + + if (CopyFrom != null && CopyFrom.length() > 1) + { + log.warning("Length > 1 - truncated"); + CopyFrom = CopyFrom.substring(0, 1); + } + set_Value (COLUMNNAME_CopyFrom, CopyFrom); + } + + /** Get Copy From. + @return Copy From Record + */ + public String getCopyFrom () + { + return (String)get_Value(COLUMNNAME_CopyFrom); + } + public I_C_UOM getC_UOM() throws Exception { Class clazz = MTable.getClass(I_C_UOM.Table_Name); @@ -196,29 +219,6 @@ public class X_PP_Order_BOM extends PO implements I_PP_Order_BOM, I_Persistent return ii.intValue(); } - /** Set Copy From. - @param CopyFrom - Copy From Record - */ - public void setCopyFrom (String CopyFrom) - { - - if (CopyFrom != null && CopyFrom.length() > 1) - { - log.warning("Length > 1 - truncated"); - CopyFrom = CopyFrom.substring(0, 1); - } - set_Value (COLUMNNAME_CopyFrom, CopyFrom); - } - - /** Get Copy From. - @return Copy From Record - */ - public String getCopyFrom () - { - return (String)get_Value(COLUMNNAME_CopyFrom); - } - /** Set Description. @param Description Optional short description of the record diff --git a/base/src/org/eevolution/model/X_PP_Order_BOMLine.java b/base/src/org/eevolution/model/X_PP_Order_BOMLine.java index dfefd78427..fe8bfcdabf 100644 --- a/base/src/org/eevolution/model/X_PP_Order_BOMLine.java +++ b/base/src/org/eevolution/model/X_PP_Order_BOMLine.java @@ -50,11 +50,11 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers // @SQL=SELECT COALESCE(MAX(Line),0)+10 AS DefaultValue FROM PP_Order_BOMLine WHERE PP_Order_ID=@PP_Order_ID@ setM_Product_ID (0); setM_Warehouse_ID (0); - setPP_Order_BOMLine_ID (0); setPP_Order_BOM_ID (0); + setPP_Order_BOMLine_ID (0); setPP_Order_ID (0); - setQtyBOM (Env.ZERO); setQtyBatch (Env.ZERO); + setQtyBOM (Env.ZERO); setQtyDelivered (Env.ZERO); setQtyPost (Env.ZERO); setQtyReject (Env.ZERO); @@ -162,44 +162,6 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return (String)get_Value(COLUMNNAME_BackflushGroup); } - public I_C_UOM getC_UOM() throws Exception - { - Class clazz = MTable.getClass(I_C_UOM.Table_Name); - I_C_UOM result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_C_UOM)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_UOM_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set UOM. - @param C_UOM_ID - Unit of Measure - */ - public void setC_UOM_ID (int C_UOM_ID) - { - if (C_UOM_ID < 1) - throw new IllegalArgumentException ("C_UOM_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID)); - } - - /** Get UOM. - @return Unit of Measure - */ - public int getC_UOM_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** ComponentType AD_Reference_ID=53225 */ public static final int COMPONENTTYPE_AD_Reference_ID=53225; /** By Product = BY */ @@ -242,6 +204,44 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return (String)get_Value(COLUMNNAME_ComponentType); } + public I_C_UOM getC_UOM() throws Exception + { + Class clazz = MTable.getClass(I_C_UOM.Table_Name); + I_C_UOM result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_C_UOM)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_UOM_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set UOM. + @param C_UOM_ID + Unit of Measure + */ + public void setC_UOM_ID (int C_UOM_ID) + { + if (C_UOM_ID < 1) + throw new IllegalArgumentException ("C_UOM_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID)); + } + + /** Get UOM. + @return Unit of Measure + */ + public int getC_UOM_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Date Delivered. @param DateDelivered Date when the product was delivered @@ -635,25 +635,6 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return ii.intValue(); } - /** Set PP_Order_BOMLine_ID. - @param PP_Order_BOMLine_ID PP_Order_BOMLine_ID */ - public void setPP_Order_BOMLine_ID (int PP_Order_BOMLine_ID) - { - if (PP_Order_BOMLine_ID < 1) - throw new IllegalArgumentException ("PP_Order_BOMLine_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_PP_Order_BOMLine_ID, Integer.valueOf(PP_Order_BOMLine_ID)); - } - - /** Get PP_Order_BOMLine_ID. - @return PP_Order_BOMLine_ID */ - public int getPP_Order_BOMLine_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_BOMLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.eevolution.model.I_PP_Order_BOM getPP_Order_BOM() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Order_BOM.Table_Name); @@ -689,6 +670,25 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return ii.intValue(); } + /** Set PP_Order_BOMLine_ID. + @param PP_Order_BOMLine_ID PP_Order_BOMLine_ID */ + public void setPP_Order_BOMLine_ID (int PP_Order_BOMLine_ID) + { + if (PP_Order_BOMLine_ID < 1) + throw new IllegalArgumentException ("PP_Order_BOMLine_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_PP_Order_BOMLine_ID, Integer.valueOf(PP_Order_BOMLine_ID)); + } + + /** Get PP_Order_BOMLine_ID. + @return PP_Order_BOMLine_ID */ + public int getPP_Order_BOMLine_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_BOMLine_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.eevolution.model.I_PP_Order getPP_Order() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Order.Table_Name); @@ -724,28 +724,6 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return ii.intValue(); } - /** Set Quantity. - @param QtyBOM - Indicate the Quantity use in this BOM - */ - public void setQtyBOM (BigDecimal QtyBOM) - { - if (QtyBOM == null) - throw new IllegalArgumentException ("QtyBOM is mandatory."); - set_ValueNoCheck (COLUMNNAME_QtyBOM, QtyBOM); - } - - /** Get Quantity. - @return Indicate the Quantity use in this BOM - */ - public BigDecimal getQtyBOM () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBOM); - if (bd == null) - return Env.ZERO; - return bd; - } - /** Set Quantity %. @param QtyBatch Indicate the Quantity % use in this Formula @@ -768,6 +746,28 @@ public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Pers return bd; } + /** Set Quantity. + @param QtyBOM + Indicate the Quantity use in this BOM + */ + public void setQtyBOM (BigDecimal QtyBOM) + { + if (QtyBOM == null) + throw new IllegalArgumentException ("QtyBOM is mandatory."); + set_ValueNoCheck (COLUMNNAME_QtyBOM, QtyBOM); + } + + /** Get Quantity. + @return Indicate the Quantity use in this BOM + */ + public BigDecimal getQtyBOM () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBOM); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Delivered Quantity. @param QtyDelivered Delivered Quantity diff --git a/base/src/org/eevolution/model/X_PP_Order_BOMLineMA.java b/base/src/org/eevolution/model/X_PP_Order_BOMLineMA.java index 416959f4a7..b52c6f0f0f 100644 --- a/base/src/org/eevolution/model/X_PP_Order_BOMLineMA.java +++ b/base/src/org/eevolution/model/X_PP_Order_BOMLineMA.java @@ -44,8 +44,8 @@ public class X_PP_Order_BOMLineMA extends PO implements I_PP_Order_BOMLineMA, I_ { setM_AttributeSetInstance_ID (0); setMovementQty (Env.ZERO); - setPP_Order_BOMLineMA_ID (0); setPP_Order_BOMLine_ID (0); + setPP_Order_BOMLineMA_ID (0); } */ } @@ -121,25 +121,6 @@ public class X_PP_Order_BOMLineMA extends PO implements I_PP_Order_BOMLineMA, I_ return bd; } - /** Set PP_Order_BOMLineMA_ID. - @param PP_Order_BOMLineMA_ID PP_Order_BOMLineMA_ID */ - public void setPP_Order_BOMLineMA_ID (int PP_Order_BOMLineMA_ID) - { - if (PP_Order_BOMLineMA_ID < 1) - throw new IllegalArgumentException ("PP_Order_BOMLineMA_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_PP_Order_BOMLineMA_ID, Integer.valueOf(PP_Order_BOMLineMA_ID)); - } - - /** Get PP_Order_BOMLineMA_ID. - @return PP_Order_BOMLineMA_ID */ - public int getPP_Order_BOMLineMA_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_BOMLineMA_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.eevolution.model.I_PP_Order_BOMLine getPP_Order_BOMLine() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Order_BOMLine.Table_Name); @@ -174,4 +155,23 @@ public class X_PP_Order_BOMLineMA extends PO implements I_PP_Order_BOMLineMA, I_ return 0; return ii.intValue(); } + + /** Set PP_Order_BOMLineMA_ID. + @param PP_Order_BOMLineMA_ID PP_Order_BOMLineMA_ID */ + public void setPP_Order_BOMLineMA_ID (int PP_Order_BOMLineMA_ID) + { + if (PP_Order_BOMLineMA_ID < 1) + throw new IllegalArgumentException ("PP_Order_BOMLineMA_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_PP_Order_BOMLineMA_ID, Integer.valueOf(PP_Order_BOMLineMA_ID)); + } + + /** Get PP_Order_BOMLineMA_ID. + @return PP_Order_BOMLineMA_ID */ + public int getPP_Order_BOMLineMA_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_BOMLineMA_ID); + if (ii == null) + return 0; + return ii.intValue(); + } } \ No newline at end of file diff --git a/base/src/org/eevolution/model/X_PP_Order_Node.java b/base/src/org/eevolution/model/X_PP_Order_Node.java index cd13973323..91f447060c 100644 --- a/base/src/org/eevolution/model/X_PP_Order_Node.java +++ b/base/src/org/eevolution/model/X_PP_Order_Node.java @@ -44,10 +44,10 @@ public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent super (ctx, PP_Order_Node_ID, trxName); /** if (PP_Order_Node_ID == 0) { - setAD_WF_Node_ID (0); - setAD_Workflow_ID (0); setAction (null); // N + setAD_WF_Node_ID (0); + setAD_Workflow_ID (0); setCost (Env.ZERO); setEntityType (null); // U @@ -98,6 +98,56 @@ public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent return sb.toString(); } + /** Action AD_Reference_ID=302 */ + public static final int ACTION_AD_Reference_ID=302; + /** Wait (Sleep) = Z */ + public static final String ACTION_WaitSleep = "Z"; + /** User Choice = C */ + public static final String ACTION_UserChoice = "C"; + /** Sub Workflow = F */ + public static final String ACTION_SubWorkflow = "F"; + /** Set Variable = V */ + public static final String ACTION_SetVariable = "V"; + /** User Window = W */ + public static final String ACTION_UserWindow = "W"; + /** User Form = X */ + public static final String ACTION_UserForm = "X"; + /** Apps Task = T */ + public static final String ACTION_AppsTask = "T"; + /** Apps Report = R */ + public static final String ACTION_AppsReport = "R"; + /** Apps Process = P */ + public static final String ACTION_AppsProcess = "P"; + /** Document Action = D */ + public static final String ACTION_DocumentAction = "D"; + /** EMail = M */ + public static final String ACTION_EMail = "M"; + /** User Workbench = B */ + public static final String ACTION_UserWorkbench = "B"; + /** Set Action. + @param Action + Indicates the Action to be performed + */ + public void setAction (String Action) + { + if (Action == null) throw new IllegalArgumentException ("Action is mandatory"); + if (Action.equals("Z") || Action.equals("C") || Action.equals("F") || Action.equals("V") || Action.equals("W") || Action.equals("X") || Action.equals("T") || Action.equals("R") || Action.equals("P") || Action.equals("D") || Action.equals("M") || Action.equals("B")); else throw new IllegalArgumentException ("Action Invalid value - " + Action + " - Reference_ID=302 - Z - C - F - V - W - X - T - R - P - D - M - B"); + if (Action.length() > 1) + { + log.warning("Length > 1 - truncated"); + Action = Action.substring(0, 1); + } + set_Value (COLUMNNAME_Action, Action); + } + + /** Get Action. + @return Indicates the Action to be performed + */ + public String getAction () + { + return (String)get_Value(COLUMNNAME_Action); + } + public I_AD_Column getAD_Column() throws Exception { Class clazz = MTable.getClass(I_AD_Column.Table_Name); @@ -486,56 +536,6 @@ public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent return ii.intValue(); } - /** Action AD_Reference_ID=302 */ - public static final int ACTION_AD_Reference_ID=302; - /** Wait (Sleep) = Z */ - public static final String ACTION_WaitSleep = "Z"; - /** User Choice = C */ - public static final String ACTION_UserChoice = "C"; - /** Sub Workflow = F */ - public static final String ACTION_SubWorkflow = "F"; - /** Set Variable = V */ - public static final String ACTION_SetVariable = "V"; - /** User Window = W */ - public static final String ACTION_UserWindow = "W"; - /** User Form = X */ - public static final String ACTION_UserForm = "X"; - /** Apps Task = T */ - public static final String ACTION_AppsTask = "T"; - /** Apps Report = R */ - public static final String ACTION_AppsReport = "R"; - /** Apps Process = P */ - public static final String ACTION_AppsProcess = "P"; - /** Document Action = D */ - public static final String ACTION_DocumentAction = "D"; - /** EMail = M */ - public static final String ACTION_EMail = "M"; - /** User Workbench = B */ - public static final String ACTION_UserWorkbench = "B"; - /** Set Action. - @param Action - Indicates the Action to be performed - */ - public void setAction (String Action) - { - if (Action == null) throw new IllegalArgumentException ("Action is mandatory"); - if (Action.equals("Z") || Action.equals("C") || Action.equals("F") || Action.equals("V") || Action.equals("W") || Action.equals("X") || Action.equals("T") || Action.equals("R") || Action.equals("P") || Action.equals("D") || Action.equals("M") || Action.equals("B")); else throw new IllegalArgumentException ("Action Invalid value - " + Action + " - Reference_ID=302 - Z - C - F - V - W - X - T - R - P - D - M - B"); - if (Action.length() > 1) - { - log.warning("Length > 1 - truncated"); - Action = Action.substring(0, 1); - } - set_Value (COLUMNNAME_Action, Action); - } - - /** Get Action. - @return Indicates the Action to be performed - */ - public String getAction () - { - return (String)get_Value(COLUMNNAME_Action); - } - /** Set Attribute Name. @param AttributeName Name of the Attribute @@ -1341,45 +1341,6 @@ public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent return ii.intValue(); } - public I_S_Resource getS_Resource() throws Exception - { - Class clazz = MTable.getClass(I_S_Resource.Table_Name); - I_S_Resource result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_S_Resource)constructor.newInstance(new Object[] {getCtx(), new Integer(getS_Resource_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Resource. - @param S_Resource_ID - Resource - */ - public void setS_Resource_ID (int S_Resource_ID) - { - if (S_Resource_ID < 1) - set_Value (COLUMNNAME_S_Resource_ID, null); - else - set_Value (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID)); - } - - /** Get Resource. - @return Resource - */ - public int getS_Resource_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Setup Time. @param SetupTime Setup time before starting Production @@ -1464,6 +1425,45 @@ public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent return (String)get_Value(COLUMNNAME_SplitElement); } + public I_S_Resource getS_Resource() throws Exception + { + Class clazz = MTable.getClass(I_S_Resource.Table_Name); + I_S_Resource result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_S_Resource)constructor.newInstance(new Object[] {getCtx(), new Integer(getS_Resource_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Resource. + @param S_Resource_ID + Resource + */ + public void setS_Resource_ID (int S_Resource_ID) + { + if (S_Resource_ID < 1) + set_Value (COLUMNNAME_S_Resource_ID, null); + else + set_Value (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID)); + } + + /** Get Resource. + @return Resource + */ + public int getS_Resource_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** StartMode AD_Reference_ID=303 */ public static final int STARTMODE_AD_Reference_ID=303; /** Automatic = A */ diff --git a/base/src/org/eevolution/model/X_PP_Order_NodeNext.java b/base/src/org/eevolution/model/X_PP_Order_NodeNext.java index d95d544833..5d543c7e27 100644 --- a/base/src/org/eevolution/model/X_PP_Order_NodeNext.java +++ b/base/src/org/eevolution/model/X_PP_Order_NodeNext.java @@ -270,26 +270,6 @@ public class X_PP_Order_NodeNext extends PO implements I_PP_Order_NodeNext, I_Pe return ii.intValue(); } - /** Set PP_Order_NodeNext_ID. - @param PP_Order_NodeNext_ID PP_Order_NodeNext_ID */ - public void setPP_Order_NodeNext_ID (int PP_Order_NodeNext_ID) - { - if (PP_Order_NodeNext_ID < 1) - set_ValueNoCheck (COLUMNNAME_PP_Order_NodeNext_ID, null); - else - set_ValueNoCheck (COLUMNNAME_PP_Order_NodeNext_ID, Integer.valueOf(PP_Order_NodeNext_ID)); - } - - /** Get PP_Order_NodeNext_ID. - @return PP_Order_NodeNext_ID */ - public int getPP_Order_NodeNext_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_NodeNext_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.eevolution.model.I_PP_Order_Node getPP_Order_Node() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Order_Node.Table_Name); @@ -325,6 +305,26 @@ public class X_PP_Order_NodeNext extends PO implements I_PP_Order_NodeNext, I_Pe return ii.intValue(); } + /** Set PP_Order_NodeNext_ID. + @param PP_Order_NodeNext_ID PP_Order_NodeNext_ID */ + public void setPP_Order_NodeNext_ID (int PP_Order_NodeNext_ID) + { + if (PP_Order_NodeNext_ID < 1) + set_ValueNoCheck (COLUMNNAME_PP_Order_NodeNext_ID, null); + else + set_ValueNoCheck (COLUMNNAME_PP_Order_NodeNext_ID, Integer.valueOf(PP_Order_NodeNext_ID)); + } + + /** Get PP_Order_NodeNext_ID. + @return PP_Order_NodeNext_ID */ + public int getPP_Order_NodeNext_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_PP_Order_NodeNext_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** SeqNo AD_Reference_ID=110 */ public static final int SEQNO_AD_Reference_ID=110; /** Set Sequence. diff --git a/base/src/org/eevolution/model/X_PP_Order_Workflow.java b/base/src/org/eevolution/model/X_PP_Order_Workflow.java index c363ea2d24..261027d809 100644 --- a/base/src/org/eevolution/model/X_PP_Order_Workflow.java +++ b/base/src/org/eevolution/model/X_PP_Order_Workflow.java @@ -44,8 +44,8 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe super (ctx, PP_Order_Workflow_ID, trxName); /** if (PP_Order_Workflow_ID == 0) { - setAD_Workflow_ID (0); setAccessLevel (null); + setAD_Workflow_ID (0); setAuthor (null); setCost (0); setDuration (0); @@ -95,6 +95,44 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return sb.toString(); } + /** AccessLevel AD_Reference_ID=5 */ + public static final int ACCESSLEVEL_AD_Reference_ID=5; + /** Organization = 1 */ + public static final String ACCESSLEVEL_Organization = "1"; + /** Client+Organization = 3 */ + public static final String ACCESSLEVEL_ClientPlusOrganization = "3"; + /** System only = 4 */ + public static final String ACCESSLEVEL_SystemOnly = "4"; + /** All = 7 */ + public static final String ACCESSLEVEL_All = "7"; + /** System+Client = 6 */ + public static final String ACCESSLEVEL_SystemPlusClient = "6"; + /** Client only = 2 */ + public static final String ACCESSLEVEL_ClientOnly = "2"; + /** Set Data Access Level. + @param AccessLevel + Access Level required + */ + public void setAccessLevel (String AccessLevel) + { + if (AccessLevel == null) throw new IllegalArgumentException ("AccessLevel is mandatory"); + if (AccessLevel.equals("1") || AccessLevel.equals("3") || AccessLevel.equals("4") || AccessLevel.equals("7") || AccessLevel.equals("6") || AccessLevel.equals("2")); else throw new IllegalArgumentException ("AccessLevel Invalid value - " + AccessLevel + " - Reference_ID=5 - 1 - 3 - 4 - 7 - 6 - 2"); + if (AccessLevel.length() > 1) + { + log.warning("Length > 1 - truncated"); + AccessLevel = AccessLevel.substring(0, 1); + } + set_Value (COLUMNNAME_AccessLevel, AccessLevel); + } + + /** Get Data Access Level. + @return Access Level required + */ + public String getAccessLevel () + { + return (String)get_Value(COLUMNNAME_AccessLevel); + } + public I_AD_Table getAD_Table() throws Exception { Class clazz = MTable.getClass(I_AD_Table.Table_Name); @@ -212,45 +250,6 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return ii.intValue(); } - public I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws Exception - { - Class clazz = MTable.getClass(I_AD_WorkflowProcessor.Table_Name); - I_AD_WorkflowProcessor result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_AD_WorkflowProcessor)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_WorkflowProcessor_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Workflow Processor. - @param AD_WorkflowProcessor_ID - Workflow Processor Server - */ - public void setAD_WorkflowProcessor_ID (int AD_WorkflowProcessor_ID) - { - if (AD_WorkflowProcessor_ID < 1) - set_Value (COLUMNNAME_AD_WorkflowProcessor_ID, null); - else - set_Value (COLUMNNAME_AD_WorkflowProcessor_ID, Integer.valueOf(AD_WorkflowProcessor_ID)); - } - - /** Get Workflow Processor. - @return Workflow Processor Server - */ - public int getAD_WorkflowProcessor_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_WorkflowProcessor_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_AD_Workflow getAD_Workflow() throws Exception { Class clazz = MTable.getClass(I_AD_Workflow.Table_Name); @@ -289,42 +288,43 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return ii.intValue(); } - /** AccessLevel AD_Reference_ID=5 */ - public static final int ACCESSLEVEL_AD_Reference_ID=5; - /** Organization = 1 */ - public static final String ACCESSLEVEL_Organization = "1"; - /** Client+Organization = 3 */ - public static final String ACCESSLEVEL_ClientPlusOrganization = "3"; - /** System only = 4 */ - public static final String ACCESSLEVEL_SystemOnly = "4"; - /** All = 7 */ - public static final String ACCESSLEVEL_All = "7"; - /** System+Client = 6 */ - public static final String ACCESSLEVEL_SystemPlusClient = "6"; - /** Client only = 2 */ - public static final String ACCESSLEVEL_ClientOnly = "2"; - /** Set Data Access Level. - @param AccessLevel - Access Level required + public I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws Exception + { + Class clazz = MTable.getClass(I_AD_WorkflowProcessor.Table_Name); + I_AD_WorkflowProcessor result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_AD_WorkflowProcessor)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_WorkflowProcessor_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Workflow Processor. + @param AD_WorkflowProcessor_ID + Workflow Processor Server */ - public void setAccessLevel (String AccessLevel) + public void setAD_WorkflowProcessor_ID (int AD_WorkflowProcessor_ID) { - if (AccessLevel == null) throw new IllegalArgumentException ("AccessLevel is mandatory"); - if (AccessLevel.equals("1") || AccessLevel.equals("3") || AccessLevel.equals("4") || AccessLevel.equals("7") || AccessLevel.equals("6") || AccessLevel.equals("2")); else throw new IllegalArgumentException ("AccessLevel Invalid value - " + AccessLevel + " - Reference_ID=5 - 1 - 3 - 4 - 7 - 6 - 2"); - if (AccessLevel.length() > 1) - { - log.warning("Length > 1 - truncated"); - AccessLevel = AccessLevel.substring(0, 1); - } - set_Value (COLUMNNAME_AccessLevel, AccessLevel); + if (AD_WorkflowProcessor_ID < 1) + set_Value (COLUMNNAME_AD_WorkflowProcessor_ID, null); + else + set_Value (COLUMNNAME_AD_WorkflowProcessor_ID, Integer.valueOf(AD_WorkflowProcessor_ID)); } - /** Get Data Access Level. - @return Access Level required + /** Get Workflow Processor. + @return Workflow Processor Server */ - public String getAccessLevel () + public int getAD_WorkflowProcessor_ID () { - return (String)get_Value(COLUMNNAME_AccessLevel); + Integer ii = (Integer)get_Value(COLUMNNAME_AD_WorkflowProcessor_ID); + if (ii == null) + return 0; + return ii.intValue(); } /** Set Author. @@ -831,6 +831,26 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return ii.intValue(); } + /** Set Setup Time. + @param SetupTime + Setup time before starting Production + */ + public void setSetupTime (int SetupTime) + { + set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime)); + } + + /** Get Setup Time. + @return Setup time before starting Production + */ + public int getSetupTime () + { + Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime); + if (ii == null) + return 0; + return ii.intValue(); + } + public I_S_Resource getS_Resource() throws Exception { Class clazz = MTable.getClass(I_S_Resource.Table_Name); @@ -870,24 +890,26 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return ii.intValue(); } - /** Set Setup Time. - @param SetupTime - Setup time before starting Production - */ - public void setSetupTime (int SetupTime) + /** Set Validate Workflow. + @param ValidateWorkflow Validate Workflow */ + public void setValidateWorkflow (String ValidateWorkflow) { - set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime)); + if (ValidateWorkflow == null) + throw new IllegalArgumentException ("ValidateWorkflow is mandatory."); + + if (ValidateWorkflow.length() > 1) + { + log.warning("Length > 1 - truncated"); + ValidateWorkflow = ValidateWorkflow.substring(0, 1); + } + set_Value (COLUMNNAME_ValidateWorkflow, ValidateWorkflow); } - /** Get Setup Time. - @return Setup time before starting Production - */ - public int getSetupTime () + /** Get Validate Workflow. + @return Validate Workflow */ + public String getValidateWorkflow () { - Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime); - if (ii == null) - return 0; - return ii.intValue(); + return (String)get_Value(COLUMNNAME_ValidateWorkflow); } /** Set Valid from. @@ -924,28 +946,6 @@ public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Pe return (Timestamp)get_Value(COLUMNNAME_ValidTo); } - /** Set Validate Workflow. - @param ValidateWorkflow Validate Workflow */ - public void setValidateWorkflow (String ValidateWorkflow) - { - if (ValidateWorkflow == null) - throw new IllegalArgumentException ("ValidateWorkflow is mandatory."); - - if (ValidateWorkflow.length() > 1) - { - log.warning("Length > 1 - truncated"); - ValidateWorkflow = ValidateWorkflow.substring(0, 1); - } - set_Value (COLUMNNAME_ValidateWorkflow, ValidateWorkflow); - } - - /** Get Validate Workflow. - @return Validate Workflow */ - public String getValidateWorkflow () - { - return (String)get_Value(COLUMNNAME_ValidateWorkflow); - } - /** Set Search Key. @param Value Search key for the record in the format required - must be unique diff --git a/base/src/org/eevolution/model/X_PP_Product_BOM.java b/base/src/org/eevolution/model/X_PP_Product_BOM.java index 932813f06d..04a13e8485 100644 --- a/base/src/org/eevolution/model/X_PP_Product_BOM.java +++ b/base/src/org/eevolution/model/X_PP_Product_BOM.java @@ -18,11 +18,13 @@ package org.eevolution.model; import java.lang.reflect.Constructor; +import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Properties; import java.util.logging.Level; import org.compiere.model.*; +import org.compiere.util.Env; import org.compiere.util.KeyNamePair; /** Generated Model for PP_Product_BOM @@ -79,6 +81,25 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return sb.toString(); } + /** Set Amount. + @param Amt + Amount + */ + public void setAmt (BigDecimal Amt) + { + throw new IllegalArgumentException ("Amt is virtual column"); } + + /** Get Amount. + @return Amount + */ + public BigDecimal getAmt () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Amt); + if (bd == null) + return Env.ZERO; + return bd; + } + /** BOMType AD_Reference_ID=347 */ public static final int BOMTYPE_AD_Reference_ID=347; /** Current Active = A */ @@ -157,6 +178,49 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return (String)get_Value(COLUMNNAME_BOMUse); } + /** Set Copy From. + @param CopyFrom + Copy From Record + */ + public void setCopyFrom (String CopyFrom) + { + + if (CopyFrom != null && CopyFrom.length() > 1) + { + log.warning("Length > 1 - truncated"); + CopyFrom = CopyFrom.substring(0, 1); + } + set_Value (COLUMNNAME_CopyFrom, CopyFrom); + } + + /** Get Copy From. + @return Copy From Record + */ + public String getCopyFrom () + { + return (String)get_Value(COLUMNNAME_CopyFrom); + } + + /** Set Cost. + @param Cost + Cost information + */ + public void setCost (BigDecimal Cost) + { + set_Value (COLUMNNAME_Cost, Cost); + } + + /** Get Cost. + @return Cost information + */ + public BigDecimal getCost () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Cost); + if (bd == null) + return Env.ZERO; + return bd; + } + public I_C_UOM getC_UOM() throws Exception { Class clazz = MTable.getClass(I_C_UOM.Table_Name); @@ -196,29 +260,6 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return ii.intValue(); } - /** Set Copy From. - @param CopyFrom - Copy From Record - */ - public void setCopyFrom (String CopyFrom) - { - - if (CopyFrom != null && CopyFrom.length() > 1) - { - log.warning("Length > 1 - truncated"); - CopyFrom = CopyFrom.substring(0, 1); - } - set_Value (COLUMNNAME_CopyFrom, CopyFrom); - } - - /** Get Copy From. - @return Copy From Record - */ - public String getCopyFrom () - { - return (String)get_Value(COLUMNNAME_CopyFrom); - } - /** Set Description. @param Description Optional short description of the record @@ -288,6 +329,25 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return (String)get_Value(COLUMNNAME_Help); } + /** Set Margin %. + @param Margin + Margin for a product as a percentage + */ + public void setMargin (BigDecimal Margin) + { + throw new IllegalArgumentException ("Margin is virtual column"); } + + /** Get Margin %. + @return Margin for a product as a percentage + */ + public BigDecimal getMargin () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Margin); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Attribute Set Instance. @param M_AttributeSetInstance_ID Product Attribute Set Instance @@ -350,6 +410,45 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return ii.intValue(); } + public I_M_PriceList_Version getM_PriceList_Version() throws Exception + { + Class clazz = MTable.getClass(I_M_PriceList_Version.Table_Name); + I_M_PriceList_Version result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_M_PriceList_Version)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_PriceList_Version_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Price List Version. + @param M_PriceList_Version_ID + Identifies a unique instance of a Price List + */ + public void setM_PriceList_Version_ID (int M_PriceList_Version_ID) + { + if (M_PriceList_Version_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_PriceList_Version_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_PriceList_Version_ID, Integer.valueOf(M_PriceList_Version_ID)); + } + + /** Get Price List Version. + @return Identifies a unique instance of a Price List + */ + public int getM_PriceList_Version_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_PriceList_Version_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public I_M_Product getM_Product() throws Exception { Class clazz = MTable.getClass(I_M_Product.Table_Name); @@ -435,6 +534,26 @@ public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persiste return ii.intValue(); } + /** Set Price. + @param Price + Price + */ + public void setPrice (BigDecimal Price) + { + set_Value (COLUMNNAME_Price, Price); + } + + /** Get Price. + @return Price + */ + public BigDecimal getPrice () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Price); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Process Now. @param Processing Process Now */ public void setProcessing (boolean Processing) diff --git a/base/src/org/eevolution/model/X_PP_Product_BOMLine.java b/base/src/org/eevolution/model/X_PP_Product_BOMLine.java index 90ce2b85d3..ea310c29ce 100644 --- a/base/src/org/eevolution/model/X_PP_Product_BOMLine.java +++ b/base/src/org/eevolution/model/X_PP_Product_BOMLine.java @@ -48,8 +48,8 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ setLine (0); // @SQL=SELECT COALESCE(MAX(Line),0)+10 AS DefaultValue FROM PP_Product_BOMLine WHERE PP_Product_BOM_ID=@PP_Product_BOM_ID@ setM_Product_ID (0); - setPP_Product_BOMLine_ID (0); setPP_Product_BOM_ID (0); + setPP_Product_BOMLine_ID (0); setValidFrom (new Timestamp(System.currentTimeMillis())); // @#Date@ } */ @@ -126,45 +126,6 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ return (String)get_Value(COLUMNNAME_BackflushGroup); } - public I_C_UOM getC_UOM() throws Exception - { - Class clazz = MTable.getClass(I_C_UOM.Table_Name); - I_C_UOM result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_C_UOM)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_UOM_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set UOM. - @param C_UOM_ID - Unit of Measure - */ - public void setC_UOM_ID (int C_UOM_ID) - { - if (C_UOM_ID < 1) - set_Value (COLUMNNAME_C_UOM_ID, null); - else - set_Value (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID)); - } - - /** Get UOM. - @return Unit of Measure - */ - public int getC_UOM_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** ComponentType AD_Reference_ID=53225 */ public static final int COMPONENTTYPE_AD_Reference_ID=53225; /** By Product = BY */ @@ -207,6 +168,45 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ return (String)get_Value(COLUMNNAME_ComponentType); } + public I_C_UOM getC_UOM() throws Exception + { + Class clazz = MTable.getClass(I_C_UOM.Table_Name); + I_C_UOM result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_C_UOM)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_UOM_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set UOM. + @param C_UOM_ID + Unit of Measure + */ + public void setC_UOM_ID (int C_UOM_ID) + { + if (C_UOM_ID < 1) + set_Value (COLUMNNAME_C_UOM_ID, null); + else + set_Value (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID)); + } + + /** Get UOM. + @return Unit of Measure + */ + public int getC_UOM_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Description. @param Description Optional short description of the record @@ -514,28 +514,6 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ return ii.intValue(); } - /** Set BOM Line. - @param PP_Product_BOMLine_ID - BOM Line - */ - public void setPP_Product_BOMLine_ID (int PP_Product_BOMLine_ID) - { - if (PP_Product_BOMLine_ID < 1) - throw new IllegalArgumentException ("PP_Product_BOMLine_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_PP_Product_BOMLine_ID, Integer.valueOf(PP_Product_BOMLine_ID)); - } - - /** Get BOM Line. - @return BOM Line - */ - public int getPP_Product_BOMLine_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_PP_Product_BOMLine_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.eevolution.model.I_PP_Product_BOM getPP_Product_BOM() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Product_BOM.Table_Name); @@ -574,24 +552,26 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ return ii.intValue(); } - /** Set Quantity. - @param QtyBOM - Indicate the Quantity use in this BOM + /** Set BOM Line. + @param PP_Product_BOMLine_ID + BOM Line */ - public void setQtyBOM (BigDecimal QtyBOM) + public void setPP_Product_BOMLine_ID (int PP_Product_BOMLine_ID) { - set_Value (COLUMNNAME_QtyBOM, QtyBOM); + if (PP_Product_BOMLine_ID < 1) + throw new IllegalArgumentException ("PP_Product_BOMLine_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_PP_Product_BOMLine_ID, Integer.valueOf(PP_Product_BOMLine_ID)); } - /** Get Quantity. - @return Indicate the Quantity use in this BOM + /** Get BOM Line. + @return BOM Line */ - public BigDecimal getQtyBOM () + public int getPP_Product_BOMLine_ID () { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBOM); - if (bd == null) - return Env.ZERO; - return bd; + Integer ii = (Integer)get_Value(COLUMNNAME_PP_Product_BOMLine_ID); + if (ii == null) + return 0; + return ii.intValue(); } /** Set Quantity %. @@ -614,6 +594,26 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ return bd; } + /** Set Quantity. + @param QtyBOM + Indicate the Quantity use in this BOM + */ + public void setQtyBOM (BigDecimal QtyBOM) + { + set_Value (COLUMNNAME_QtyBOM, QtyBOM); + } + + /** Get Quantity. + @return Indicate the Quantity use in this BOM + */ + public BigDecimal getQtyBOM () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBOM); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Scrap. @param Scrap Indicate the Scrap Quantity that is generate in a manufacturing process @@ -669,4 +669,20 @@ public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_ { return (Timestamp)get_Value(COLUMNNAME_ValidTo); } + + /** Set Search Key. + @param Value + Search key for the record in the format required - must be unique + */ + public void setValue (String Value) + { + throw new IllegalArgumentException ("Value is virtual column"); } + + /** Get Search Key. + @return Search key for the record in the format required - must be unique + */ + public String getValue () + { + return (String)get_Value(COLUMNNAME_Value); + } } \ No newline at end of file diff --git a/base/src/org/eevolution/model/X_PP_Product_Planning.java b/base/src/org/eevolution/model/X_PP_Product_Planning.java index 75bffad6bf..8188082867 100644 --- a/base/src/org/eevolution/model/X_PP_Product_Planning.java +++ b/base/src/org/eevolution/model/X_PP_Product_Planning.java @@ -366,9 +366,9 @@ public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, public void setM_Warehouse_ID (int M_Warehouse_ID) { if (M_Warehouse_ID < 1) - set_ValueNoCheck (COLUMNNAME_M_Warehouse_ID, null); + set_Value (COLUMNNAME_M_Warehouse_ID, null); else - set_ValueNoCheck (COLUMNNAME_M_Warehouse_ID, Integer.valueOf(M_Warehouse_ID)); + set_Value (COLUMNNAME_M_Warehouse_ID, Integer.valueOf(M_Warehouse_ID)); } /** Get Warehouse. @@ -502,6 +502,28 @@ public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, return bd; } + /** Planner_ID AD_Reference_ID=110 */ + public static final int PLANNER_ID_AD_Reference_ID=110; + /** Set Planner. + @param Planner_ID Planner */ + public void setPlanner_ID (int Planner_ID) + { + if (Planner_ID < 1) + set_Value (COLUMNNAME_Planner_ID, null); + else + set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); + } + + /** Get Planner. + @return Planner */ + public int getPlanner_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.eevolution.model.I_PP_Product_BOM getPP_Product_BOM() throws Exception { Class clazz = MTable.getClass(org.eevolution.model.I_PP_Product_BOM.Table_Name); @@ -560,26 +582,24 @@ public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, return ii.intValue(); } - /** Planner_ID AD_Reference_ID=110 */ - public static final int PLANNER_ID_AD_Reference_ID=110; - /** Set Planner. - @param Planner_ID Planner */ - public void setPlanner_ID (int Planner_ID) + /** Set Safety Stock Qty. + @param SafetyStock + Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs + */ + public void setSafetyStock (BigDecimal SafetyStock) { - if (Planner_ID < 1) - set_Value (COLUMNNAME_Planner_ID, null); - else - set_Value (COLUMNNAME_Planner_ID, Integer.valueOf(Planner_ID)); + set_Value (COLUMNNAME_SafetyStock, SafetyStock); } - /** Get Planner. - @return Planner */ - public int getPlanner_ID () + /** Get Safety Stock Qty. + @return Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs + */ + public BigDecimal getSafetyStock () { - Integer ii = (Integer)get_Value(COLUMNNAME_Planner_ID); - if (ii == null) - return 0; - return ii.intValue(); + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_SafetyStock); + if (bd == null) + return Env.ZERO; + return bd; } public I_S_Resource getS_Resource() throws Exception @@ -621,26 +641,6 @@ public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, return ii.intValue(); } - /** Set Safety Stock Qty. - @param SafetyStock - Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs - */ - public void setSafetyStock (BigDecimal SafetyStock) - { - set_Value (COLUMNNAME_SafetyStock, SafetyStock); - } - - /** Get Safety Stock Qty. - @return Safety stock is a term used to describe a level of stock that is maintained below the cycle stock to buffer against stock-outs - */ - public BigDecimal getSafetyStock () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_SafetyStock); - if (bd == null) - return Env.ZERO; - return bd; - } - /** Set Time Fence. @param TimeFence Time Fence */ public void setTimeFence (BigDecimal TimeFence) diff --git a/base/src/org/eevolution/model/X_PP_WF_Node_Asset.java b/base/src/org/eevolution/model/X_PP_WF_Node_Asset.java index 8596976393..fdfd5349bd 100644 --- a/base/src/org/eevolution/model/X_PP_WF_Node_Asset.java +++ b/base/src/org/eevolution/model/X_PP_WF_Node_Asset.java @@ -40,8 +40,8 @@ public class X_PP_WF_Node_Asset extends PO implements I_PP_WF_Node_Asset, I_Pers super (ctx, PP_WF_Node_Asset_ID, trxName); /** if (PP_WF_Node_Asset_ID == 0) { - setAD_WF_Node_ID (0); setA_Asset_ID (0); + setAD_WF_Node_ID (0); setPP_WF_Node_Asset_ID (0); } */ } @@ -74,44 +74,6 @@ public class X_PP_WF_Node_Asset extends PO implements I_PP_WF_Node_Asset, I_Pers return sb.toString(); } - public I_AD_WF_Node getAD_WF_Node() throws Exception - { - Class clazz = MTable.getClass(I_AD_WF_Node.Table_Name); - I_AD_WF_Node result = null; - try { - Constructor constructor = null; - constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); - result = (I_AD_WF_Node)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_WF_Node_ID()), get_TrxName()}); - } catch (Exception e) { - log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); - log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); - throw e; - } - return result; - } - - /** Set Node. - @param AD_WF_Node_ID - Workflow Node (activity), step or process - */ - public void setAD_WF_Node_ID (int AD_WF_Node_ID) - { - if (AD_WF_Node_ID < 1) - throw new IllegalArgumentException ("AD_WF_Node_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_AD_WF_Node_ID, Integer.valueOf(AD_WF_Node_ID)); - } - - /** Get Node. - @return Workflow Node (activity), step or process - */ - public int getAD_WF_Node_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_WF_Node_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_A_Asset getA_Asset() throws Exception { Class clazz = MTable.getClass(I_A_Asset.Table_Name); @@ -150,6 +112,44 @@ public class X_PP_WF_Node_Asset extends PO implements I_PP_WF_Node_Asset, I_Pers return ii.intValue(); } + public I_AD_WF_Node getAD_WF_Node() throws Exception + { + Class clazz = MTable.getClass(I_AD_WF_Node.Table_Name); + I_AD_WF_Node result = null; + try { + Constructor constructor = null; + constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class}); + result = (I_AD_WF_Node)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_WF_Node_ID()), get_TrxName()}); + } catch (Exception e) { + log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); + log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); + throw e; + } + return result; + } + + /** Set Node. + @param AD_WF_Node_ID + Workflow Node (activity), step or process + */ + public void setAD_WF_Node_ID (int AD_WF_Node_ID) + { + if (AD_WF_Node_ID < 1) + throw new IllegalArgumentException ("AD_WF_Node_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_AD_WF_Node_ID, Integer.valueOf(AD_WF_Node_ID)); + } + + /** Get Node. + @return Workflow Node (activity), step or process + */ + public int getAD_WF_Node_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_WF_Node_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set PP_WF_Node_Asset_ID. @param PP_WF_Node_Asset_ID PP_WF_Node_Asset_ID */ public void setPP_WF_Node_Asset_ID (int PP_WF_Node_Asset_ID) diff --git a/base/src/org/eevolution/model/X_QM_Specification.java b/base/src/org/eevolution/model/X_QM_Specification.java index 5ada81635b..6506ceacce 100644 --- a/base/src/org/eevolution/model/X_QM_Specification.java +++ b/base/src/org/eevolution/model/X_QM_Specification.java @@ -26,7 +26,7 @@ import org.compiere.model.*; /** Generated Model for QM_Specification * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_QM_Specification extends PO implements I_QM_Specification, I_Persistent { diff --git a/base/src/org/eevolution/model/X_QM_SpecificationLine.java b/base/src/org/eevolution/model/X_QM_SpecificationLine.java index d603a16b4d..bc09f5fdf1 100644 --- a/base/src/org/eevolution/model/X_QM_SpecificationLine.java +++ b/base/src/org/eevolution/model/X_QM_SpecificationLine.java @@ -26,7 +26,7 @@ import org.compiere.model.*; /** Generated Model for QM_SpecificationLine * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_QM_SpecificationLine extends PO implements I_QM_SpecificationLine, I_Persistent { diff --git a/base/src/org/eevolution/model/X_RV_PP_WIP.java b/base/src/org/eevolution/model/X_RV_PP_WIP.java index ab8cb29f2a..9349a45e4b 100644 --- a/base/src/org/eevolution/model/X_RV_PP_WIP.java +++ b/base/src/org/eevolution/model/X_RV_PP_WIP.java @@ -19,10 +19,7 @@ package org.eevolution.model; import java.sql.ResultSet; import java.util.Properties; - -import org.compiere.model.I_Persistent; -import org.compiere.model.PO; -import org.compiere.model.POInfo; +import org.compiere.model.*; /** Generated Model for RV_PP_WIP * @author Adempiere (generated) diff --git a/base/src/org/eevolution/model/X_T_MRP_CRP.java b/base/src/org/eevolution/model/X_T_MRP_CRP.java index 3900b152bc..d39db7dd68 100644 --- a/base/src/org/eevolution/model/X_T_MRP_CRP.java +++ b/base/src/org/eevolution/model/X_T_MRP_CRP.java @@ -25,7 +25,7 @@ import org.compiere.model.*; /** Generated Model for T_MRP_CRP * @author Adempiere (generated) - * @version Release 3.5.1a - $Id$ */ + * @version Release 3.5.0 - $Id$ */ public class X_T_MRP_CRP extends PO implements I_T_MRP_CRP, I_Persistent { diff --git a/base/src/org/eevolution/process/InvoiceCalculateTax.java b/base/src/org/eevolution/process/InvoiceCalculateTax.java index df08f883d6..7c2a59fa00 100644 --- a/base/src/org/eevolution/process/InvoiceCalculateTax.java +++ b/base/src/org/eevolution/process/InvoiceCalculateTax.java @@ -11,8 +11,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * For the text or an alternative of this public license, you may reach us * * Copyright (C) 2003-2007 e-Evolution,SC. All Rights Reserved. * - * Contributor(s): Victor Perez www.e-evolution.com */ - + * Contributor(s): Victor Perez www.e-evolution.com * + *****************************************************************************/ package org.eevolution.process; diff --git a/base/src/org/eevolution/process/MRP.java b/base/src/org/eevolution/process/MRP.java index 4fbedac74b..f3da7f8215 100644 --- a/base/src/org/eevolution/process/MRP.java +++ b/base/src/org/eevolution/process/MRP.java @@ -202,14 +202,14 @@ public class MRP extends SvrProcess * @param M_Warehouse_ID Warehouse ID * @return false if exist an error */ - public boolean deleteMRP(int AD_Client_ID, int AD_Org_ID, int M_Warehouse_ID) + public boolean deleteMRP(int AD_Client_ID, int AD_Org_ID,int S_Resource_ID, int M_Warehouse_ID) { // Delete Manufacturing Order with Close Status from MRP Table - String sql = "DELETE FROM PP_MRP WHERE TypeMRP = 'MOP' AND DocStatus='CL' AND AD_Client_ID=" + AD_Client_ID + " AND AD_Org_ID=" + AD_Org_ID + " AND M_Warehouse_ID="+M_Warehouse_ID; + String sql = "DELETE FROM PP_MRP WHERE OrderType = 'MOP' AND DocStatus='CL' AND AD_Client_ID=" + AD_Client_ID + " AND AD_Org_ID=" + AD_Org_ID + " AND M_Warehouse_ID="+M_Warehouse_ID + " AND S_Resource_ID="+S_Resource_ID ; DB.executeUpdate(sql, get_TrxName()); // Delete Requisition with Status Close from MRP Table - sql = "DELETE FROM PP_MRP WHERE TypeMRP = 'POR' AND DocStatus='CL' AND AD_Client_ID = " + AD_Client_ID + " AND AD_Org_ID=" + AD_Org_ID+ " AND M_Warehouse_ID="+M_Warehouse_ID; + sql = "DELETE FROM PP_MRP WHERE OrderType = 'POR' AND DocStatus='CL' AND AD_Client_ID = " + AD_Client_ID + " AND AD_Org_ID=" + AD_Org_ID+ " AND M_Warehouse_ID="+M_Warehouse_ID + " AND S_Resource_ID="+S_Resource_ID; DB.executeUpdate(sql, get_TrxName()); // Delete Action Notice @@ -247,14 +247,15 @@ public class MRP extends SvrProcess return false; } //Delete Manufacturing Order with Draft Status - sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = ? AND AD_Org_ID=? AND M_Warehouse_ID=?"; + sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = ? AND AD_Org_ID=? AND M_Warehouse_ID=? AND S_Resource_ID=?"; try { PreparedStatement pstmt = null; pstmt = DB.prepareStatement (sql , get_TrxName()); pstmt.setInt(1, AD_Client_ID); pstmt.setInt(2, AD_Org_ID); - pstmt.setInt(3, M_Warehouse_ID); + pstmt.setInt(3, M_Warehouse_ID); + pstmt.setInt(4, S_Resource_ID); ResultSet rs = pstmt.executeQuery(); while (rs.next()) { @@ -315,7 +316,7 @@ public class MRP extends SvrProcess public String runMRP(int AD_Client_ID , int AD_Org_ID, int S_Resource_ID , int M_Warehouse_ID) { // Deleted Old record - deleteMRP(AD_Client_ID,AD_Org_ID,M_Warehouse_ID); + deleteMRP(AD_Client_ID,AD_Org_ID,S_Resource_ID,M_Warehouse_ID); try { //String sql = "SELECT LowLevel FROM PP_MRP mrp INNER JOIN M_Product p ON (p.M_Product_ID = mrp.M_Product_ID) WHERE mrp.M_Warehouse_ID = ? ORDER BY p.LowLevel DESC "; @@ -329,7 +330,7 @@ public class MRP extends SvrProcess Timestamp DateStartSchedule = null; Timestamp BeforeDateStartSchedule = null; Timestamp POQDateStartSchedule = null; - DB.executeUpdate("UPDATE PP_MRP SET IsAvailable ='Y' WHERE Type = 'S' AND AD_Client_ID = " + AD_Client_ID+" AND AD_Org_ID=" + AD_Org_ID + " AND M_Warehouse_ID=" + M_Warehouse_ID ,get_TrxName()); + DB.executeUpdate("UPDATE PP_MRP SET IsAvailable ='Y' WHERE TypeMRP = 'S' AND AD_Client_ID = " + AD_Client_ID+" AND AD_Org_ID=" + AD_Org_ID + " AND M_Warehouse_ID=" + M_Warehouse_ID ,get_TrxName()); //String Order_Policy = MPPProductPlanning.ORDER_POLICY_LoteForLote; @@ -343,10 +344,10 @@ public class MRP extends SvrProcess { log.info("Current Level Is :" + Level); - sql = "SELECT p.M_Product_ID ,p.Name , p.LowLevel , mrp.Qty , mrp.DatePromised, mrp.Type , mrp.TypeMRP , mrp.DateOrdered , mrp.M_Warehouse_ID , mrp.PP_MRP_ID , mrp.DateStartSchedule , mrp.DateFinishSchedule" + sql = "SELECT p.M_Product_ID ,p.Name , p.LowLevel , mrp.Qty , mrp.DatePromised, mrp.TypeMRP , mrp.OrderType , mrp.DateOrdered , mrp.M_Warehouse_ID , mrp.PP_MRP_ID , mrp.DateStartSchedule , mrp.DateFinishSchedule" +" FROM PP_MRP mrp" +" INNER JOIN M_Product p ON (p.M_Product_ID = mrp.M_Product_ID)" - +" WHERE mrp.Type='D' AND mrp.AD_Client_ID = ? AND mrp.AD_Org_ID=? AND M_Warehouse_ID=? AND " + +" WHERE mrp.TypeMRP='D' AND mrp.AD_Client_ID = ? AND mrp.AD_Org_ID=? AND M_Warehouse_ID=? AND " +" mrp.DatePromised <= ? AND COALESCE(p.LowLevel,0) = ? " +" ORDER BY p.LowLevel DESC , p.M_Product_ID , mrp.DatePromised "; pstmt = DB.prepareStatement (sql, get_TrxName()); @@ -359,14 +360,14 @@ public class MRP extends SvrProcess while (rs.next()) { - String Type = rs.getString("Type"); String TypeMRP = rs.getString("TypeMRP"); + String OrderType = rs.getString("OrderType"); //Set Global Variable DatePromised = rs.getTimestamp("DatePromised"); DateStartSchedule = rs.getTimestamp("DateStartSchedule"); // if demand is a forecast and this is minor today then is ignore this QtyGrossReq - if (Type.equals("D") && TypeMRP.equals("FCT") && DatePromised.compareTo(Today) <= 0) + if (MPPMRP.TYPEMRP_Demand.equals(TypeMRP) && MPPMRP.ORDERTYPE_Forecast.equals(OrderType) && DatePromised.compareTo(Today) <= 0) { continue; } @@ -583,7 +584,7 @@ public class MRP extends SvrProcess //result.append("-------------------- -------------------------------------------\n"); //result.append(" Due Date Gross Reqs Sched Rcpt Project On Hand Order Plan \n"); QtyScheduledReceipts = Env.ZERO; //get Supply this Product - String sql= "SELECT mrp.PP_MRP_ID , mrp.Qty FROM PP_MRP mrp WHERE mrp.DocStatus = 'CO' AND mrp.IsAvailable = 'Y' AND mrp.Type = 'S' AND mrp.M_Product_ID = " + m_product_planning.getM_Product_ID() + " AND mrp.AD_Client_ID = " + AD_Client_ID + " AND mrp.AD_Org_ID="+ AD_Org_ID + " AND M_Warehouse_ID="+m_product_planning.getM_Warehouse_ID(); + String sql= "SELECT mrp.PP_MRP_ID , mrp.Qty FROM PP_MRP mrp WHERE mrp.DocStatus = 'CO' AND mrp.IsAvailable = 'Y' AND mrp.TypeMRP = 'S' AND mrp.M_Product_ID = " + m_product_planning.getM_Product_ID() + " AND mrp.AD_Client_ID = " + AD_Client_ID + " AND mrp.AD_Org_ID="+ AD_Org_ID + " AND M_Warehouse_ID="+m_product_planning.getM_Warehouse_ID(); //System.out.println(sqlsupply); try { @@ -778,26 +779,27 @@ public class MRP extends SvrProcess // Try found some order with Shipper , Business Partner and Doc Status = Draft // Consolidate the demand in a single order for each Shipper , Business Partner , DemandDateStartSchedule String date = DB.TO_DATE(DemandDateStartSchedule); - order = (MDDOrder) MTable.get(getCtx(), MDDOrder.Table_Name).getPO("M_Shipper_ID ="+M_Shipper_ID+" AND C_BPartner_ID="+bp.getC_BPartner_ID() +" AND DatePromised=" + date + " AND DocStatus='DR'", get_TrxName()); + order = (MDDOrder) MTable.get(getCtx(), MDDOrder.Table_Name).getPO("M_Shipper_ID ="+network_line.getM_Shipper_ID()+" AND C_BPartner_ID="+bp.getC_BPartner_ID() +" AND DatePromised=" + date + " AND DocStatus='DR'", get_TrxName()); if (order==null) + { order = new MDDOrder(getCtx() , 0 , get_TrxName()); - - order.setAD_Org_ID(target.getAD_Org_ID()); - order.setDocumentNo(MSequence.getDocumentNo(DocTypeDO,get_TrxName(),false)); - order.setC_BPartner_ID(C_BPartner_ID); - //order.setAD_User_ID(bp.getPrimaryAD_User_ID()); - order.setAD_User_ID(m_product_planning.getPlanner_ID()); - order.setC_DocType_ID(DocTypeDO); - order.setM_Warehouse_ID(wsts[0].getM_Warehouse_ID()); - order.setDocAction(MDDOrder.DOCACTION_Complete); - order.setDateOrdered(Today); - order.setDatePromised(DemandDateStartSchedule); - order.setM_Shipper_ID(network_line.getM_Shipper_ID()); - order.setIsInDispute(false); - order.setIsInTransit(false); - //order.setSalesRep_ID(m_product_planning.getPlanner_ID()); - order.setSalesRep_ID(bp.getPrimaryAD_User_ID()); - order.save(); + order.setAD_Org_ID(target.getAD_Org_ID()); + order.setDocumentNo(MSequence.getDocumentNo(DocTypeDO,get_TrxName(),false)); + order.setC_BPartner_ID(C_BPartner_ID); + //order.setAD_User_ID(bp.getPrimaryAD_User_ID()); + order.setAD_User_ID(m_product_planning.getPlanner_ID()); + order.setC_DocType_ID(DocTypeDO); + order.setM_Warehouse_ID(wsts[0].getM_Warehouse_ID()); + order.setDocAction(MDDOrder.DOCACTION_Complete); + order.setDateOrdered(Today); + order.setDatePromised(DemandDateStartSchedule); + order.setM_Shipper_ID(network_line.getM_Shipper_ID()); + order.setIsInDispute(false); + order.setIsInTransit(false); + //order.setSalesRep_ID(m_product_planning.getPlanner_ID()); + order.setSalesRep_ID(bp.getPrimaryAD_User_ID()); + order.save(); + } M_Shipper_ID = network_line.getM_Shipper_ID(); } @@ -825,7 +827,8 @@ public class MRP extends SvrProcess { log.info("Set Correct Dates for Plan"); MPPMRP mrp = new MPPMRP(getCtx(),rs,get_TrxName()); - mrp.setDateOrdered(Today); + mrp.setDateOrdered(Today); + mrp.setS_Resource_ID(p_S_Resource_ID); mrp.setDatePromised(TimeUtil.addDays(DemandDateStartSchedule , (m_product_planning.getDeliveryTime_Promised().add(transfertTime)).negate().intValue()));; mrp.setDateFinishSchedule(DemandDateStartSchedule); mrp.save(); @@ -943,7 +946,7 @@ public class MRP extends SvrProcess order.setPosted(false); order.setProcessed(false); order.setYield(Env.ZERO); - order.setScheduleType("D"); + order.setScheduleType(MPPMRP.TYPEMRP_Demand); order.setPriorityRule(MPPOrder.PRIORITYRULE_Medium); order.setDocStatus(MPPOrder.DOCSTATUS_Drafted); order.setDocAction(MPPOrder.DOCSTATUS_Completed); diff --git a/base/src/org/eevolution/process/MRPUpdate.java b/base/src/org/eevolution/process/MRPUpdate.java index 6f91e0e20d..f615c16423 100644 --- a/base/src/org/eevolution/process/MRPUpdate.java +++ b/base/src/org/eevolution/process/MRPUpdate.java @@ -114,19 +114,23 @@ public class MRPUpdate extends SvrProcess public boolean deleteRecord(int AD_Client_ID,int AD_Org_ID, int S_Resource_ID, int M_Warehouse_ID) { String where = ""; + String resourcewhere = ""; if (AD_Org_ID > 0 ) where += " AND AD_Org_ID=" + AD_Org_ID; if (M_Warehouse_ID > 0 ) where += " AND M_Warehouse_ID=" + M_Warehouse_ID; + + if (S_Resource_ID > 0 ) + resourcewhere = " AND S_Resource_ID=" + S_Resource_ID; - String sql = "DELETE FROM PP_MRP WHERE TypeMRP = 'MOP' AND AD_Client_ID=" + m_AD_Client_ID + where; + String sql = "DELETE FROM PP_MRP WHERE OrderType = 'MOP' AND AD_Client_ID=" + m_AD_Client_ID + where + resourcewhere; if(DB.executeUpdate(sql, get_TrxName()) < 0) return false; - sql = "DELETE FROM PP_MRP mrp WHERE mrp.TypeMRP = 'FCT' AND mrp.AD_Client_ID = " + m_AD_Client_ID+ where; + sql = "DELETE FROM PP_MRP mrp WHERE mrp.OrderType = 'FCT' AND mrp.AD_Client_ID = " + m_AD_Client_ID+ where + resourcewhere; if(DB.executeUpdate(sql,get_TrxName()) < 0) return false; - sql = "DELETE FROM PP_MRP mrp WHERE mrp.TypeMRP = 'POR' AND mrp.AD_Client_ID = " + m_AD_Client_ID + where; + sql = "DELETE FROM PP_MRP mrp WHERE mrp.OrderType = 'POR' AND mrp.AD_Client_ID = " + m_AD_Client_ID + where + resourcewhere; if(DB.executeUpdate(sql,get_TrxName()) < 0) return false; if (AD_Org_ID > 0 ) @@ -137,9 +141,9 @@ public class MRPUpdate extends SvrProcess if(DB.executeUpdate(sql, get_TrxName()) < 0) return false; if(S_Resource_ID> 0) - sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = " + m_AD_Client_ID + " AND S_Resource_ID=" + S_Resource_ID + where; + sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = " + m_AD_Client_ID + " AND S_Resource_ID=" + S_Resource_ID + where; else - sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = " + m_AD_Client_ID + where; + sql = "SELECT o.PP_Order_ID FROM PP_Order o WHERE o.DocStatus = 'DR' AND o.AD_Client_ID = " + m_AD_Client_ID + where; PreparedStatement pstmt = null; ResultSet rs = null; @@ -215,8 +219,8 @@ public class MRPUpdate extends SvrProcess +"m_requisition_id,m_requisitionline_id," +"m_product_id, m_warehouse_id, " +"pp_mrp_id, planner_id, " - +"qty, type, typemrp, updated, updatedby, value, " - +"ad_client_id )"; + +"qty, typemrp, ordertype, updated, updatedby, value, " + +"ad_client_id, s_resource_id )"; //Insert from M_ForecastLine String sql_insert = " SELECT t.ad_org_id," +"t.created, t.createdby , t.datepromised," @@ -227,10 +231,11 @@ public class MRPUpdate extends SvrProcess + "null, null," + "null, null," +"t.m_product_id, t.m_warehouse_id," - +"nextidfunc(53040, 'N'), null," + +"nextid(53040,'N') , null," +"t.qty, 'D', 'FCT', t.updated, t.updatedby, f.Name," - +"t.ad_client_id " - +"FROM M_ForecastLine t INNER JOIN M_Forecast f ON (f.M_Forecast_ID=t.M_Forecast_ID) WHERE t.Qty > 0 AND t.AD_Client_ID="+ AD_Client_ID; + +"t.ad_client_id , " + + S_Resource_ID + +" FROM M_ForecastLine t INNER JOIN M_Forecast f ON (f.M_Forecast_ID=t.M_Forecast_ID) WHERE t.Qty > 0 AND t.AD_Client_ID="+ AD_Client_ID; String where = ""; @@ -251,13 +256,13 @@ public class MRPUpdate extends SvrProcess +" null, null, " +" null, null, " +"t.m_product_id, t.m_warehouse_id," - +"nextidfunc(53040, 'N'), null," + +"nextid(53040,'N') , null," +"t.QtyOrdered-t.QtyDelivered, 'S', 'MOP', t.updated, t.updatedby, t.DocumentNo," - +"t.ad_client_id "; + +"t.ad_client_id ,t.S_Resource_ID "; if(S_Resource_ID > 0) - sql_insert += "FROM PP_Order t WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND t.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID + " AND S_Resource_ID=" + S_Resource_ID ; + sql_insert += " FROM PP_Order t WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND t.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID + " AND S_Resource_ID=" + S_Resource_ID ; else - sql_insert += "FROM PP_Order t WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND t.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID ; + sql_insert += " FROM PP_Order t WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND t.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID ; if(DB.executeUpdate(sql + sql_insert + where , get_TrxName()) < 0) return false; @@ -271,9 +276,9 @@ public class MRPUpdate extends SvrProcess +" null, null, " +" null, null, " +"t.m_product_id, t.m_warehouse_id," - +"nextidfunc(53040, 'N'), null," + +"nextid(53040,'N') , null," +"t.QtyRequiered-t.QtyDelivered, 'D', 'MOP', t.updated, t.updatedby, o.DocumentNo," - +"t.ad_client_id "; + +"t.ad_client_id, o.S_Resource_ID "; if(S_Resource_ID > 0) sql_insert += "FROM PP_Order_BOMLine t INNER JOIN PP_Order o ON (o.pp_order_id=t.pp_order_id) WHERE (t.QtyRequiered-t.QtyDelivered) <> 0 AND o.DocStatus IN ('DR','IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID + " AND S_Resource_ID=" + S_Resource_ID ; @@ -292,10 +297,11 @@ public class MRPUpdate extends SvrProcess +" t.c_order_id, t.c_orderline_id, " +" null, null, " +"t.m_product_id, t.m_warehouse_id," - +"nextidfunc(53040, 'N'), null," + +"nextid(53040,'N') , null," +"t.QtyOrdered-t.QtyDelivered, 'D', 'MOP', t.updated, t.updatedby, o.DocumentNo," - +"t.ad_client_id " - +"FROM C_OrderLine t INNER JOIN C_Order o ON (o.c_order_id=t.c_order_id) WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND o.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID; + +"t.ad_client_id ," + +S_Resource_ID + +" FROM C_OrderLine t INNER JOIN C_Order o ON (o.c_order_id=t.c_order_id) WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND o.DocStatus IN ('IP','CO') AND t.AD_Client_ID = " + m_AD_Client_ID; if(DB.executeUpdate(sql + sql_insert + where , get_TrxName()) < 0) return false; @@ -309,10 +315,11 @@ public class MRPUpdate extends SvrProcess +" null, null, " +"rl.m_requisition_id, rl.m_requisitionline_id, " +"rl.m_product_id, t.m_warehouse_id," - +"nextidfunc(53040, 'N'), null," + +"nextid(53040,'N') , null," +"rl.Qty, 'S', 'POR', rl.updated, rl.updatedby, t.DocumentNo," - +"rl.ad_client_id " - +"FROM M_RequisitionLine rl INNER JOIN M_Requisition t ON (rl.m_requisition_id=t.m_requisition_id) WHERE rl.Qty > 0 AND t.DocStatus IN ('CL') AND t.AD_Client_ID = " + m_AD_Client_ID; + +"rl.ad_client_id , " + + S_Resource_ID + +" FROM M_RequisitionLine rl INNER JOIN M_Requisition t ON (rl.m_requisition_id=t.m_requisition_id) WHERE rl.Qty > 0 AND t.DocStatus IN ('CL') AND t.AD_Client_ID = " + m_AD_Client_ID; if(DB.executeUpdate(sql + sql_insert + where , get_TrxName()) < 0) return false;