From 4ceda4ce93d2aa841ab239222ef4270e00d34de9 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 21 Aug 2012 18:53:37 -0500 Subject: [PATCH] IDEMPIERE-246 Integrate Manufacturing Light --- ...EMPIERE-246_Manufacturing_Light_fixes.sql} | 0 ...EMPIERE-246_Manufacturing_Light_fixes.sql} | 0 .../src/org/compiere/process/IndentedBOM.java | 6 +- .../process/OrderLineCreateProduction.java | 12 +- .../process/OrderLineCreateShipment.java | 10 +- .../src/org/compiere/model/I_M_PartType.java | 144 +++++++++ .../src/org/compiere/model/I_M_Product.java | 109 ++++++- .../org/compiere/model/I_M_Production.java | 150 +++++++++- .../compiere/model/I_M_ProductionLine.java | 91 +++++- .../compiere/model/I_M_ProductionLineMA.java | 13 +- .../compiere/model/I_M_ProductionPlan.java | 15 +- .../src/org/compiere/model/I_M_Replenish.java | 28 +- .../src/org/compiere/model/X_M_PartType.java | 126 ++++++++ .../src/org/compiere/model/X_M_Product.java | 199 +++++++++++-- .../org/compiere/model/X_M_Production.java | 279 ++++++++++++++++-- .../compiere/model/X_M_ProductionLine.java | 168 ++++++++++- .../compiere/model/X_M_ProductionLineMA.java | 20 +- .../compiere/model/X_M_ProductionPlan.java | 24 +- .../src/org/compiere/model/X_M_Replenish.java | 49 ++- .../adempiere/webui/apps/form/WTreeBOM.java | 27 +- .../src/org/compiere/apps/form/TreeBOM.java | 0 21 files changed, 1327 insertions(+), 143 deletions(-) rename migration/360lts-release/oracle/{883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere => 883_IDEMPIERE-246_Manufacturing_Light_fixes.sql} (100%) rename migration/360lts-release/postgresql/{883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere => 883_IDEMPIERE-246_Manufacturing_Light_fixes.sql} (100%) create mode 100644 org.adempiere.base/src/org/compiere/model/I_M_PartType.java create mode 100644 org.adempiere.base/src/org/compiere/model/X_M_PartType.java rename {org.adempiere.ui.swing => org.adempiere.ui}/src/org/compiere/apps/form/TreeBOM.java (100%) diff --git a/migration/360lts-release/oracle/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere b/migration/360lts-release/oracle/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql similarity index 100% rename from migration/360lts-release/oracle/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere rename to migration/360lts-release/oracle/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql diff --git a/migration/360lts-release/postgresql/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere b/migration/360lts-release/postgresql/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql similarity index 100% rename from migration/360lts-release/postgresql/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql.idempiere rename to migration/360lts-release/postgresql/883_IDEMPIERE-246_Manufacturing_Light_fixes.sql diff --git a/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java b/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java index 69855e666f..ad2e11baad 100644 --- a/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java +++ b/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.logging.Level; import org.adempiere.exceptions.FillMandatoryException; -import org.apache.commons.lang.StringUtils; import org.compiere.model.MAcctSchema; import org.compiere.model.MCost; import org.compiere.model.MCostElement; @@ -121,7 +120,10 @@ public class IndentedBOM extends SvrProcess // tboml.setSeqNo(m_SeqNo); tboml.setLevelNo(m_LevelNo); - tboml.setLevels( (m_LevelNo > 0 ? ":" : "") + StringUtils.repeat(" ", m_LevelNo) +" " + product.getValue()); + String pad = ""; + if (m_LevelNo > 0) + pad = String.format("%1$" + 4*1 + "s", ""); + tboml.setLevels( (m_LevelNo > 0 ? ":" : "") + pad +" " + product.getValue()); // // Set Costs: MCost cost = MCost.get(product, 0, m_as, p_AD_Org_ID, p_M_CostElement_ID, get_TrxName()); diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateProduction.java b/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateProduction.java index 9650a3d1f8..60aa4febfe 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateProduction.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateProduction.java @@ -17,12 +17,14 @@ package org.compiere.process; import java.sql.Timestamp; -import java.util.logging.*; +import java.util.logging.Level; -import org.apache.commons.net.ntp.TimeStamp; -import org.compiere.model.*; -import org.compiere.process.ProcessInfoParameter; -import org.compiere.process.SvrProcess; +import org.compiere.model.MDocType; +import org.compiere.model.MOrder; +import org.compiere.model.MOrderLine; +import org.compiere.model.MProduct; +import org.compiere.model.MProduction; +import org.compiere.model.MWarehouse; import org.compiere.util.DB; import org.compiere.util.Env; diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateShipment.java b/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateShipment.java index 637139fc72..e40193136e 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateShipment.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderLineCreateShipment.java @@ -17,12 +17,12 @@ package org.compiere.process; import java.sql.Timestamp; -import java.util.logging.*; +import java.util.logging.Level; -import org.apache.commons.net.ntp.TimeStamp; -import org.compiere.model.*; -import org.compiere.process.ProcessInfoParameter; -import org.compiere.process.SvrProcess; +import org.compiere.model.MInOut; +import org.compiere.model.MInOutLine; +import org.compiere.model.MOrder; +import org.compiere.model.MOrderLine; import org.compiere.util.DB; import org.compiere.util.Env; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PartType.java b/org.adempiere.base/src/org/compiere/model/I_M_PartType.java new file mode 100644 index 0000000000..9ef6406627 --- /dev/null +++ b/org.adempiere.base/src/org/compiere/model/I_M_PartType.java @@ -0,0 +1,144 @@ +/****************************************************************************** + * Product: Adempiere ERP & CRM Smart Business Solution * + * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved. * + * This program is free software, you can redistribute it and/or modify it * + * under the terms version 2 of the GNU General Public License as published * + * by the Free Software Foundation. This program is distributed in the hope * + * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied * + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License along * + * with this program, if not, write to the Free Software Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * + * For the text or an alternative of this public license, you may reach us * + * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * + * or via info@compiere.org or http://www.compiere.org/license.html * + *****************************************************************************/ +package org.compiere.model; + +import java.math.BigDecimal; +import java.sql.Timestamp; +import org.compiere.util.KeyNamePair; + +/** Generated Interface for M_PartType + * @author Adempiere (generated) + * @version Release 3.6.0LTS + */ +public interface I_M_PartType +{ + + /** TableName=M_PartType */ + public static final String Table_Name = "M_PartType"; + + /** AD_Table_ID=53334 */ + public static final int Table_ID = 53334; + + KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); + + /** AccessLevel = 3 - Client - Org + */ + BigDecimal accessLevel = BigDecimal.valueOf(3); + + /** Load Meta Data */ + + /** Column name AD_Client_ID */ + public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; + + /** Get Client. + * Client/Tenant for this installation. + */ + public int getAD_Client_ID(); + + /** Column name AD_Org_ID */ + public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; + + /** Set Organization. + * Organizational entity within client + */ + public void setAD_Org_ID (int AD_Org_ID); + + /** Get Organization. + * Organizational entity within client + */ + public int getAD_Org_ID(); + + /** Column name Created */ + public static final String COLUMNNAME_Created = "Created"; + + /** Get Created. + * Date this record was created + */ + public Timestamp getCreated(); + + /** Column name CreatedBy */ + public static final String COLUMNNAME_CreatedBy = "CreatedBy"; + + /** Get Created By. + * User who created this records + */ + public int getCreatedBy(); + + /** Column name Description */ + public static final String COLUMNNAME_Description = "Description"; + + /** Set Description. + * Optional short description of the record + */ + public void setDescription (String Description); + + /** Get Description. + * Optional short description of the record + */ + public String getDescription(); + + /** Column name IsActive */ + public static final String COLUMNNAME_IsActive = "IsActive"; + + /** Set Active. + * The record is active in the system + */ + public void setIsActive (boolean IsActive); + + /** Get Active. + * The record is active in the system + */ + public boolean isActive(); + + /** Column name M_PartType_ID */ + public static final String COLUMNNAME_M_PartType_ID = "M_PartType_ID"; + + /** Set Part Type */ + public void setM_PartType_ID (int M_PartType_ID); + + /** Get Part Type */ + public int getM_PartType_ID(); + + /** Column name Name */ + public static final String COLUMNNAME_Name = "Name"; + + /** Set Name. + * Alphanumeric identifier of the entity + */ + public void setName (String Name); + + /** Get Name. + * Alphanumeric identifier of the entity + */ + public String getName(); + + /** Column name Updated */ + public static final String COLUMNNAME_Updated = "Updated"; + + /** Get Updated. + * Date this record was updated + */ + public Timestamp getUpdated(); + + /** Column name UpdatedBy */ + public static final String COLUMNNAME_UpdatedBy = "UpdatedBy"; + + /** Get Updated By. + * User who updated this records + */ + public int getUpdatedBy(); +} diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product.java b/org.adempiere.base/src/org/compiere/model/I_M_Product.java index c819943092..42f146445b 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Product.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Product.java @@ -31,7 +31,7 @@ public interface I_M_Product public static final String Table_Name = "M_Product"; /** AD_Table_ID=208 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 208; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -75,6 +75,32 @@ public interface I_M_Product */ public String getClassification(); + /** 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 CostStandard */ + public static final String COLUMNNAME_CostStandard = "CostStandard"; + + /** Set Standard Cost. + * Standard Costs + */ + public void setCostStandard (BigDecimal CostStandard); + + /** Get Standard Cost. + * Standard Costs + */ + public BigDecimal getCostStandard(); + /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -104,7 +130,7 @@ public interface I_M_Product */ public int getC_RevenueRecognition_ID(); - public I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException; + public org.compiere.model.I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException; /** Column name C_SubscriptionType_ID */ public static final String COLUMNNAME_C_SubscriptionType_ID = "C_SubscriptionType_ID"; @@ -119,7 +145,7 @@ public interface I_M_Product */ public int getC_SubscriptionType_ID(); - public I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException; + public org.compiere.model.I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException; /** Column name C_TaxCategory_ID */ public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID"; @@ -134,7 +160,7 @@ public interface I_M_Product */ public int getC_TaxCategory_ID(); - public I_C_TaxCategory getC_TaxCategory() throws RuntimeException; + public org.compiere.model.I_C_TaxCategory getC_TaxCategory() throws RuntimeException; /** Column name C_UOM_ID */ public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID"; @@ -149,7 +175,7 @@ public interface I_M_Product */ public int getC_UOM_ID(); - public I_C_UOM getC_UOM() throws RuntimeException; + public org.compiere.model.I_C_UOM getC_UOM() throws RuntimeException; /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -351,6 +377,45 @@ public interface I_M_Product */ public boolean isInvoicePrintDetails(); + /** Column name IsKanban */ + public static final String COLUMNNAME_IsKanban = "IsKanban"; + + /** Set Kanban controlled. + * This part is Kanban controlled + */ + public void setIsKanban (boolean IsKanban); + + /** Get Kanban controlled. + * This part is Kanban controlled + */ + public boolean isKanban(); + + /** Column name IsManufactured */ + public static final String COLUMNNAME_IsManufactured = "IsManufactured"; + + /** Set Manufactured. + * This product is manufactured + */ + public void setIsManufactured (boolean IsManufactured); + + /** Get Manufactured. + * This product is manufactured + */ + public boolean isManufactured(); + + /** Column name IsPhantom */ + public static final String COLUMNNAME_IsPhantom = "IsPhantom"; + + /** Set Phantom. + * Phantom Component + */ + public void setIsPhantom (boolean IsPhantom); + + /** Get Phantom. + * Phantom Component + */ + public boolean isPhantom(); + /** Column name IsPickListPrintDetails */ public static final String COLUMNNAME_IsPickListPrintDetails = "IsPickListPrintDetails"; @@ -481,7 +546,7 @@ public interface I_M_Product */ public int getM_AttributeSet_ID(); - public I_M_AttributeSet getM_AttributeSet() throws RuntimeException; + public org.compiere.model.I_M_AttributeSet getM_AttributeSet() throws RuntimeException; /** Column name M_AttributeSetInstance_ID */ public static final String COLUMNNAME_M_AttributeSetInstance_ID = "M_AttributeSetInstance_ID"; @@ -511,7 +576,7 @@ public interface I_M_Product */ public int getM_FreightCategory_ID(); - public I_M_FreightCategory getM_FreightCategory() throws RuntimeException; + public org.compiere.model.I_M_FreightCategory getM_FreightCategory() throws RuntimeException; /** Column name M_Locator_ID */ public static final String COLUMNNAME_M_Locator_ID = "M_Locator_ID"; @@ -528,6 +593,17 @@ public interface I_M_Product public I_M_Locator getM_Locator() throws RuntimeException; + /** Column name M_PartType_ID */ + public static final String COLUMNNAME_M_PartType_ID = "M_PartType_ID"; + + /** Set Part Type */ + public void setM_PartType_ID (int M_PartType_ID); + + /** Get Part Type */ + public int getM_PartType_ID(); + + public I_M_PartType getM_PartType() throws RuntimeException; + /** Column name M_Product_Category_ID */ public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID"; @@ -541,7 +617,7 @@ public interface I_M_Product */ public int getM_Product_Category_ID(); - public I_M_Product_Category getM_Product_Category() throws RuntimeException; + public org.compiere.model.I_M_Product_Category getM_Product_Category() throws RuntimeException; /** Column name M_Product_ID */ public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; @@ -556,6 +632,15 @@ public interface I_M_Product */ public int getM_Product_ID(); + /** Column name M_Product_UU */ + public static final String COLUMNNAME_M_Product_UU = "M_Product_UU"; + + /** Set M_Product_UU */ + public void setM_Product_UU (String M_Product_UU); + + /** Get M_Product_UU */ + public String getM_Product_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -604,7 +689,7 @@ public interface I_M_Product */ public int getR_MailText_ID(); - public I_R_MailText getR_MailText() throws RuntimeException; + public org.compiere.model.I_R_MailText getR_MailText() throws RuntimeException; /** Column name SalesRep_ID */ public static final String COLUMNNAME_SalesRep_ID = "SalesRep_ID"; @@ -619,7 +704,7 @@ public interface I_M_Product */ public int getSalesRep_ID(); - public I_AD_User getSalesRep() throws RuntimeException; + public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException; /** Column name S_ExpenseType_ID */ public static final String COLUMNNAME_S_ExpenseType_ID = "S_ExpenseType_ID"; @@ -634,7 +719,7 @@ public interface I_M_Product */ public int getS_ExpenseType_ID(); - public I_S_ExpenseType getS_ExpenseType() throws RuntimeException; + public org.compiere.model.I_S_ExpenseType getS_ExpenseType() throws RuntimeException; /** Column name ShelfDepth */ public static final String COLUMNNAME_ShelfDepth = "ShelfDepth"; @@ -701,7 +786,7 @@ public interface I_M_Product */ public int getS_Resource_ID(); - public I_S_Resource getS_Resource() throws RuntimeException; + public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException; /** Column name UnitsPerPack */ public static final String COLUMNNAME_UnitsPerPack = "UnitsPerPack"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Production.java b/org.adempiere.base/src/org/compiere/model/I_M_Production.java index a5a00f2e40..ffeab15838 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Production.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Production.java @@ -31,7 +31,7 @@ public interface I_M_Production public static final String Table_Name = "M_Production"; /** AD_Table_ID=325 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 325; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -88,7 +88,22 @@ public interface I_M_Production */ public int getC_Activity_ID(); - public I_C_Activity getC_Activity() throws RuntimeException; + public org.compiere.model.I_C_Activity getC_Activity() throws RuntimeException; + + /** Column name C_BPartner_ID */ + public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID"; + + /** Set Business Partner . + * Identifies a Business Partner + */ + public void setC_BPartner_ID (int C_BPartner_ID); + + /** Get Business Partner . + * Identifies a Business Partner + */ + public int getC_BPartner_ID(); + + public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException; /** Column name C_Campaign_ID */ public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID"; @@ -103,7 +118,22 @@ public interface I_M_Production */ public int getC_Campaign_ID(); - public I_C_Campaign getC_Campaign() throws RuntimeException; + public org.compiere.model.I_C_Campaign getC_Campaign() throws RuntimeException; + + /** 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 org.compiere.model.I_C_OrderLine getC_OrderLine() throws RuntimeException; /** Column name C_Project_ID */ public static final String COLUMNNAME_C_Project_ID = "C_Project_ID"; @@ -118,7 +148,7 @@ public interface I_M_Production */ public int getC_Project_ID(); - public I_C_Project getC_Project() throws RuntimeException; + public org.compiere.model.I_C_Project getC_Project() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -136,6 +166,32 @@ public interface I_M_Production */ public int getCreatedBy(); + /** Column name CreateFrom */ + public static final String COLUMNNAME_CreateFrom = "CreateFrom"; + + /** Set Create lines from. + * Process which will generate a new document lines based on an existing document + */ + public void setCreateFrom (String CreateFrom); + + /** Get Create lines from. + * Process which will generate a new document lines based on an existing document + */ + public String getCreateFrom(); + + /** Column name DatePromised */ + public static final String COLUMNNAME_DatePromised = "DatePromised"; + + /** Set Date Promised. + * Date Order was promised + */ + public void setDatePromised (Timestamp DatePromised); + + /** Get Date Promised. + * Date Order was promised + */ + public Timestamp getDatePromised(); + /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -149,6 +205,19 @@ public interface I_M_Production */ public String getDescription(); + /** Column name DocumentNo */ + public static final String COLUMNNAME_DocumentNo = "DocumentNo"; + + /** Set Document No. + * Document sequence number of the document + */ + public void setDocumentNo (String DocumentNo); + + /** Get Document No. + * Document sequence number of the document + */ + public String getDocumentNo(); + /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; @@ -162,14 +231,42 @@ public interface I_M_Production */ public boolean isActive(); + /** Column name IsComplete */ + public static final String COLUMNNAME_IsComplete = "IsComplete"; + + /** Set Complete. + * It is complete + */ + public void setIsComplete (String IsComplete); + + /** Get Complete. + * It is complete + */ + public String getIsComplete(); + /** Column name IsCreated */ public static final String COLUMNNAME_IsCreated = "IsCreated"; /** Set Records created */ - public void setIsCreated (boolean IsCreated); + public void setIsCreated (String IsCreated); /** Get Records created */ - public boolean isCreated(); + public String getIsCreated(); + + /** Column name M_Locator_ID */ + public static final String COLUMNNAME_M_Locator_ID = "M_Locator_ID"; + + /** Set Locator. + * Warehouse Locator + */ + public void setM_Locator_ID (int M_Locator_ID); + + /** Get Locator. + * Warehouse Locator + */ + public int getM_Locator_ID(); + + public I_M_Locator getM_Locator() throws RuntimeException; /** Column name MovementDate */ public static final String COLUMNNAME_MovementDate = "MovementDate"; @@ -184,6 +281,21 @@ public interface I_M_Production */ public Timestamp getMovementDate(); + /** 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 org.compiere.model.I_M_Product getM_Product() throws RuntimeException; + /** Column name M_Production_ID */ public static final String COLUMNNAME_M_Production_ID = "M_Production_ID"; @@ -197,6 +309,15 @@ public interface I_M_Production */ public int getM_Production_ID(); + /** Column name M_Production_UU */ + public static final String COLUMNNAME_M_Production_UU = "M_Production_UU"; + + /** Set M_Production_UU */ + public void setM_Production_UU (String M_Production_UU); + + /** Get M_Production_UU */ + public String getM_Production_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -258,6 +379,19 @@ public interface I_M_Production /** Get Process Now */ public boolean isProcessing(); + /** Column name ProductionQty */ + public static final String COLUMNNAME_ProductionQty = "ProductionQty"; + + /** Set Production Quantity. + * Quantity of products to produce + */ + public void setProductionQty (BigDecimal ProductionQty); + + /** Get Production Quantity. + * Quantity of products to produce + */ + public BigDecimal getProductionQty(); + /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; @@ -287,7 +421,7 @@ public interface I_M_Production */ public int getUser1_ID(); - public I_C_ElementValue getUser1() throws RuntimeException; + public org.compiere.model.I_C_ElementValue getUser1() throws RuntimeException; /** Column name User2_ID */ public static final String COLUMNNAME_User2_ID = "User2_ID"; @@ -302,5 +436,5 @@ public interface I_M_Production */ public int getUser2_ID(); - public I_C_ElementValue getUser2() throws RuntimeException; + public org.compiere.model.I_C_ElementValue getUser2() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java index aaf1071c9a..5badad40a6 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java @@ -31,7 +31,7 @@ public interface I_M_ProductionLine public static final String Table_Name = "M_ProductionLine"; /** AD_Table_ID=326 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 326; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -104,6 +104,19 @@ public interface I_M_ProductionLine */ public boolean isActive(); + /** Column name IsEndProduct */ + public static final String COLUMNNAME_IsEndProduct = "IsEndProduct"; + + /** Set End Product. + * End Product of production + */ + public void setIsEndProduct (boolean IsEndProduct); + + /** Get End Product. + * End Product of production + */ + public boolean isEndProduct(); + /** Column name Line */ public static final String COLUMNNAME_Line = "Line"; @@ -173,7 +186,22 @@ public interface I_M_ProductionLine */ public int getM_Product_ID(); - public I_M_Product getM_Product() throws RuntimeException; + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException; + + /** Column name M_Production_ID */ + public static final String COLUMNNAME_M_Production_ID = "M_Production_ID"; + + /** Set Production. + * Plan for producing a product + */ + public void setM_Production_ID (int M_Production_ID); + + /** Get Production. + * Plan for producing a product + */ + public int getM_Production_ID(); + + public org.compiere.model.I_M_Production getM_Production() throws RuntimeException; /** Column name M_ProductionLine_ID */ public static final String COLUMNNAME_M_ProductionLine_ID = "M_ProductionLine_ID"; @@ -188,6 +216,15 @@ public interface I_M_ProductionLine */ public int getM_ProductionLine_ID(); + /** Column name M_ProductionLine_UU */ + public static final String COLUMNNAME_M_ProductionLine_UU = "M_ProductionLine_UU"; + + /** Set M_ProductionLine_UU */ + public void setM_ProductionLine_UU (String M_ProductionLine_UU); + + /** Get M_ProductionLine_UU */ + public String getM_ProductionLine_UU(); + /** Column name M_ProductionPlan_ID */ public static final String COLUMNNAME_M_ProductionPlan_ID = "M_ProductionPlan_ID"; @@ -201,7 +238,20 @@ public interface I_M_ProductionLine */ public int getM_ProductionPlan_ID(); - public I_M_ProductionPlan getM_ProductionPlan() throws RuntimeException; + public org.compiere.model.I_M_ProductionPlan getM_ProductionPlan() throws RuntimeException; + + /** Column name PlannedQty */ + public static final String COLUMNNAME_PlannedQty = "PlannedQty"; + + /** Set Planned Quantity. + * Planned quantity for this project + */ + public void setPlannedQty (BigDecimal PlannedQty); + + /** Get Planned Quantity. + * Planned quantity for this project + */ + public BigDecimal getPlannedQty(); /** Column name Processed */ public static final String COLUMNNAME_Processed = "Processed"; @@ -216,6 +266,41 @@ public interface I_M_ProductionLine */ public boolean isProcessed(); + /** Column name ProductType */ + public static final String COLUMNNAME_ProductType = "ProductType"; + + /** Set Product Type. + * Type of product + */ + public void setProductType (String ProductType); + + /** Get Product Type. + * Type of product + */ + public String getProductType(); + + /** Column name QtyAvailable */ + public static final String COLUMNNAME_QtyAvailable = "QtyAvailable"; + + /** Set Available Quantity. + * Available Quantity (On Hand - Reserved) + */ + public void setQtyAvailable (BigDecimal QtyAvailable); + + /** Get Available Quantity. + * Available Quantity (On Hand - Reserved) + */ + public BigDecimal getQtyAvailable(); + + /** Column name QtyUsed */ + public static final String COLUMNNAME_QtyUsed = "QtyUsed"; + + /** Set Quantity Used */ + public void setQtyUsed (BigDecimal QtyUsed); + + /** Get Quantity Used */ + public BigDecimal getQtyUsed(); + /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java index baabebec84..55fe6194c7 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java @@ -31,7 +31,7 @@ public interface I_M_ProductionLineMA public static final String Table_Name = "M_ProductionLineMA"; /** AD_Table_ID=765 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 765; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -132,7 +132,16 @@ public interface I_M_ProductionLineMA */ public int getM_ProductionLine_ID(); - public I_M_ProductionLine getM_ProductionLine() throws RuntimeException; + public org.compiere.model.I_M_ProductionLine getM_ProductionLine() throws RuntimeException; + + /** Column name M_ProductionLineMA_UU */ + public static final String COLUMNNAME_M_ProductionLineMA_UU = "M_ProductionLineMA_UU"; + + /** Set M_ProductionLineMA_UU */ + public void setM_ProductionLineMA_UU (String M_ProductionLineMA_UU); + + /** Get M_ProductionLineMA_UU */ + public String getM_ProductionLineMA_UU(); /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java index e103f5e67b..e12fcd9bd4 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java @@ -31,7 +31,7 @@ public interface I_M_ProductionPlan public static final String Table_Name = "M_ProductionPlan"; /** AD_Table_ID=385 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 385; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -145,7 +145,7 @@ public interface I_M_ProductionPlan */ public int getM_Product_ID(); - public I_M_Product getM_Product() throws RuntimeException; + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException; /** Column name M_Production_ID */ public static final String COLUMNNAME_M_Production_ID = "M_Production_ID"; @@ -160,7 +160,7 @@ public interface I_M_ProductionPlan */ public int getM_Production_ID(); - public I_M_Production getM_Production() throws RuntimeException; + public org.compiere.model.I_M_Production getM_Production() throws RuntimeException; /** Column name M_ProductionPlan_ID */ public static final String COLUMNNAME_M_ProductionPlan_ID = "M_ProductionPlan_ID"; @@ -175,6 +175,15 @@ public interface I_M_ProductionPlan */ public int getM_ProductionPlan_ID(); + /** Column name M_ProductionPlan_UU */ + public static final String COLUMNNAME_M_ProductionPlan_UU = "M_ProductionPlan_UU"; + + /** Set M_ProductionPlan_UU */ + public void setM_ProductionPlan_UU (String M_ProductionPlan_UU); + + /** Get M_ProductionPlan_UU */ + public String getM_ProductionPlan_UU(); + /** Column name Processed */ public static final String COLUMNNAME_Processed = "Processed"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java index 83b98e5c50..4e3e25d953 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java @@ -31,7 +31,7 @@ public interface I_M_Replenish public static final String Table_Name = "M_Replenish"; /** AD_Table_ID=249 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 249; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -130,7 +130,7 @@ public interface I_M_Replenish */ public int getM_Locator_ID(); - public I_M_Locator getM_Locator() throws RuntimeException; + public org.compiere.model.I_M_Locator getM_Locator() throws RuntimeException; /** Column name M_Product_ID */ public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; @@ -145,7 +145,16 @@ public interface I_M_Replenish */ public int getM_Product_ID(); - public I_M_Product getM_Product() throws RuntimeException; + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException; + + /** Column name M_Replenish_UU */ + public static final String COLUMNNAME_M_Replenish_UU = "M_Replenish_UU"; + + /** Set M_Replenish_UU */ + public void setM_Replenish_UU (String M_Replenish_UU); + + /** Get M_Replenish_UU */ + public String getM_Replenish_UU(); /** Column name M_Warehouse_ID */ public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID"; @@ -160,7 +169,7 @@ public interface I_M_Replenish */ public int getM_Warehouse_ID(); - public I_M_Warehouse getM_Warehouse() throws RuntimeException; + public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException; /** Column name M_WarehouseSource_ID */ public static final String COLUMNNAME_M_WarehouseSource_ID = "M_WarehouseSource_ID"; @@ -175,7 +184,16 @@ public interface I_M_Replenish */ public int getM_WarehouseSource_ID(); - public I_M_Warehouse getM_WarehouseSource() throws RuntimeException; + public org.compiere.model.I_M_Warehouse getM_WarehouseSource() throws RuntimeException; + + /** Column name QtyBatchSize */ + public static final String COLUMNNAME_QtyBatchSize = "QtyBatchSize"; + + /** Set Qty Batch Size */ + public void setQtyBatchSize (BigDecimal QtyBatchSize); + + /** Get Qty Batch Size */ + public BigDecimal getQtyBatchSize(); /** Column name ReplenishType */ public static final String COLUMNNAME_ReplenishType = "ReplenishType"; diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PartType.java b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java new file mode 100644 index 0000000000..553ec38909 --- /dev/null +++ b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java @@ -0,0 +1,126 @@ +/****************************************************************************** + * Product: Adempiere ERP & CRM Smart Business Solution * + * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved. * + * This program is free software, you can redistribute it and/or modify it * + * under the terms version 2 of the GNU General Public License as published * + * by the Free Software Foundation. This program is distributed in the hope * + * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied * + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License along * + * with this program, if not, write to the Free Software Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * + * For the text or an alternative of this public license, you may reach us * + * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * + * or via info@compiere.org or http://www.compiere.org/license.html * + *****************************************************************************/ +/** Generated Model - DO NOT CHANGE */ +package org.compiere.model; + +import java.sql.ResultSet; +import java.util.Properties; + +/** Generated Model for M_PartType + * @author Adempiere (generated) + * @version Release 3.6.0LTS - $Id$ */ +public class X_M_PartType extends PO implements I_M_PartType, I_Persistent +{ + + /** + * + */ + private static final long serialVersionUID = 20120821L; + + /** Standard Constructor */ + public X_M_PartType (Properties ctx, int M_PartType_ID, String trxName) + { + super (ctx, M_PartType_ID, trxName); + /** if (M_PartType_ID == 0) + { + setM_PartType_ID (0); + setName (null); + } */ + } + + /** Load Constructor */ + public X_M_PartType (Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } + + /** AccessLevel + * @return 3 - Client - Org + */ + protected int get_AccessLevel() + { + return accessLevel.intValue(); + } + + /** Load Meta Data */ + protected POInfo initPO (Properties ctx) + { + POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName()); + return poi; + } + + public String toString() + { + StringBuffer sb = new StringBuffer ("X_M_PartType[") + .append(get_ID()).append("]"); + return sb.toString(); + } + + /** Set Description. + @param Description + Optional short description of the record + */ + public void setDescription (String Description) + { + set_Value (COLUMNNAME_Description, Description); + } + + /** Get Description. + @return Optional short description of the record + */ + public String getDescription () + { + return (String)get_Value(COLUMNNAME_Description); + } + + /** Set Part Type. + @param M_PartType_ID Part Type */ + public void setM_PartType_ID (int M_PartType_ID) + { + if (M_PartType_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_PartType_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_PartType_ID, Integer.valueOf(M_PartType_ID)); + } + + /** Get Part Type. + @return Part Type */ + public int getM_PartType_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_PartType_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Name. + @param Name + Alphanumeric identifier of the entity + */ + public void setName (String Name) + { + set_Value (COLUMNNAME_Name, Name); + } + + /** Get Name. + @return Alphanumeric identifier of the entity + */ + public String getName () + { + return (String)get_Value(COLUMNNAME_Name); + } +} \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product.java b/org.adempiere.base/src/org/compiere/model/X_M_Product.java index 4666ed47c4..6497646a53 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Product.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Product.java @@ -33,7 +33,7 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_Product (Properties ctx, int M_Product_ID, String trxName) @@ -49,6 +49,12 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent setIsExcludeAutoDelivery (false); // N setIsInvoicePrintDetails (false); + setIsKanban (false); +// N + setIsManufactured (false); +// N + setIsPhantom (false); +// N setIsPickListPrintDetails (false); setIsPurchased (true); // Y @@ -119,9 +125,45 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (String)get_Value(COLUMNNAME_Classification); } - public I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException + /** Set Copy From. + @param CopyFrom + Copy From Record + */ + public void setCopyFrom (String CopyFrom) + { + set_Value (COLUMNNAME_CopyFrom, CopyFrom); + } + + /** Get Copy From. + @return Copy From Record + */ + public String getCopyFrom () + { + return (String)get_Value(COLUMNNAME_CopyFrom); + } + + /** Set Standard Cost. + @param CostStandard + Standard Costs + */ + public void setCostStandard (BigDecimal CostStandard) + { + throw new IllegalArgumentException ("CostStandard is virtual column"); } + + /** Get Standard Cost. + @return Standard Costs + */ + public BigDecimal getCostStandard () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostStandard); + if (bd == null) + return Env.ZERO; + return bd; + } + + public org.compiere.model.I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException { - return (I_C_RevenueRecognition)MTable.get(getCtx(), I_C_RevenueRecognition.Table_Name) + return (org.compiere.model.I_C_RevenueRecognition)MTable.get(getCtx(), org.compiere.model.I_C_RevenueRecognition.Table_Name) .getPO(getC_RevenueRecognition_ID(), get_TrxName()); } /** Set Revenue Recognition. @@ -147,9 +189,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException + public org.compiere.model.I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException { - return (I_C_SubscriptionType)MTable.get(getCtx(), I_C_SubscriptionType.Table_Name) + return (org.compiere.model.I_C_SubscriptionType)MTable.get(getCtx(), org.compiere.model.I_C_SubscriptionType.Table_Name) .getPO(getC_SubscriptionType_ID(), get_TrxName()); } /** Set Subscription Type. @@ -175,9 +217,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_C_TaxCategory getC_TaxCategory() throws RuntimeException + public org.compiere.model.I_C_TaxCategory getC_TaxCategory() throws RuntimeException { - return (I_C_TaxCategory)MTable.get(getCtx(), I_C_TaxCategory.Table_Name) + return (org.compiere.model.I_C_TaxCategory)MTable.get(getCtx(), org.compiere.model.I_C_TaxCategory.Table_Name) .getPO(getC_TaxCategory_ID(), get_TrxName()); } /** Set Tax Category. @@ -203,9 +245,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_C_UOM getC_UOM() throws RuntimeException + public org.compiere.model.I_C_UOM getC_UOM() throws RuntimeException { - return (I_C_UOM)MTable.get(getCtx(), I_C_UOM.Table_Name) + return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name) .getPO(getC_UOM_ID(), get_TrxName()); } /** Set UOM. @@ -521,6 +563,78 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return false; } + /** Set Kanban controlled. + @param IsKanban + This part is Kanban controlled + */ + public void setIsKanban (boolean IsKanban) + { + set_Value (COLUMNNAME_IsKanban, Boolean.valueOf(IsKanban)); + } + + /** Get Kanban controlled. + @return This part is Kanban controlled + */ + public boolean isKanban () + { + Object oo = get_Value(COLUMNNAME_IsKanban); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + + /** Set Manufactured. + @param IsManufactured + This product is manufactured + */ + public void setIsManufactured (boolean IsManufactured) + { + set_Value (COLUMNNAME_IsManufactured, Boolean.valueOf(IsManufactured)); + } + + /** Get Manufactured. + @return This product is manufactured + */ + public boolean isManufactured () + { + Object oo = get_Value(COLUMNNAME_IsManufactured); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + + /** Set Phantom. + @param IsPhantom + Phantom Component + */ + public void setIsPhantom (boolean IsPhantom) + { + set_Value (COLUMNNAME_IsPhantom, Boolean.valueOf(IsPhantom)); + } + + /** Get Phantom. + @return Phantom Component + */ + public boolean isPhantom () + { + Object oo = get_Value(COLUMNNAME_IsPhantom); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Print detail records on pick list. @param IsPickListPrintDetails Print detail BOM elements on the pick list @@ -733,9 +847,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_M_AttributeSet getM_AttributeSet() throws RuntimeException + public org.compiere.model.I_M_AttributeSet getM_AttributeSet() throws RuntimeException { - return (I_M_AttributeSet)MTable.get(getCtx(), I_M_AttributeSet.Table_Name) + return (org.compiere.model.I_M_AttributeSet)MTable.get(getCtx(), org.compiere.model.I_M_AttributeSet.Table_Name) .getPO(getM_AttributeSet_ID(), get_TrxName()); } /** Set Attribute Set. @@ -789,9 +903,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_M_FreightCategory getM_FreightCategory() throws RuntimeException + public org.compiere.model.I_M_FreightCategory getM_FreightCategory() throws RuntimeException { - return (I_M_FreightCategory)MTable.get(getCtx(), I_M_FreightCategory.Table_Name) + return (org.compiere.model.I_M_FreightCategory)MTable.get(getCtx(), org.compiere.model.I_M_FreightCategory.Table_Name) .getPO(getM_FreightCategory_ID(), get_TrxName()); } /** Set Freight Category. @@ -845,9 +959,34 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_M_Product_Category getM_Product_Category() throws RuntimeException + public I_M_PartType getM_PartType() throws RuntimeException { - return (I_M_Product_Category)MTable.get(getCtx(), I_M_Product_Category.Table_Name) + return (I_M_PartType)MTable.get(getCtx(), I_M_PartType.Table_Name) + .getPO(getM_PartType_ID(), get_TrxName()); } + + /** Set Part Type. + @param M_PartType_ID Part Type */ + public void setM_PartType_ID (int M_PartType_ID) + { + if (M_PartType_ID < 1) + set_Value (COLUMNNAME_M_PartType_ID, null); + else + set_Value (COLUMNNAME_M_PartType_ID, Integer.valueOf(M_PartType_ID)); + } + + /** Get Part Type. + @return Part Type */ + public int getM_PartType_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_PartType_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + public org.compiere.model.I_M_Product_Category getM_Product_Category() throws RuntimeException + { + return (org.compiere.model.I_M_Product_Category)MTable.get(getCtx(), org.compiere.model.I_M_Product_Category.Table_Name) .getPO(getM_Product_Category_ID(), get_TrxName()); } /** Set Product Category. @@ -896,6 +1035,20 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } + /** Set M_Product_UU. + @param M_Product_UU M_Product_UU */ + public void setM_Product_UU (String M_Product_UU) + { + set_Value (COLUMNNAME_M_Product_UU, M_Product_UU); + } + + /** Get M_Product_UU. + @return M_Product_UU */ + public String getM_Product_UU () + { + return (String)get_Value(COLUMNNAME_M_Product_UU); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -964,9 +1117,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (String)get_Value(COLUMNNAME_ProductType); } - public I_R_MailText getR_MailText() throws RuntimeException + public org.compiere.model.I_R_MailText getR_MailText() throws RuntimeException { - return (I_R_MailText)MTable.get(getCtx(), I_R_MailText.Table_Name) + return (org.compiere.model.I_R_MailText)MTable.get(getCtx(), org.compiere.model.I_R_MailText.Table_Name) .getPO(getR_MailText_ID(), get_TrxName()); } /** Set Mail Template. @@ -992,9 +1145,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_AD_User getSalesRep() throws RuntimeException + public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException { - return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name) + return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name) .getPO(getSalesRep_ID(), get_TrxName()); } /** Set Sales Representative. @@ -1020,9 +1173,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return ii.intValue(); } - public I_S_ExpenseType getS_ExpenseType() throws RuntimeException + public org.compiere.model.I_S_ExpenseType getS_ExpenseType() throws RuntimeException { - return (I_S_ExpenseType)MTable.get(getCtx(), I_S_ExpenseType.Table_Name) + return (org.compiere.model.I_S_ExpenseType)MTable.get(getCtx(), org.compiere.model.I_S_ExpenseType.Table_Name) .getPO(getS_ExpenseType_ID(), get_TrxName()); } /** Set Expense Type. @@ -1125,9 +1278,9 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (String)get_Value(COLUMNNAME_SKU); } - public I_S_Resource getS_Resource() throws RuntimeException + public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException { - return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name) + return (org.compiere.model.I_S_Resource)MTable.get(getCtx(), org.compiere.model.I_S_Resource.Table_Name) .getPO(getS_Resource_ID(), get_TrxName()); } /** Set Resource. diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Production.java b/org.adempiere.base/src/org/compiere/model/X_M_Production.java index aeadebc66b..0592afb7c2 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Production.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Production.java @@ -33,7 +33,7 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_Production (Properties ctx, int M_Production_ID, String trxName) @@ -41,13 +41,18 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent super (ctx, M_Production_ID, trxName); /** if (M_Production_ID == 0) { - setIsCreated (false); + setDocumentNo (null); + setIsCreated (null); +// N + setM_Locator_ID (0); setMovementDate (new Timestamp( System.currentTimeMillis() )); // @#Date@ + setM_Product_ID (0); setM_Production_ID (0); - setName (null); setPosted (false); setProcessed (false); + setProductionQty (Env.ZERO); +// 0 } */ } @@ -102,9 +107,9 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } - public I_C_Activity getC_Activity() throws RuntimeException + public org.compiere.model.I_C_Activity getC_Activity() throws RuntimeException { - return (I_C_Activity)MTable.get(getCtx(), I_C_Activity.Table_Name) + return (org.compiere.model.I_C_Activity)MTable.get(getCtx(), org.compiere.model.I_C_Activity.Table_Name) .getPO(getC_Activity_ID(), get_TrxName()); } /** Set Activity. @@ -130,9 +135,33 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } - public I_C_Campaign getC_Campaign() throws RuntimeException + public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException { - return (I_C_Campaign)MTable.get(getCtx(), I_C_Campaign.Table_Name) + return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name) + .getPO(getC_BPartner_ID(), get_TrxName()); } + + /** Set Business Partner . + @param C_BPartner_ID + Identifies a Business Partner + */ + public void setC_BPartner_ID (int C_BPartner_ID) + { + throw new IllegalArgumentException ("C_BPartner_ID is virtual column"); } + + /** Get Business Partner . + @return Identifies a Business Partner + */ + public int getC_BPartner_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_BPartner_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + public org.compiere.model.I_C_Campaign getC_Campaign() throws RuntimeException + { + return (org.compiere.model.I_C_Campaign)MTable.get(getCtx(), org.compiere.model.I_C_Campaign.Table_Name) .getPO(getC_Campaign_ID(), get_TrxName()); } /** Set Campaign. @@ -158,9 +187,37 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } - public I_C_Project getC_Project() throws RuntimeException + public org.compiere.model.I_C_OrderLine getC_OrderLine() throws RuntimeException { - return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name) + return (org.compiere.model.I_C_OrderLine)MTable.get(getCtx(), org.compiere.model.I_C_OrderLine.Table_Name) + .getPO(getC_OrderLine_ID(), get_TrxName()); } + + /** 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 org.compiere.model.I_C_Project getC_Project() throws RuntimeException + { + return (org.compiere.model.I_C_Project)MTable.get(getCtx(), org.compiere.model.I_C_Project.Table_Name) .getPO(getC_Project_ID(), get_TrxName()); } /** Set Project. @@ -186,6 +243,40 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } + /** Set Create lines from. + @param CreateFrom + Process which will generate a new document lines based on an existing document + */ + public void setCreateFrom (String CreateFrom) + { + set_Value (COLUMNNAME_CreateFrom, CreateFrom); + } + + /** Get Create lines from. + @return Process which will generate a new document lines based on an existing document + */ + public String getCreateFrom () + { + return (String)get_Value(COLUMNNAME_CreateFrom); + } + + /** Set Date Promised. + @param DatePromised + Date Order was promised + */ + public void setDatePromised (Timestamp DatePromised) + { + set_Value (COLUMNNAME_DatePromised, DatePromised); + } + + /** Get Date Promised. + @return Date Order was promised + */ + public Timestamp getDatePromised () + { + return (Timestamp)get_Value(COLUMNNAME_DatePromised); + } + /** Set Description. @param Description Optional short description of the record @@ -203,25 +294,95 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return (String)get_Value(COLUMNNAME_Description); } + /** Set Document No. + @param DocumentNo + Document sequence number of the document + */ + public void setDocumentNo (String DocumentNo) + { + set_ValueNoCheck (COLUMNNAME_DocumentNo, DocumentNo); + } + + /** Get Document No. + @return Document sequence number of the document + */ + public String getDocumentNo () + { + return (String)get_Value(COLUMNNAME_DocumentNo); + } + + /** Get Record ID/ColumnName + @return ID/ColumnName pair + */ + public KeyNamePair getKeyNamePair() + { + return new KeyNamePair(get_ID(), getDocumentNo()); + } + + /** Set Complete. + @param IsComplete + It is complete + */ + public void setIsComplete (String IsComplete) + { + set_Value (COLUMNNAME_IsComplete, IsComplete); + } + + /** Get Complete. + @return It is complete + */ + public String getIsComplete () + { + return (String)get_Value(COLUMNNAME_IsComplete); + } + + /** IsCreated AD_Reference_ID=319 */ + public static final int ISCREATED_AD_Reference_ID=319; + /** Yes = Y */ + public static final String ISCREATED_Yes = "Y"; + /** No = N */ + public static final String ISCREATED_No = "N"; /** Set Records created. @param IsCreated Records created */ - public void setIsCreated (boolean IsCreated) + public void setIsCreated (String IsCreated) { - set_ValueNoCheck (COLUMNNAME_IsCreated, Boolean.valueOf(IsCreated)); + + set_Value (COLUMNNAME_IsCreated, IsCreated); } /** Get Records created. @return Records created */ - public boolean isCreated () + public String getIsCreated () { - Object oo = get_Value(COLUMNNAME_IsCreated); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; + return (String)get_Value(COLUMNNAME_IsCreated); + } + + public I_M_Locator getM_Locator() throws RuntimeException + { + return (I_M_Locator)MTable.get(getCtx(), I_M_Locator.Table_Name) + .getPO(getM_Locator_ID(), get_TrxName()); } + + /** Set Locator. + @param M_Locator_ID + Warehouse Locator + */ + public void setM_Locator_ID (int M_Locator_ID) + { + if (M_Locator_ID < 1) + set_Value (COLUMNNAME_M_Locator_ID, null); + else + set_Value (COLUMNNAME_M_Locator_ID, Integer.valueOf(M_Locator_ID)); + } + + /** Get Locator. + @return Warehouse Locator + */ + public int getM_Locator_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_Locator_ID); + if (ii == null) + return 0; + return ii.intValue(); } /** Set Movement Date. @@ -241,6 +402,34 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return (Timestamp)get_Value(COLUMNNAME_MovementDate); } + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException + { + return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name) + .getPO(getM_Product_ID(), get_TrxName()); } + + /** Set Product. + @param M_Product_ID + Product, Service, Item + */ + public void setM_Product_ID (int M_Product_ID) + { + if (M_Product_ID < 1) + set_Value (COLUMNNAME_M_Product_ID, null); + else + 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(); + } + /** Set Production. @param M_Production_ID Plan for producing a product @@ -264,6 +453,20 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } + /** Set M_Production_UU. + @param M_Production_UU M_Production_UU */ + public void setM_Production_UU (String M_Production_UU) + { + set_Value (COLUMNNAME_M_Production_UU, M_Production_UU); + } + + /** Get M_Production_UU. + @return M_Production_UU */ + public String getM_Production_UU () + { + return (String)get_Value(COLUMNNAME_M_Production_UU); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -281,14 +484,6 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return (String)get_Value(COLUMNNAME_Name); } - /** Get Record ID/ColumnName - @return ID/ColumnName pair - */ - public KeyNamePair getKeyNamePair() - { - return new KeyNamePair(get_ID(), getName()); - } - /** Set Posted. @param Posted Posting status @@ -378,9 +573,29 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return false; } - public I_C_ElementValue getUser1() throws RuntimeException + /** Set Production Quantity. + @param ProductionQty + Quantity of products to produce + */ + public void setProductionQty (BigDecimal ProductionQty) + { + set_Value (COLUMNNAME_ProductionQty, ProductionQty); + } + + /** Get Production Quantity. + @return Quantity of products to produce + */ + public BigDecimal getProductionQty () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ProductionQty); + if (bd == null) + return Env.ZERO; + return bd; + } + + public org.compiere.model.I_C_ElementValue getUser1() throws RuntimeException { - return (I_C_ElementValue)MTable.get(getCtx(), I_C_ElementValue.Table_Name) + return (org.compiere.model.I_C_ElementValue)MTable.get(getCtx(), org.compiere.model.I_C_ElementValue.Table_Name) .getPO(getUser1_ID(), get_TrxName()); } /** Set User List 1. @@ -406,9 +621,9 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent return ii.intValue(); } - public I_C_ElementValue getUser2() throws RuntimeException + public org.compiere.model.I_C_ElementValue getUser2() throws RuntimeException { - return (I_C_ElementValue)MTable.get(getCtx(), I_C_ElementValue.Table_Name) + return (org.compiere.model.I_C_ElementValue)MTable.get(getCtx(), org.compiere.model.I_C_ElementValue.Table_Name) .getPO(getUser2_ID(), get_TrxName()); } /** Set User List 2. diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java index 7aeb38f9f9..37a89464ff 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java @@ -32,7 +32,7 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_ProductionLine (Properties ctx, int M_ProductionLine_ID, String trxName) @@ -41,14 +41,14 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers /** if (M_ProductionLine_ID == 0) { setLine (0); -// @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM M_ProductionLine WHERE M_ProductionPlan_ID=@M_ProductionPlan_ID@ +// @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM M_ProductionLine WHERE M_Production_ID=@M_Production_ID@ setM_AttributeSetInstance_ID (0); setM_Locator_ID (0); // @M_Locator_ID@ setMovementQty (Env.ZERO); setM_Product_ID (0); + setM_Production_ID (0); setM_ProductionLine_ID (0); - setM_ProductionPlan_ID (0); setProcessed (false); } */ } @@ -98,6 +98,30 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return (String)get_Value(COLUMNNAME_Description); } + /** Set End Product. + @param IsEndProduct + End Product of production + */ + public void setIsEndProduct (boolean IsEndProduct) + { + set_Value (COLUMNNAME_IsEndProduct, Boolean.valueOf(IsEndProduct)); + } + + /** Get End Product. + @return End Product of production + */ + public boolean isEndProduct () + { + Object oo = get_Value(COLUMNNAME_IsEndProduct); + 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 @@ -118,14 +142,6 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return ii.intValue(); } - /** Get Record ID/ColumnName - @return ID/ColumnName pair - */ - public KeyNamePair getKeyNamePair() - { - return new KeyNamePair(get_ID(), String.valueOf(getLine())); - } - public I_M_AttributeSetInstance getM_AttributeSetInstance() throws RuntimeException { return (I_M_AttributeSetInstance)MTable.get(getCtx(), I_M_AttributeSetInstance.Table_Name) @@ -202,9 +218,9 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return bd; } - public I_M_Product getM_Product() throws RuntimeException + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException { - return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name) + return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name) .getPO(getM_Product_ID(), get_TrxName()); } /** Set Product. @@ -230,6 +246,42 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return ii.intValue(); } + public org.compiere.model.I_M_Production getM_Production() throws RuntimeException + { + return (org.compiere.model.I_M_Production)MTable.get(getCtx(), org.compiere.model.I_M_Production.Table_Name) + .getPO(getM_Production_ID(), get_TrxName()); } + + /** Set Production. + @param M_Production_ID + Plan for producing a product + */ + public void setM_Production_ID (int M_Production_ID) + { + if (M_Production_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_Production_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_Production_ID, Integer.valueOf(M_Production_ID)); + } + + /** Get Production. + @return Plan for producing a product + */ + public int getM_Production_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_Production_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_Production_ID())); + } + /** Set Production Line. @param M_ProductionLine_ID Document Line representing a production @@ -253,9 +305,23 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return ii.intValue(); } - public I_M_ProductionPlan getM_ProductionPlan() throws RuntimeException + /** Set M_ProductionLine_UU. + @param M_ProductionLine_UU M_ProductionLine_UU */ + public void setM_ProductionLine_UU (String M_ProductionLine_UU) + { + set_Value (COLUMNNAME_M_ProductionLine_UU, M_ProductionLine_UU); + } + + /** Get M_ProductionLine_UU. + @return M_ProductionLine_UU */ + public String getM_ProductionLine_UU () + { + return (String)get_Value(COLUMNNAME_M_ProductionLine_UU); + } + + public org.compiere.model.I_M_ProductionPlan getM_ProductionPlan() throws RuntimeException { - return (I_M_ProductionPlan)MTable.get(getCtx(), I_M_ProductionPlan.Table_Name) + return (org.compiere.model.I_M_ProductionPlan)MTable.get(getCtx(), org.compiere.model.I_M_ProductionPlan.Table_Name) .getPO(getM_ProductionPlan_ID(), get_TrxName()); } /** Set Production Plan. @@ -281,6 +347,26 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers return ii.intValue(); } + /** Set Planned Quantity. + @param PlannedQty + Planned quantity for this project + */ + public void setPlannedQty (BigDecimal PlannedQty) + { + set_Value (COLUMNNAME_PlannedQty, PlannedQty); + } + + /** Get Planned Quantity. + @return Planned quantity for this project + */ + public BigDecimal getPlannedQty () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_PlannedQty); + if (bd == null) + return Env.ZERO; + return bd; + } + /** Set Processed. @param Processed The document has been processed @@ -304,4 +390,56 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers } return false; } + + /** Set Product Type. + @param ProductType + Type of product + */ + public void setProductType (String ProductType) + { + throw new IllegalArgumentException ("ProductType is virtual column"); } + + /** Get Product Type. + @return Type of product + */ + public String getProductType () + { + return (String)get_Value(COLUMNNAME_ProductType); + } + + /** Set Available Quantity. + @param QtyAvailable + Available Quantity (On Hand - Reserved) + */ + public void setQtyAvailable (BigDecimal QtyAvailable) + { + throw new IllegalArgumentException ("QtyAvailable is virtual column"); } + + /** Get Available Quantity. + @return Available Quantity (On Hand - Reserved) + */ + public BigDecimal getQtyAvailable () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyAvailable); + if (bd == null) + return Env.ZERO; + return bd; + } + + /** Set Quantity Used. + @param QtyUsed Quantity Used */ + public void setQtyUsed (BigDecimal QtyUsed) + { + set_Value (COLUMNNAME_QtyUsed, QtyUsed); + } + + /** Get Quantity Used. + @return Quantity Used */ + public BigDecimal getQtyUsed () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyUsed); + if (bd == null) + return Env.ZERO; + return bd; + } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java index 63b827cd0a..6fd20a02b4 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java @@ -32,7 +32,7 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_ /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_ProductionLineMA (Properties ctx, int M_ProductionLineMA_ID, String trxName) @@ -122,9 +122,9 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_ return bd; } - public I_M_ProductionLine getM_ProductionLine() throws RuntimeException + public org.compiere.model.I_M_ProductionLine getM_ProductionLine() throws RuntimeException { - return (I_M_ProductionLine)MTable.get(getCtx(), I_M_ProductionLine.Table_Name) + return (org.compiere.model.I_M_ProductionLine)MTable.get(getCtx(), org.compiere.model.I_M_ProductionLine.Table_Name) .getPO(getM_ProductionLine_ID(), get_TrxName()); } /** Set Production Line. @@ -157,4 +157,18 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_ { return new KeyNamePair(get_ID(), String.valueOf(getM_ProductionLine_ID())); } + + /** Set M_ProductionLineMA_UU. + @param M_ProductionLineMA_UU M_ProductionLineMA_UU */ + public void setM_ProductionLineMA_UU (String M_ProductionLineMA_UU) + { + set_Value (COLUMNNAME_M_ProductionLineMA_UU, M_ProductionLineMA_UU); + } + + /** Get M_ProductionLineMA_UU. + @return M_ProductionLineMA_UU */ + public String getM_ProductionLineMA_UU () + { + return (String)get_Value(COLUMNNAME_M_ProductionLineMA_UU); + } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java index a69f7f67e2..774e7a70dd 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java @@ -32,7 +32,7 @@ public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Pers /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_ProductionPlan (Properties ctx, int M_ProductionPlan_ID, String trxName) @@ -154,9 +154,9 @@ public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Pers return ii.intValue(); } - public I_M_Product getM_Product() throws RuntimeException + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException { - return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name) + return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name) .getPO(getM_Product_ID(), get_TrxName()); } /** Set Product. @@ -182,9 +182,9 @@ public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Pers return ii.intValue(); } - public I_M_Production getM_Production() throws RuntimeException + public org.compiere.model.I_M_Production getM_Production() throws RuntimeException { - return (I_M_Production)MTable.get(getCtx(), I_M_Production.Table_Name) + return (org.compiere.model.I_M_Production)MTable.get(getCtx(), org.compiere.model.I_M_Production.Table_Name) .getPO(getM_Production_ID(), get_TrxName()); } /** Set Production. @@ -233,6 +233,20 @@ public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Pers return ii.intValue(); } + /** Set M_ProductionPlan_UU. + @param M_ProductionPlan_UU M_ProductionPlan_UU */ + public void setM_ProductionPlan_UU (String M_ProductionPlan_UU) + { + set_Value (COLUMNNAME_M_ProductionPlan_UU, M_ProductionPlan_UU); + } + + /** Get M_ProductionPlan_UU. + @return M_ProductionPlan_UU */ + public String getM_ProductionPlan_UU () + { + return (String)get_Value(COLUMNNAME_M_ProductionPlan_UU); + } + /** Set Processed. @param Processed The document has been processed diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java index 99842ba7a8..4f9b4d41b6 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java @@ -31,7 +31,7 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120821L; /** Standard Constructor */ public X_M_Replenish (Properties ctx, int M_Replenish_ID, String trxName) @@ -115,9 +115,9 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent return bd; } - public I_M_Locator getM_Locator() throws RuntimeException + public org.compiere.model.I_M_Locator getM_Locator() throws RuntimeException { - return (I_M_Locator)MTable.get(getCtx(), I_M_Locator.Table_Name) + return (org.compiere.model.I_M_Locator)MTable.get(getCtx(), org.compiere.model.I_M_Locator.Table_Name) .getPO(getM_Locator_ID(), get_TrxName()); } /** Set Locator. @@ -143,9 +143,9 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent return ii.intValue(); } - public I_M_Product getM_Product() throws RuntimeException + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException { - return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name) + return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name) .getPO(getM_Product_ID(), get_TrxName()); } /** Set Product. @@ -171,9 +171,23 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent return ii.intValue(); } - public I_M_Warehouse getM_Warehouse() throws RuntimeException + /** Set M_Replenish_UU. + @param M_Replenish_UU M_Replenish_UU */ + public void setM_Replenish_UU (String M_Replenish_UU) + { + set_Value (COLUMNNAME_M_Replenish_UU, M_Replenish_UU); + } + + /** Get M_Replenish_UU. + @return M_Replenish_UU */ + public String getM_Replenish_UU () + { + return (String)get_Value(COLUMNNAME_M_Replenish_UU); + } + + public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException { - return (I_M_Warehouse)MTable.get(getCtx(), I_M_Warehouse.Table_Name) + return (org.compiere.model.I_M_Warehouse)MTable.get(getCtx(), org.compiere.model.I_M_Warehouse.Table_Name) .getPO(getM_Warehouse_ID(), get_TrxName()); } /** Set Warehouse. @@ -199,9 +213,9 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent return ii.intValue(); } - public I_M_Warehouse getM_WarehouseSource() throws RuntimeException + public org.compiere.model.I_M_Warehouse getM_WarehouseSource() throws RuntimeException { - return (I_M_Warehouse)MTable.get(getCtx(), I_M_Warehouse.Table_Name) + return (org.compiere.model.I_M_Warehouse)MTable.get(getCtx(), org.compiere.model.I_M_Warehouse.Table_Name) .getPO(getM_WarehouseSource_ID(), get_TrxName()); } /** Set Source Warehouse. @@ -227,6 +241,23 @@ public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent return ii.intValue(); } + /** Set Qty Batch Size. + @param QtyBatchSize Qty Batch Size */ + public void setQtyBatchSize (BigDecimal QtyBatchSize) + { + set_Value (COLUMNNAME_QtyBatchSize, QtyBatchSize); + } + + /** Get Qty Batch Size. + @return Qty Batch Size */ + public BigDecimal getQtyBatchSize () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyBatchSize); + if (bd == null) + return Env.ZERO; + return bd; + } + /** ReplenishType AD_Reference_ID=164 */ public static final int REPLENISHTYPE_AD_Reference_ID=164; /** Maintain Maximum Level = 2 */ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java index b432268026..e36d8b7e94 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java @@ -22,6 +22,7 @@ import java.util.Properties; import java.util.Vector; import java.util.logging.Level; +import org.adempiere.webui.component.Borderlayout; import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.Grid; @@ -42,7 +43,6 @@ import org.adempiere.webui.panel.CustomForm; import org.adempiere.webui.panel.IFormController; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.util.TreeUtils; -import org.compiere.apps.ADialog; import org.compiere.apps.form.TreeBOM; import org.compiere.model.MColumn; import org.compiere.model.MLookup; @@ -59,18 +59,18 @@ import org.compiere.util.Msg; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zkex.zul.Borderlayout; -import org.zkoss.zkex.zul.Center; -import org.zkoss.zkex.zul.North; -import org.zkoss.zkex.zul.South; -import org.zkoss.zkex.zul.West; +import org.zkoss.zul.Center; +import org.zkoss.zul.DefaultTreeModel; +import org.zkoss.zul.DefaultTreeNode; +import org.zkoss.zul.North; import org.zkoss.zul.Separator; -import org.zkoss.zul.SimpleTreeNode; +import org.zkoss.zul.South; import org.zkoss.zul.Space; import org.zkoss.zul.Tree; import org.zkoss.zul.Treecol; import org.zkoss.zul.Treecols; import org.zkoss.zul.Treeitem; +import org.zkoss.zul.West; public class WTreeBOM extends TreeBOM implements IFormController, EventListener { @@ -264,8 +264,11 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener if (event.getTarget() instanceof Tree ) { Treeitem ti = m_tree.getSelectedItem(); - if (ti == null) - ADialog.beep(); + if (ti == null) { + // ADialog.beep(); + // TODO: review what is this beep for - no zk6 equivalent + log.log(Level.WARNING, "WTreeBOM.onEvent treeItem=null"); + } else { mySimpleTreeNode tn = (mySimpleTreeNode)ti.getValue(); @@ -382,7 +385,9 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener m_tree.setModel(model); } - int[] path = m_tree.getModel().getPath(parent, m_root); + // TODO: check zk6 - was: + // int[] path = m_tree.getModel().getPath(parent, m_root); + int[] path = m_tree.getModel().getPath(m_root); Treeitem ti = m_tree.renderItemByPath(path); m_tree.setSelectedItem(ti); ti.setOpen(true); @@ -532,7 +537,7 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener * - Override toString method for display * */ -class mySimpleTreeNode extends SimpleTreeNode +class mySimpleTreeNode extends DefaultTreeNode { public mySimpleTreeNode(Object data, List children) { diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/TreeBOM.java b/org.adempiere.ui/src/org/compiere/apps/form/TreeBOM.java similarity index 100% rename from org.adempiere.ui.swing/src/org/compiere/apps/form/TreeBOM.java rename to org.adempiere.ui/src/org/compiere/apps/form/TreeBOM.java