Commit fca70dd0 by 江和松

增加单价、税率、不含税金额、税额、含税金额

parent 8b1c6f25
...@@ -19,9 +19,9 @@ import com.baosight.iplat4j.core.util.StringUtils; ...@@ -19,9 +19,9 @@ import com.baosight.iplat4j.core.util.StringUtils;
* @history 2024-05-11 17:26:09 create * @history 2024-05-11 17:26:09 create
*/ */
public class HGCG002 extends DaoEPBase { public class HGCG002 extends DaoEPBase {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; public static final String FIELD_ID = "id";
public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/ public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
...@@ -61,7 +61,13 @@ public class HGCG002 extends DaoEPBase { ...@@ -61,7 +61,13 @@ public class HGCG002 extends DaoEPBase {
public static final String FIELD_AUDIT_USER_ID = "auditUserId"; /* 审核人ID*/ public static final String FIELD_AUDIT_USER_ID = "auditUserId"; /* 审核人ID*/
public static final String FIELD_AUDIT_USER_NAME = "auditUserName"; /* 审核人名称*/ public static final String FIELD_AUDIT_USER_NAME = "auditUserName"; /* 审核人名称*/
public static final String FIELD_AUDIT_REASON = "auditReason"; /* 审核原因*/ public static final String FIELD_AUDIT_REASON = "auditReason"; /* 审核原因*/
public static final String FIELD_PRICE = "price"; /* 单价*/
public static final String FIELD_AMOUNT = "amount"; /* 金额(不含税金额)*/
public static final String FIELD_TAX_INCLUDE_AMOUNT = "taxIncludeAmount"; /* 含税金额*/
public static final String FIELD_TAX_AMOUNT = "taxAmount"; /* 税额*/
public static final String FIELD_TAX_RATE = "taxRate"; /* 税率*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/ public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
...@@ -101,13 +107,19 @@ public class HGCG002 extends DaoEPBase { ...@@ -101,13 +107,19 @@ public class HGCG002 extends DaoEPBase {
public static final String COL_AUDIT_USER_ID = "AUDIT_USER_ID"; /* 审核人ID*/ public static final String COL_AUDIT_USER_ID = "AUDIT_USER_ID"; /* 审核人ID*/
public static final String COL_AUDIT_USER_NAME = "AUDIT_USER_NAME"; /* 审核人名称*/ public static final String COL_AUDIT_USER_NAME = "AUDIT_USER_NAME"; /* 审核人名称*/
public static final String COL_AUDIT_REASON = "AUDIT_REASON"; /* 审核原因*/ public static final String COL_AUDIT_REASON = "AUDIT_REASON"; /* 审核原因*/
public static final String COL_PRICE = "PRICE"; /* 单价*/
public static final String COL_AMOUNT = "AMOUNT"; /* 金额(不含税金额)*/
public static final String COL_TAX_INCLUDE_AMOUNT = "TAX_INCLUDE_AMOUNT"; /* 含税金额*/
public static final String COL_TAX_AMOUNT = "TAX_AMOUNT"; /* 税额*/
public static final String COL_TAX_RATE = "TAX_RATE"; /* 税率*/
public static final String QUERY = "HGCG002.query"; public static final String QUERY = "HGCG002.query";
public static final String COUNT = "HGCG002.count"; public static final String COUNT = "HGCG002.count";
public static final String INSERT = "HGCG002.insert"; public static final String INSERT = "HGCG002.insert";
public static final String UPDATE = "HGCG002.update"; public static final String UPDATE = "HGCG002.update";
public static final String DELETE = "HGCG002.delete"; public static final String DELETE = "HGCG002.delete";
private Long id = new Long(0); private Long id = new Long(0);
private String accountCode = " "; /* 企业编码*/ private String accountCode = " "; /* 企业编码*/
private String depCode = " "; /* 部门编码*/ private String depCode = " "; /* 部门编码*/
...@@ -147,204 +159,243 @@ public class HGCG002 extends DaoEPBase { ...@@ -147,204 +159,243 @@ public class HGCG002 extends DaoEPBase {
private String auditUserId = " "; /* 审核人ID*/ private String auditUserId = " "; /* 审核人ID*/
private String auditUserName = " "; /* 审核人名称*/ private String auditUserName = " "; /* 审核人名称*/
private String auditReason = " "; /* 审核原因*/ private String auditReason = " "; /* 审核原因*/
private BigDecimal price = new BigDecimal(0.000); /* 单价*/
private BigDecimal amount = new BigDecimal(0.000); /* 金额(不含税金额)*/
private BigDecimal taxIncludeAmount = new BigDecimal(0.000); /* 含税金额*/
private BigDecimal taxAmount = new BigDecimal(0.000); /* 税额*/
private BigDecimal taxRate = new BigDecimal(0.000); /* 税率*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
public void initMetaData() { public void initMetaData() {
EiColumn eiColumn; EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID); eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true); eiColumn.setPrimaryKey(true);
eiColumn.setDescName(" "); eiColumn.setDescName(" ");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_ACCOUNT_CODE); eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
eiColumn.setDescName("企业编码"); eiColumn.setDescName("企业编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE); eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码"); eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("记录创建者"); eiColumn.setDescName("记录创建者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME); eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("记录创建名称"); eiColumn.setDescName("记录创建名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME); eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("记录创建时间"); eiColumn.setDescName("记录创建时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY); eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("记录修改者"); eiColumn.setDescName("记录修改者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME); eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("记录修改名称"); eiColumn.setDescName("记录修改名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME); eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("记录修改时间"); eiColumn.setDescName("记录修改时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG); eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("0-未删除,1-已删除"); eiColumn.setDescName("0-未删除,1-已删除");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE); eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码"); eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME); eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司名称"); eiColumn.setDescName("公司名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CONTRACT_DATE); eiColumn = new EiColumn(FIELD_CONTRACT_DATE);
eiColumn.setDescName("合同日期"); eiColumn.setDescName("合同日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CONTRACT_NO); eiColumn = new EiColumn(FIELD_CONTRACT_NO);
eiColumn.setDescName("合同号"); eiColumn.setDescName("合同号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_NO); eiColumn = new EiColumn(FIELD_PLAN_NO);
eiColumn.setDescName("计划单号"); eiColumn.setDescName("计划单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SUP_CODE); eiColumn = new EiColumn(FIELD_SUP_CODE);
eiColumn.setDescName("供应商编码"); eiColumn.setDescName("供应商编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SUP_NAME); eiColumn = new EiColumn(FIELD_SUP_NAME);
eiColumn.setDescName("供应商名称"); eiColumn.setDescName("供应商名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_USER_ID); eiColumn = new EiColumn(FIELD_PUR_USER_ID);
eiColumn.setDescName("采购员"); eiColumn.setDescName("采购员");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_USER_NAME); eiColumn = new EiColumn(FIELD_PUR_USER_NAME);
eiColumn.setDescName("采购员名称"); eiColumn.setDescName("采购员名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_TYPE); eiColumn = new EiColumn(FIELD_INVENT_TYPE);
eiColumn.setDescName("存货类型"); eiColumn.setDescName("存货类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_CODE); eiColumn = new EiColumn(FIELD_INVENT_CODE);
eiColumn.setDescName("存货编码"); eiColumn.setDescName("存货编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_NAME); eiColumn = new EiColumn(FIELD_INVENT_NAME);
eiColumn.setDescName("存货名称"); eiColumn.setDescName("存货名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID); eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID"); eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC); eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格"); eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_MATERIAL); eiColumn = new EiColumn(FIELD_MATERIAL);
eiColumn.setDescName("材质"); eiColumn.setDescName("材质");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UNIT); eiColumn = new EiColumn(FIELD_UNIT);
eiColumn.setDescName("单位"); eiColumn.setDescName("单位");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_LENGTH); eiColumn = new EiColumn(FIELD_LENGTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("长度"); eiColumn.setDescName("长度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WIDTH); eiColumn = new EiColumn(FIELD_WIDTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("宽度"); eiColumn.setDescName("宽度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_THICK); eiColumn = new EiColumn(FIELD_THICK);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("厚度"); eiColumn.setDescName("厚度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_QTY); eiColumn = new EiColumn(FIELD_PUR_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("采购数量"); eiColumn.setDescName("采购数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_UNIT_WEIGHT); eiColumn = new EiColumn(FIELD_PUR_UNIT_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("采购单重"); eiColumn.setDescName("采购单重");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_WEIGHT); eiColumn = new EiColumn(FIELD_PUR_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("采购重量"); eiColumn.setDescName("采购重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_QTY); eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("收货数量"); eiColumn.setDescName("收货数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_WEIGHT); eiColumn = new EiColumn(FIELD_RECEIVE_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("收货重量"); eiColumn.setDescName("收货重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态:0-未审批,1-审核通过,2-审核未通过"); eiColumn.setDescName("状态:0-未审批,1-审核通过,2-审核未通过");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AUDIT_TIME); eiColumn = new EiColumn(FIELD_AUDIT_TIME);
eiColumn.setDescName("审核时间"); eiColumn.setDescName("审核时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AUDIT_USER_ID); eiColumn = new EiColumn(FIELD_AUDIT_USER_ID);
eiColumn.setDescName("审核人ID"); eiColumn.setDescName("审核人ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AUDIT_USER_NAME); eiColumn = new EiColumn(FIELD_AUDIT_USER_NAME);
eiColumn.setDescName("审核人名称"); eiColumn.setDescName("审核人名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AUDIT_REASON); eiColumn = new EiColumn(FIELD_AUDIT_REASON);
eiColumn.setDescName("审核原因"); eiColumn.setDescName("审核原因");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRICE);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20);
eiColumn.setDescName("单价");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AMOUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20);
eiColumn.setDescName("金额(不含税金额)");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20);
eiColumn.setDescName("含税金额");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20);
eiColumn.setDescName("税额");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TAX_RATE);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20);
eiColumn.setDescName("税率");
eiMetadata.addMeta(eiColumn);
} }
/** /**
* the constructor. * the constructor.
*/ */
public HGCG002() { public HGCG002() {
initMetaData(); initMetaData();
} }
/** /**
* get the id . * get the id .
* @return the id * @return the id
...@@ -352,7 +403,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -352,7 +403,7 @@ public class HGCG002 extends DaoEPBase {
public Long getId() { public Long getId() {
return this.id; return this.id;
} }
/** /**
* set the id . * set the id .
* *
...@@ -368,7 +419,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -368,7 +419,7 @@ public class HGCG002 extends DaoEPBase {
public String getAccountCode() { public String getAccountCode() {
return this.accountCode; return this.accountCode;
} }
/** /**
* set the accountCode - 企业编码. * set the accountCode - 企业编码.
* *
...@@ -384,7 +435,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -384,7 +435,7 @@ public class HGCG002 extends DaoEPBase {
public String getDepCode() { public String getDepCode() {
return this.depCode; return this.depCode;
} }
/** /**
* set the depCode - 部门编码. * set the depCode - 部门编码.
* *
...@@ -400,7 +451,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -400,7 +451,7 @@ public class HGCG002 extends DaoEPBase {
public String getCreatedBy() { public String getCreatedBy() {
return this.createdBy; return this.createdBy;
} }
/** /**
* set the createdBy - 记录创建者. * set the createdBy - 记录创建者.
* *
...@@ -416,7 +467,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -416,7 +467,7 @@ public class HGCG002 extends DaoEPBase {
public String getCreatedName() { public String getCreatedName() {
return this.createdName; return this.createdName;
} }
/** /**
* set the createdName - 记录创建名称. * set the createdName - 记录创建名称.
* *
...@@ -432,7 +483,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -432,7 +483,7 @@ public class HGCG002 extends DaoEPBase {
public String getCreatedTime() { public String getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
/** /**
* set the createdTime - 记录创建时间. * set the createdTime - 记录创建时间.
* *
...@@ -448,7 +499,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -448,7 +499,7 @@ public class HGCG002 extends DaoEPBase {
public String getUpdatedBy() { public String getUpdatedBy() {
return this.updatedBy; return this.updatedBy;
} }
/** /**
* set the updatedBy - 记录修改者. * set the updatedBy - 记录修改者.
* *
...@@ -464,7 +515,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -464,7 +515,7 @@ public class HGCG002 extends DaoEPBase {
public String getUpdatedName() { public String getUpdatedName() {
return this.updatedName; return this.updatedName;
} }
/** /**
* set the updatedName - 记录修改名称. * set the updatedName - 记录修改名称.
* *
...@@ -480,7 +531,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -480,7 +531,7 @@ public class HGCG002 extends DaoEPBase {
public String getUpdatedTime() { public String getUpdatedTime() {
return this.updatedTime; return this.updatedTime;
} }
/** /**
* set the updatedTime - 记录修改时间. * set the updatedTime - 记录修改时间.
* *
...@@ -496,7 +547,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -496,7 +547,7 @@ public class HGCG002 extends DaoEPBase {
public Integer getDeleteFlag() { public Integer getDeleteFlag() {
return this.deleteFlag; return this.deleteFlag;
} }
/** /**
* set the deleteFlag - 0-未删除,1-已删除. * set the deleteFlag - 0-未删除,1-已删除.
* *
...@@ -512,7 +563,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -512,7 +563,7 @@ public class HGCG002 extends DaoEPBase {
public String getCompanyCode() { public String getCompanyCode() {
return this.companyCode; return this.companyCode;
} }
/** /**
* set the companyCode - 公司编码. * set the companyCode - 公司编码.
* *
...@@ -528,7 +579,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -528,7 +579,7 @@ public class HGCG002 extends DaoEPBase {
public String getCompanyName() { public String getCompanyName() {
return this.companyName; return this.companyName;
} }
/** /**
* set the companyName - 公司名称. * set the companyName - 公司名称.
* *
...@@ -544,7 +595,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -544,7 +595,7 @@ public class HGCG002 extends DaoEPBase {
public String getContractDate() { public String getContractDate() {
return this.contractDate; return this.contractDate;
} }
/** /**
* set the contractDate - 合同日期. * set the contractDate - 合同日期.
* *
...@@ -560,7 +611,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -560,7 +611,7 @@ public class HGCG002 extends DaoEPBase {
public String getContractNo() { public String getContractNo() {
return this.contractNo; return this.contractNo;
} }
/** /**
* set the contractNo - 合同号. * set the contractNo - 合同号.
* *
...@@ -576,7 +627,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -576,7 +627,7 @@ public class HGCG002 extends DaoEPBase {
public String getPlanNo() { public String getPlanNo() {
return this.planNo; return this.planNo;
} }
/** /**
* set the planNo - 计划单号. * set the planNo - 计划单号.
* *
...@@ -592,7 +643,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -592,7 +643,7 @@ public class HGCG002 extends DaoEPBase {
public String getSupCode() { public String getSupCode() {
return this.supCode; return this.supCode;
} }
/** /**
* set the supCode - 供应商编码. * set the supCode - 供应商编码.
* *
...@@ -608,7 +659,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -608,7 +659,7 @@ public class HGCG002 extends DaoEPBase {
public String getSupName() { public String getSupName() {
return this.supName; return this.supName;
} }
/** /**
* set the supName - 供应商名称. * set the supName - 供应商名称.
* *
...@@ -624,7 +675,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -624,7 +675,7 @@ public class HGCG002 extends DaoEPBase {
public String getPurUserId() { public String getPurUserId() {
return this.purUserId; return this.purUserId;
} }
/** /**
* set the purUserId - 采购员. * set the purUserId - 采购员.
* *
...@@ -640,7 +691,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -640,7 +691,7 @@ public class HGCG002 extends DaoEPBase {
public String getPurUserName() { public String getPurUserName() {
return this.purUserName; return this.purUserName;
} }
/** /**
* set the purUserName - 采购员名称. * set the purUserName - 采购员名称.
* *
...@@ -656,7 +707,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -656,7 +707,7 @@ public class HGCG002 extends DaoEPBase {
public String getInventType() { public String getInventType() {
return this.inventType; return this.inventType;
} }
/** /**
* set the inventType - 存货类型. * set the inventType - 存货类型.
* *
...@@ -672,7 +723,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -672,7 +723,7 @@ public class HGCG002 extends DaoEPBase {
public String getInventCode() { public String getInventCode() {
return this.inventCode; return this.inventCode;
} }
/** /**
* set the inventCode - 存货编码. * set the inventCode - 存货编码.
* *
...@@ -688,7 +739,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -688,7 +739,7 @@ public class HGCG002 extends DaoEPBase {
public String getInventName() { public String getInventName() {
return this.inventName; return this.inventName;
} }
/** /**
* set the inventName - 存货名称. * set the inventName - 存货名称.
* *
...@@ -704,7 +755,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -704,7 +755,7 @@ public class HGCG002 extends DaoEPBase {
public Long getSpecId() { public Long getSpecId() {
return this.specId; return this.specId;
} }
/** /**
* set the specId - 规格ID. * set the specId - 规格ID.
* *
...@@ -720,7 +771,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -720,7 +771,7 @@ public class HGCG002 extends DaoEPBase {
public String getSpec() { public String getSpec() {
return this.spec; return this.spec;
} }
/** /**
* set the spec - 规格. * set the spec - 规格.
* *
...@@ -736,7 +787,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -736,7 +787,7 @@ public class HGCG002 extends DaoEPBase {
public String getMaterial() { public String getMaterial() {
return this.material; return this.material;
} }
/** /**
* set the material - 材质. * set the material - 材质.
* *
...@@ -752,7 +803,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -752,7 +803,7 @@ public class HGCG002 extends DaoEPBase {
public String getUnit() { public String getUnit() {
return this.unit; return this.unit;
} }
/** /**
* set the unit - 单位. * set the unit - 单位.
* *
...@@ -768,7 +819,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -768,7 +819,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getLength() { public BigDecimal getLength() {
return this.length; return this.length;
} }
/** /**
* set the length - 长度. * set the length - 长度.
* *
...@@ -784,7 +835,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -784,7 +835,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getWidth() { public BigDecimal getWidth() {
return this.width; return this.width;
} }
/** /**
* set the width - 宽度. * set the width - 宽度.
* *
...@@ -800,7 +851,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -800,7 +851,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getThick() { public BigDecimal getThick() {
return this.thick; return this.thick;
} }
/** /**
* set the thick - 厚度. * set the thick - 厚度.
* *
...@@ -816,7 +867,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -816,7 +867,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getPurQty() { public BigDecimal getPurQty() {
return this.purQty; return this.purQty;
} }
/** /**
* set the purQty - 采购数量. * set the purQty - 采购数量.
* *
...@@ -832,7 +883,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -832,7 +883,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getPurUnitWeight() { public BigDecimal getPurUnitWeight() {
return this.purUnitWeight; return this.purUnitWeight;
} }
/** /**
* set the purUnitWeight - 采购单重. * set the purUnitWeight - 采购单重.
* *
...@@ -848,7 +899,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -848,7 +899,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getPurWeight() { public BigDecimal getPurWeight() {
return this.purWeight; return this.purWeight;
} }
/** /**
* set the purWeight - 采购重量. * set the purWeight - 采购重量.
* *
...@@ -864,7 +915,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -864,7 +915,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getReceiveQty() { public BigDecimal getReceiveQty() {
return this.receiveQty; return this.receiveQty;
} }
/** /**
* set the receiveQty - 收货数量. * set the receiveQty - 收货数量.
* *
...@@ -880,7 +931,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -880,7 +931,7 @@ public class HGCG002 extends DaoEPBase {
public BigDecimal getReceiveWeight() { public BigDecimal getReceiveWeight() {
return this.receiveWeight; return this.receiveWeight;
} }
/** /**
* set the receiveWeight - 收货重量. * set the receiveWeight - 收货重量.
* *
...@@ -896,7 +947,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -896,7 +947,7 @@ public class HGCG002 extends DaoEPBase {
public Integer getStatus() { public Integer getStatus() {
return this.status; return this.status;
} }
/** /**
* set the status - 状态:0-未审批,1-审核通过,2-审核未通过. * set the status - 状态:0-未审批,1-审核通过,2-审核未通过.
* *
...@@ -912,7 +963,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -912,7 +963,7 @@ public class HGCG002 extends DaoEPBase {
public String getAuditTime() { public String getAuditTime() {
return this.auditTime; return this.auditTime;
} }
/** /**
* set the auditTime - 审核时间. * set the auditTime - 审核时间.
* *
...@@ -928,7 +979,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -928,7 +979,7 @@ public class HGCG002 extends DaoEPBase {
public String getAuditUserId() { public String getAuditUserId() {
return this.auditUserId; return this.auditUserId;
} }
/** /**
* set the auditUserId - 审核人ID. * set the auditUserId - 审核人ID.
* *
...@@ -944,7 +995,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -944,7 +995,7 @@ public class HGCG002 extends DaoEPBase {
public String getAuditUserName() { public String getAuditUserName() {
return this.auditUserName; return this.auditUserName;
} }
/** /**
* set the auditUserName - 审核人名称. * set the auditUserName - 审核人名称.
* *
...@@ -960,7 +1011,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -960,7 +1011,7 @@ public class HGCG002 extends DaoEPBase {
public String getAuditReason() { public String getAuditReason() {
return this.auditReason; return this.auditReason;
} }
/** /**
* set the auditReason - 审核原因. * set the auditReason - 审核原因.
* *
...@@ -969,6 +1020,47 @@ public class HGCG002 extends DaoEPBase { ...@@ -969,6 +1020,47 @@ public class HGCG002 extends DaoEPBase {
public void setAuditReason(String auditReason) { public void setAuditReason(String auditReason) {
this.auditReason = auditReason; this.auditReason = auditReason;
} }
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public BigDecimal getTaxIncludeAmount() {
return taxIncludeAmount;
}
public void setTaxIncludeAmount(BigDecimal taxIncludeAmount) {
this.taxIncludeAmount = taxIncludeAmount;
}
public BigDecimal getTaxAmount() {
return taxAmount;
}
public void setTaxAmount(BigDecimal taxAmount) {
this.taxAmount = taxAmount;
}
public BigDecimal getTaxRate() {
return taxRate;
}
public void setTaxRate(BigDecimal taxRate) {
this.taxRate = taxRate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -976,7 +1068,7 @@ public class HGCG002 extends DaoEPBase { ...@@ -976,7 +1068,7 @@ public class HGCG002 extends DaoEPBase {
*/ */
@Override @Override
public void fromMap(Map map) { public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id)); setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode)); setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
...@@ -1016,14 +1108,19 @@ public class HGCG002 extends DaoEPBase { ...@@ -1016,14 +1108,19 @@ public class HGCG002 extends DaoEPBase {
setAuditUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_ID)), auditUserId)); setAuditUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_ID)), auditUserId));
setAuditUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_NAME)), auditUserName)); setAuditUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_NAME)), auditUserName));
setAuditReason(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_REASON)), auditReason)); setAuditReason(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_REASON)), auditReason));
setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price));
setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
setTaxIncludeAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_INCLUDE_AMOUNT)), taxIncludeAmount));
setTaxAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_AMOUNT)), taxAmount));
setTaxRate(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_RATE)), taxRate));
} }
/** /**
* set the value to Map. * set the value to Map.
*/ */
@Override @Override
public Map toMap() { public Map toMap() {
Map map = new HashMap(); Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID))); map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE))); map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
...@@ -1064,7 +1161,12 @@ public class HGCG002 extends DaoEPBase { ...@@ -1064,7 +1161,12 @@ public class HGCG002 extends DaoEPBase {
map.put(FIELD_AUDIT_USER_ID, StringUtils.toString(auditUserId, eiMetadata.getMeta(FIELD_AUDIT_USER_ID))); map.put(FIELD_AUDIT_USER_ID, StringUtils.toString(auditUserId, eiMetadata.getMeta(FIELD_AUDIT_USER_ID)));
map.put(FIELD_AUDIT_USER_NAME, StringUtils.toString(auditUserName, eiMetadata.getMeta(FIELD_AUDIT_USER_NAME))); map.put(FIELD_AUDIT_USER_NAME, StringUtils.toString(auditUserName, eiMetadata.getMeta(FIELD_AUDIT_USER_NAME)));
map.put(FIELD_AUDIT_REASON, StringUtils.toString(auditReason, eiMetadata.getMeta(FIELD_AUDIT_REASON))); map.put(FIELD_AUDIT_REASON, StringUtils.toString(auditReason, eiMetadata.getMeta(FIELD_AUDIT_REASON)));
map.put(FIELD_PRICE, StringUtils.toString(price, eiMetadata.getMeta(FIELD_PRICE)));
map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
map.put(FIELD_TAX_INCLUDE_AMOUNT, StringUtils.toString(taxIncludeAmount, eiMetadata.getMeta(FIELD_TAX_INCLUDE_AMOUNT)));
map.put(FIELD_TAX_AMOUNT, StringUtils.toString(taxAmount, eiMetadata.getMeta(FIELD_TAX_AMOUNT)));
map.put(FIELD_TAX_RATE, StringUtils.toString(taxRate, eiMetadata.getMeta(FIELD_TAX_RATE)));
return map; return map;
} }
} }
package com.baosight.hggp.hg.cg.domain; package com.baosight.hggp.hg.cg.domain;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn; import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.StringUtils; import com.baosight.iplat4j.core.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
...@@ -20,10 +18,10 @@ import java.util.Map; ...@@ -20,10 +18,10 @@ import java.util.Map;
* @history 2024-05-09 15:41:54 create * @history 2024-05-09 15:41:54 create
*/ */
public class HGCG002A extends HGCG002 { public class HGCG002A extends HGCG002 {
public static final String FIELD_BC_RECEIVE_QTY = "bcReceiveQty"; /* 本次收货数量*/ public static final String FIELD_BC_RECEIVE_QTY = "bcReceiveQty"; /* 本次收货数量*/
public static final String FIELD_BC_MAX_RECEIVE_QTY = "bcMaxReceiveQty"; /* 本次最大收货数量*/ public static final String FIELD_BC_MAX_RECEIVE_QTY = "bcMaxReceiveQty"; /* 本次最大收货数量*/
private BigDecimal bcReceiveQty = new BigDecimal(0.000); /* 本次收货数量*/ private BigDecimal bcReceiveQty = new BigDecimal(0.000); /* 本次收货数量*/
private BigDecimal bcMaxReceiveQty = new BigDecimal(0.000); /* 本次最大收货数量*/ private BigDecimal bcMaxReceiveQty = new BigDecimal(0.000); /* 本次最大收货数量*/
...@@ -32,14 +30,14 @@ public class HGCG002A extends HGCG002 { ...@@ -32,14 +30,14 @@ public class HGCG002A extends HGCG002 {
*/ */
public void initMetaData() { public void initMetaData() {
EiColumn eiColumn; EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_BC_RECEIVE_QTY); eiColumn = new EiColumn(FIELD_BC_RECEIVE_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("本次收货数量"); eiColumn.setDescName("本次收货数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_BC_MAX_RECEIVE_QTY); eiColumn = new EiColumn(FIELD_BC_MAX_RECEIVE_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
...@@ -56,23 +54,23 @@ public class HGCG002A extends HGCG002 { ...@@ -56,23 +54,23 @@ public class HGCG002A extends HGCG002 {
super.initMetaData(); super.initMetaData();
initMetaData(); initMetaData();
} }
public BigDecimal getBcReceiveQty() { public BigDecimal getBcReceiveQty() {
return bcReceiveQty; return bcReceiveQty;
} }
public void setBcReceiveQty(BigDecimal bcReceiveQty) { public void setBcReceiveQty(BigDecimal bcReceiveQty) {
this.bcReceiveQty = bcReceiveQty; this.bcReceiveQty = bcReceiveQty;
} }
public BigDecimal getBcMaxReceiveQty() { public BigDecimal getBcMaxReceiveQty() {
return bcMaxReceiveQty; return bcMaxReceiveQty;
} }
public void setBcMaxReceiveQty(BigDecimal bcMaxReceiveQty) { public void setBcMaxReceiveQty(BigDecimal bcMaxReceiveQty) {
this.bcMaxReceiveQty = bcMaxReceiveQty; this.bcMaxReceiveQty = bcMaxReceiveQty;
} }
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -83,7 +81,7 @@ public class HGCG002A extends HGCG002 { ...@@ -83,7 +81,7 @@ public class HGCG002A extends HGCG002 {
super.fromMap(map); super.fromMap(map);
setBcReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BC_RECEIVE_QTY)), bcReceiveQty)); setBcReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BC_RECEIVE_QTY)), bcReceiveQty));
setBcMaxReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BC_MAX_RECEIVE_QTY)), bcMaxReceiveQty)); setBcMaxReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BC_MAX_RECEIVE_QTY)), bcMaxReceiveQty));
} }
/** /**
......
...@@ -19,9 +19,9 @@ import com.baosight.iplat4j.core.util.StringUtils; ...@@ -19,9 +19,9 @@ import com.baosight.iplat4j.core.util.StringUtils;
* @history 2024-05-11 17:26:18 create * @history 2024-05-11 17:26:18 create
*/ */
public class HGCG003 extends DaoEPBase { public class HGCG003 extends DaoEPBase {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; public static final String FIELD_ID = "id";
public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/ public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
...@@ -58,7 +58,9 @@ public class HGCG003 extends DaoEPBase { ...@@ -58,7 +58,9 @@ public class HGCG003 extends DaoEPBase {
public static final String FIELD_RECEIVE_UNIT_WEIGHT = "receiveUnitWeight"; /* 收货单重*/ public static final String FIELD_RECEIVE_UNIT_WEIGHT = "receiveUnitWeight"; /* 收货单重*/
public static final String FIELD_RECEIVE_WEIGHT = "receiveWeight"; /* 收货重量*/ public static final String FIELD_RECEIVE_WEIGHT = "receiveWeight"; /* 收货重量*/
public static final String FIELD_STATUS = "status"; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/ public static final String FIELD_STATUS = "status"; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/
public static final String FIELD_PRICE = "price"; /* 单价*/
public static final String FIELD_AMOUNT = "amount"; /* 金额*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/ public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
...@@ -95,13 +97,15 @@ public class HGCG003 extends DaoEPBase { ...@@ -95,13 +97,15 @@ public class HGCG003 extends DaoEPBase {
public static final String COL_RECEIVE_UNIT_WEIGHT = "RECEIVE_UNIT_WEIGHT"; /* 收货单重*/ public static final String COL_RECEIVE_UNIT_WEIGHT = "RECEIVE_UNIT_WEIGHT"; /* 收货单重*/
public static final String COL_RECEIVE_WEIGHT = "RECEIVE_WEIGHT"; /* 收货重量*/ public static final String COL_RECEIVE_WEIGHT = "RECEIVE_WEIGHT"; /* 收货重量*/
public static final String COL_STATUS = "STATUS"; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/ public static final String COL_STATUS = "STATUS"; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/
public static final String COL_PRICE = "PRICE"; /* 单价*/
public static final String COL_AMOUNT = "AMOUNT"; /* 金额*/
public static final String QUERY = "HGCG003.query"; public static final String QUERY = "HGCG003.query";
public static final String COUNT = "HGCG003.count"; public static final String COUNT = "HGCG003.count";
public static final String INSERT = "HGCG003.insert"; public static final String INSERT = "HGCG003.insert";
public static final String UPDATE = "HGCG003.update"; public static final String UPDATE = "HGCG003.update";
public static final String DELETE = "HGCG003.delete"; public static final String DELETE = "HGCG003.delete";
private Long id = new Long(0); private Long id = new Long(0);
private String accountCode = " "; /* 企业编码*/ private String accountCode = " "; /* 企业编码*/
private String depCode = " "; /* 部门编码*/ private String depCode = " "; /* 部门编码*/
...@@ -138,192 +142,206 @@ public class HGCG003 extends DaoEPBase { ...@@ -138,192 +142,206 @@ public class HGCG003 extends DaoEPBase {
private BigDecimal receiveUnitWeight = new BigDecimal(0.000); /* 收货单重*/ private BigDecimal receiveUnitWeight = new BigDecimal(0.000); /* 收货单重*/
private BigDecimal receiveWeight = new BigDecimal(0.000); /* 收货重量*/ private BigDecimal receiveWeight = new BigDecimal(0.000); /* 收货重量*/
private Integer status; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/ private Integer status; /* 状态:0-已收货,1-已入库,2-部分入库,3-退货*/
private BigDecimal price = new BigDecimal(0.000); /* 单价*/
private BigDecimal amount = new BigDecimal(0.000); /* 金额*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
public void initMetaData() { public void initMetaData() {
EiColumn eiColumn; EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID); eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true); eiColumn.setPrimaryKey(true);
eiColumn.setDescName(" "); eiColumn.setDescName(" ");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_ACCOUNT_CODE); eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
eiColumn.setDescName("企业编码"); eiColumn.setDescName("企业编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE); eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码"); eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("记录创建者"); eiColumn.setDescName("记录创建者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME); eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("记录创建名称"); eiColumn.setDescName("记录创建名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME); eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("记录创建时间"); eiColumn.setDescName("记录创建时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY); eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("记录修改者"); eiColumn.setDescName("记录修改者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME); eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("记录修改名称"); eiColumn.setDescName("记录修改名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME); eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("记录修改时间"); eiColumn.setDescName("记录修改时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG); eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("0-未删除,1-已删除"); eiColumn.setDescName("0-未删除,1-已删除");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE); eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码"); eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME); eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司名称"); eiColumn.setDescName("公司名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_DATE); eiColumn = new EiColumn(FIELD_RECEIVE_DATE);
eiColumn.setDescName("收货日期"); eiColumn.setDescName("收货日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_NO); eiColumn = new EiColumn(FIELD_RECEIVE_NO);
eiColumn.setDescName("收货单号"); eiColumn.setDescName("收货单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_NO); eiColumn = new EiColumn(FIELD_PLAN_NO);
eiColumn.setDescName("计划单号"); eiColumn.setDescName("计划单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CONTRACT_NO); eiColumn = new EiColumn(FIELD_CONTRACT_NO);
eiColumn.setDescName("合同号"); eiColumn.setDescName("合同号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SUP_CODE); eiColumn = new EiColumn(FIELD_SUP_CODE);
eiColumn.setDescName("供应商编码"); eiColumn.setDescName("供应商编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SUP_NAME); eiColumn = new EiColumn(FIELD_SUP_NAME);
eiColumn.setDescName("供应商名称"); eiColumn.setDescName("供应商名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_USER_ID); eiColumn = new EiColumn(FIELD_PUR_USER_ID);
eiColumn.setDescName("采购员"); eiColumn.setDescName("采购员");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUR_USER_NAME); eiColumn = new EiColumn(FIELD_PUR_USER_NAME);
eiColumn.setDescName("采购员名称"); eiColumn.setDescName("采购员名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_TYPE); eiColumn = new EiColumn(FIELD_INVENT_TYPE);
eiColumn.setDescName("存货类型"); eiColumn.setDescName("存货类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_CODE); eiColumn = new EiColumn(FIELD_INVENT_CODE);
eiColumn.setDescName("存货编码"); eiColumn.setDescName("存货编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_NAME); eiColumn = new EiColumn(FIELD_INVENT_NAME);
eiColumn.setDescName("存货名称"); eiColumn.setDescName("存货名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID); eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID"); eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC); eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格"); eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_MATERIAL); eiColumn = new EiColumn(FIELD_MATERIAL);
eiColumn.setDescName("材质"); eiColumn.setDescName("材质");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UNIT); eiColumn = new EiColumn(FIELD_UNIT);
eiColumn.setDescName("单位"); eiColumn.setDescName("单位");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_LENGTH); eiColumn = new EiColumn(FIELD_LENGTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("长度"); eiColumn.setDescName("长度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WIDTH); eiColumn = new EiColumn(FIELD_WIDTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("宽度"); eiColumn.setDescName("宽度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_THICK); eiColumn = new EiColumn(FIELD_THICK);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("厚度"); eiColumn.setDescName("厚度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_QTY); eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("收货数量"); eiColumn.setDescName("收货数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVER_QTY); eiColumn = new EiColumn(FIELD_DELIVER_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("退货数量"); eiColumn.setDescName("退货数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_QTY); eiColumn = new EiColumn(FIELD_DEPOSIT_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("入库数量"); eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_UNIT_WEIGHT); eiColumn = new EiColumn(FIELD_RECEIVE_UNIT_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("收货单重"); eiColumn.setDescName("收货单重");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECEIVE_WEIGHT); eiColumn = new EiColumn(FIELD_RECEIVE_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("收货重量"); eiColumn.setDescName("收货重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态:0-已收货,1-已入库,2-部分入库,3-退货"); eiColumn.setDescName("状态:0-已收货,1-已入库,2-部分入库,3-退货");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRICE);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("单价");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AMOUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("金额");
eiMetadata.addMeta(eiColumn);
} }
/** /**
* the constructor. * the constructor.
*/ */
public HGCG003() { public HGCG003() {
initMetaData(); initMetaData();
} }
/** /**
* get the id . * get the id .
* @return the id * @return the id
...@@ -331,7 +349,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -331,7 +349,7 @@ public class HGCG003 extends DaoEPBase {
public Long getId() { public Long getId() {
return this.id; return this.id;
} }
/** /**
* set the id . * set the id .
* *
...@@ -347,7 +365,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -347,7 +365,7 @@ public class HGCG003 extends DaoEPBase {
public String getAccountCode() { public String getAccountCode() {
return this.accountCode; return this.accountCode;
} }
/** /**
* set the accountCode - 企业编码. * set the accountCode - 企业编码.
* *
...@@ -363,7 +381,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -363,7 +381,7 @@ public class HGCG003 extends DaoEPBase {
public String getDepCode() { public String getDepCode() {
return this.depCode; return this.depCode;
} }
/** /**
* set the depCode - 部门编码. * set the depCode - 部门编码.
* *
...@@ -379,7 +397,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -379,7 +397,7 @@ public class HGCG003 extends DaoEPBase {
public String getCreatedBy() { public String getCreatedBy() {
return this.createdBy; return this.createdBy;
} }
/** /**
* set the createdBy - 记录创建者. * set the createdBy - 记录创建者.
* *
...@@ -395,7 +413,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -395,7 +413,7 @@ public class HGCG003 extends DaoEPBase {
public String getCreatedName() { public String getCreatedName() {
return this.createdName; return this.createdName;
} }
/** /**
* set the createdName - 记录创建名称. * set the createdName - 记录创建名称.
* *
...@@ -411,7 +429,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -411,7 +429,7 @@ public class HGCG003 extends DaoEPBase {
public String getCreatedTime() { public String getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
/** /**
* set the createdTime - 记录创建时间. * set the createdTime - 记录创建时间.
* *
...@@ -427,7 +445,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -427,7 +445,7 @@ public class HGCG003 extends DaoEPBase {
public String getUpdatedBy() { public String getUpdatedBy() {
return this.updatedBy; return this.updatedBy;
} }
/** /**
* set the updatedBy - 记录修改者. * set the updatedBy - 记录修改者.
* *
...@@ -443,7 +461,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -443,7 +461,7 @@ public class HGCG003 extends DaoEPBase {
public String getUpdatedName() { public String getUpdatedName() {
return this.updatedName; return this.updatedName;
} }
/** /**
* set the updatedName - 记录修改名称. * set the updatedName - 记录修改名称.
* *
...@@ -459,7 +477,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -459,7 +477,7 @@ public class HGCG003 extends DaoEPBase {
public String getUpdatedTime() { public String getUpdatedTime() {
return this.updatedTime; return this.updatedTime;
} }
/** /**
* set the updatedTime - 记录修改时间. * set the updatedTime - 记录修改时间.
* *
...@@ -475,7 +493,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -475,7 +493,7 @@ public class HGCG003 extends DaoEPBase {
public Integer getDeleteFlag() { public Integer getDeleteFlag() {
return this.deleteFlag; return this.deleteFlag;
} }
/** /**
* set the deleteFlag - 0-未删除,1-已删除. * set the deleteFlag - 0-未删除,1-已删除.
* *
...@@ -491,7 +509,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -491,7 +509,7 @@ public class HGCG003 extends DaoEPBase {
public String getCompanyCode() { public String getCompanyCode() {
return this.companyCode; return this.companyCode;
} }
/** /**
* set the companyCode - 公司编码. * set the companyCode - 公司编码.
* *
...@@ -507,7 +525,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -507,7 +525,7 @@ public class HGCG003 extends DaoEPBase {
public String getCompanyName() { public String getCompanyName() {
return this.companyName; return this.companyName;
} }
/** /**
* set the companyName - 公司名称. * set the companyName - 公司名称.
* *
...@@ -523,7 +541,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -523,7 +541,7 @@ public class HGCG003 extends DaoEPBase {
public String getReceiveDate() { public String getReceiveDate() {
return this.receiveDate; return this.receiveDate;
} }
/** /**
* set the receiveDate - 收货日期. * set the receiveDate - 收货日期.
* *
...@@ -539,7 +557,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -539,7 +557,7 @@ public class HGCG003 extends DaoEPBase {
public String getReceiveNo() { public String getReceiveNo() {
return this.receiveNo; return this.receiveNo;
} }
/** /**
* set the receiveNo - 收货单号. * set the receiveNo - 收货单号.
* *
...@@ -555,7 +573,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -555,7 +573,7 @@ public class HGCG003 extends DaoEPBase {
public String getPlanNo() { public String getPlanNo() {
return this.planNo; return this.planNo;
} }
/** /**
* set the planNo - 计划单号. * set the planNo - 计划单号.
* *
...@@ -571,7 +589,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -571,7 +589,7 @@ public class HGCG003 extends DaoEPBase {
public String getContractNo() { public String getContractNo() {
return this.contractNo; return this.contractNo;
} }
/** /**
* set the contractNo - 合同号. * set the contractNo - 合同号.
* *
...@@ -587,7 +605,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -587,7 +605,7 @@ public class HGCG003 extends DaoEPBase {
public String getSupCode() { public String getSupCode() {
return this.supCode; return this.supCode;
} }
/** /**
* set the supCode - 供应商编码. * set the supCode - 供应商编码.
* *
...@@ -603,7 +621,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -603,7 +621,7 @@ public class HGCG003 extends DaoEPBase {
public String getSupName() { public String getSupName() {
return this.supName; return this.supName;
} }
/** /**
* set the supName - 供应商名称. * set the supName - 供应商名称.
* *
...@@ -619,7 +637,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -619,7 +637,7 @@ public class HGCG003 extends DaoEPBase {
public String getPurUserId() { public String getPurUserId() {
return this.purUserId; return this.purUserId;
} }
/** /**
* set the purUserId - 采购员. * set the purUserId - 采购员.
* *
...@@ -635,7 +653,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -635,7 +653,7 @@ public class HGCG003 extends DaoEPBase {
public String getPurUserName() { public String getPurUserName() {
return this.purUserName; return this.purUserName;
} }
/** /**
* set the purUserName - 采购员名称. * set the purUserName - 采购员名称.
* *
...@@ -651,7 +669,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -651,7 +669,7 @@ public class HGCG003 extends DaoEPBase {
public String getInventType() { public String getInventType() {
return this.inventType; return this.inventType;
} }
/** /**
* set the inventType - 存货类型. * set the inventType - 存货类型.
* *
...@@ -667,7 +685,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -667,7 +685,7 @@ public class HGCG003 extends DaoEPBase {
public String getInventCode() { public String getInventCode() {
return this.inventCode; return this.inventCode;
} }
/** /**
* set the inventCode - 存货编码. * set the inventCode - 存货编码.
* *
...@@ -683,7 +701,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -683,7 +701,7 @@ public class HGCG003 extends DaoEPBase {
public String getInventName() { public String getInventName() {
return this.inventName; return this.inventName;
} }
/** /**
* set the inventName - 存货名称. * set the inventName - 存货名称.
* *
...@@ -699,7 +717,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -699,7 +717,7 @@ public class HGCG003 extends DaoEPBase {
public Long getSpecId() { public Long getSpecId() {
return this.specId; return this.specId;
} }
/** /**
* set the specId - 规格ID. * set the specId - 规格ID.
* *
...@@ -715,7 +733,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -715,7 +733,7 @@ public class HGCG003 extends DaoEPBase {
public String getSpec() { public String getSpec() {
return this.spec; return this.spec;
} }
/** /**
* set the spec - 规格. * set the spec - 规格.
* *
...@@ -731,7 +749,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -731,7 +749,7 @@ public class HGCG003 extends DaoEPBase {
public String getMaterial() { public String getMaterial() {
return this.material; return this.material;
} }
/** /**
* set the material - 材质. * set the material - 材质.
* *
...@@ -747,7 +765,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -747,7 +765,7 @@ public class HGCG003 extends DaoEPBase {
public String getUnit() { public String getUnit() {
return this.unit; return this.unit;
} }
/** /**
* set the unit - 单位. * set the unit - 单位.
* *
...@@ -763,7 +781,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -763,7 +781,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getLength() { public BigDecimal getLength() {
return this.length; return this.length;
} }
/** /**
* set the length - 长度. * set the length - 长度.
* *
...@@ -779,7 +797,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -779,7 +797,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getWidth() { public BigDecimal getWidth() {
return this.width; return this.width;
} }
/** /**
* set the width - 宽度. * set the width - 宽度.
* *
...@@ -795,7 +813,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -795,7 +813,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getThick() { public BigDecimal getThick() {
return this.thick; return this.thick;
} }
/** /**
* set the thick - 厚度. * set the thick - 厚度.
* *
...@@ -811,7 +829,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -811,7 +829,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getReceiveQty() { public BigDecimal getReceiveQty() {
return this.receiveQty; return this.receiveQty;
} }
/** /**
* set the receiveQty - 收货数量. * set the receiveQty - 收货数量.
* *
...@@ -827,7 +845,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -827,7 +845,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getDeliverQty() { public BigDecimal getDeliverQty() {
return this.deliverQty; return this.deliverQty;
} }
/** /**
* set the deliverQty - 退货数量. * set the deliverQty - 退货数量.
* *
...@@ -843,7 +861,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -843,7 +861,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getDepositQty() { public BigDecimal getDepositQty() {
return this.depositQty; return this.depositQty;
} }
/** /**
* set the depositQty - 入库数量. * set the depositQty - 入库数量.
* *
...@@ -859,7 +877,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -859,7 +877,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getReceiveUnitWeight() { public BigDecimal getReceiveUnitWeight() {
return this.receiveUnitWeight; return this.receiveUnitWeight;
} }
/** /**
* set the receiveUnitWeight - 收货单重. * set the receiveUnitWeight - 收货单重.
* *
...@@ -875,7 +893,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -875,7 +893,7 @@ public class HGCG003 extends DaoEPBase {
public BigDecimal getReceiveWeight() { public BigDecimal getReceiveWeight() {
return this.receiveWeight; return this.receiveWeight;
} }
/** /**
* set the receiveWeight - 收货重量. * set the receiveWeight - 收货重量.
* *
...@@ -891,7 +909,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -891,7 +909,7 @@ public class HGCG003 extends DaoEPBase {
public Integer getStatus() { public Integer getStatus() {
return this.status; return this.status;
} }
/** /**
* set the status - 状态:0-已收货,1-已入库,2-部分入库,3-退货. * set the status - 状态:0-已收货,1-已入库,2-部分入库,3-退货.
* *
...@@ -900,6 +918,23 @@ public class HGCG003 extends DaoEPBase { ...@@ -900,6 +918,23 @@ public class HGCG003 extends DaoEPBase {
public void setStatus(Integer status) { public void setStatus(Integer status) {
this.status = status; this.status = status;
} }
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -907,7 +942,7 @@ public class HGCG003 extends DaoEPBase { ...@@ -907,7 +942,7 @@ public class HGCG003 extends DaoEPBase {
*/ */
@Override @Override
public void fromMap(Map map) { public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id)); setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode)); setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
...@@ -944,14 +979,16 @@ public class HGCG003 extends DaoEPBase { ...@@ -944,14 +979,16 @@ public class HGCG003 extends DaoEPBase {
setReceiveUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_UNIT_WEIGHT)), receiveUnitWeight)); setReceiveUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_UNIT_WEIGHT)), receiveUnitWeight));
setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight)); setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status)); setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price));
setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
} }
/** /**
* set the value to Map. * set the value to Map.
*/ */
@Override @Override
public Map toMap() { public Map toMap() {
Map map = new HashMap(); Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID))); map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE))); map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
...@@ -989,7 +1026,9 @@ public class HGCG003 extends DaoEPBase { ...@@ -989,7 +1026,9 @@ public class HGCG003 extends DaoEPBase {
map.put(FIELD_RECEIVE_UNIT_WEIGHT, StringUtils.toString(receiveUnitWeight, eiMetadata.getMeta(FIELD_RECEIVE_UNIT_WEIGHT))); map.put(FIELD_RECEIVE_UNIT_WEIGHT, StringUtils.toString(receiveUnitWeight, eiMetadata.getMeta(FIELD_RECEIVE_UNIT_WEIGHT)));
map.put(FIELD_RECEIVE_WEIGHT, StringUtils.toString(receiveWeight, eiMetadata.getMeta(FIELD_RECEIVE_WEIGHT))); map.put(FIELD_RECEIVE_WEIGHT, StringUtils.toString(receiveWeight, eiMetadata.getMeta(FIELD_RECEIVE_WEIGHT)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS))); map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
map.put(FIELD_PRICE, StringUtils.toString(price, eiMetadata.getMeta(FIELD_PRICE)));
map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
return map; return map;
} }
} }
...@@ -32,7 +32,7 @@ import java.util.Map; ...@@ -32,7 +32,7 @@ import java.util.Map;
* @date:2024/5/9,11:04 * @date:2024/5/9,11:04
*/ */
public class ServiceHGCG003A extends ServiceBase { public class ServiceHGCG003A extends ServiceBase {
/** /**
* 画面初始化 * 画面初始化
* *
...@@ -53,7 +53,7 @@ public class ServiceHGCG003A extends ServiceBase { ...@@ -53,7 +53,7 @@ public class ServiceHGCG003A extends ServiceBase {
} }
return inInfo; return inInfo;
} }
/** /**
* 查询操作 * 查询操作
* *
...@@ -74,7 +74,7 @@ public class ServiceHGCG003A extends ServiceBase { ...@@ -74,7 +74,7 @@ public class ServiceHGCG003A extends ServiceBase {
} }
return inInfo; return inInfo;
} }
/** /**
* 确认操作. * 确认操作.
* *
...@@ -99,7 +99,7 @@ public class ServiceHGCG003A extends ServiceBase { ...@@ -99,7 +99,7 @@ public class ServiceHGCG003A extends ServiceBase {
} }
return inInfo; return inInfo;
} }
/** /**
* 数据校验 * 数据校验
* *
...@@ -119,7 +119,7 @@ public class ServiceHGCG003A extends ServiceBase { ...@@ -119,7 +119,7 @@ public class ServiceHGCG003A extends ServiceBase {
fCg002A.getBcReceiveQty(), dbCg002A.getBcMaxReceiveQty())); fCg002A.getBcReceiveQty(), dbCg002A.getBcMaxReceiveQty()));
} }
} }
/** /**
* 数据保存 * 数据保存
* *
...@@ -143,5 +143,5 @@ public class ServiceHGCG003A extends ServiceBase { ...@@ -143,5 +143,5 @@ public class ServiceHGCG003A extends ServiceBase {
HGCGTools.HgCg002.updateReceive(dbCg002A, fCg002A.getBcReceiveQty()); HGCGTools.HgCg002.updateReceive(dbCg002A, fCg002A.getBcReceiveQty());
} }
} }
} }
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
PUR_WEIGHT as "purWeight", <!-- 采购重量 --> PUR_WEIGHT as "purWeight", <!-- 采购重量 -->
RECEIVE_QTY as "receiveQty", <!-- 收货数量 --> RECEIVE_QTY as "receiveQty", <!-- 收货数量 -->
RECEIVE_WEIGHT as "receiveWeight", <!-- 收货重量 --> RECEIVE_WEIGHT as "receiveWeight", <!-- 收货重量 -->
PRICE as "price", <!-- 单价 -->
AMOUNT as "amount", <!-- 金额(不含税金额) -->
TAX_INCLUDE_AMOUNT as "taxIncludeAmount", <!-- 含税金额 -->
TAX_AMOUNT as "taxAmount", <!-- 税额 -->
TAX_RATE as "taxRate", <!-- 税率 -->
STATUS as "status", <!-- 状态:0-未审批,1-审核通过,2-审核未通过 --> STATUS as "status", <!-- 状态:0-未审批,1-审核通过,2-审核未通过 -->
AUDIT_TIME as "auditTime", <!-- 审核时间 --> AUDIT_TIME as "auditTime", <!-- 审核时间 -->
AUDIT_USER_ID as "auditUserId", <!-- 审核人ID --> AUDIT_USER_ID as "auditUserId", <!-- 审核人ID -->
...@@ -187,13 +192,19 @@ ...@@ -187,13 +192,19 @@
PUR_QTY, <!-- 采购数量 --> PUR_QTY, <!-- 采购数量 -->
PUR_UNIT_WEIGHT, <!-- 采购单重 --> PUR_UNIT_WEIGHT, <!-- 采购单重 -->
PUR_WEIGHT, <!-- 采购重量 --> PUR_WEIGHT, <!-- 采购重量 -->
STATUS <!-- 状态:0-未审批,1-审核通过,2-审核未通过 --> STATUS, <!-- 状态:0-未审批,1-审核通过,2-审核未通过 -->
PRICE, <!-- 单价 -->
AMOUNT, <!-- 金额(不含税金额) -->
TAX_INCLUDE_AMOUNT, <!-- 含税金额 -->
TAX_AMOUNT, <!-- 税额 -->
TAX_RATE <!-- 税率 -->
) VALUES ( ) VALUES (
#accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
#deleteFlag#, #companyCode#, #companyName#, #contractDate#, #contractNo#, #planNo#, #deleteFlag#, #companyCode#, #companyName#, #contractDate#, #contractNo#, #planNo#,
#supCode#, #supName#, #purUserId#, #purUserName#, #inventCode#, #inventName#, #supCode#, #supName#, #purUserId#, #purUserName#, #inventCode#, #inventName#,
#specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#, #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#,
#purQty#, #purUnitWeight#, #purWeight#, #status# #purQty#, #purUnitWeight#, #purWeight#, #status#,
#price#, #amount#, #taxIncludeAmount#, #taxAmount#, #taxRate#
) )
</insert> </insert>
...@@ -221,6 +232,11 @@ ...@@ -221,6 +232,11 @@
SUP_NAME = #supName#, <!-- 供应商名称 --> SUP_NAME = #supName#, <!-- 供应商名称 -->
PUR_USER_ID = #purUserId#, <!-- 采购员 --> PUR_USER_ID = #purUserId#, <!-- 采购员 -->
PUR_USER_NAME = #purUserName#, <!-- 采购员名称 --> PUR_USER_NAME = #purUserName#, <!-- 采购员名称 -->
PRICE = #price#, <!-- 单价 -->
AMOUNT = #amount#, <!-- 金额(不含税金额) -->
TAX_INCLUDE_AMOUNT = #taxIncludeAmount#, <!-- 含税金额 -->
TAX_AMOUNT = #taxAmount#, <!-- 税额 -->
TAX_RATE = #taxRate#, <!-- 税率 -->
<include refid="updateRevise"/> <include refid="updateRevise"/>
WHERE CONTRACT_NO = #contractNo# WHERE CONTRACT_NO = #contractNo#
</update> </update>
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
DEPOSIT_QTY as "depositQty", <!-- 入库数量 --> DEPOSIT_QTY as "depositQty", <!-- 入库数量 -->
RECEIVE_UNIT_WEIGHT as "receiveUnitWeight", <!-- 收货单重 --> RECEIVE_UNIT_WEIGHT as "receiveUnitWeight", <!-- 收货单重 -->
RECEIVE_WEIGHT as "receiveWeight", <!-- 收货重量 --> RECEIVE_WEIGHT as "receiveWeight", <!-- 收货重量 -->
PRICE as "price", <!-- 单价 -->
AMOUNT as "amount", <!-- 金额 -->
STATUS as "status" <!-- 状态:0-已收货,1-已入库,2-部分入库,3-退货 --> STATUS as "status" <!-- 状态:0-已收货,1-已入库,2-部分入库,3-退货 -->
</sql> </sql>
...@@ -94,6 +96,12 @@ ...@@ -94,6 +96,12 @@
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="price">
PRICE = #price#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="amount">
AMOUNT = #amount#
</isNotEmpty>
</sql> </sql>
<sql id="idCondition"> <sql id="idCondition">
...@@ -175,6 +183,8 @@ ...@@ -175,6 +183,8 @@
RECEIVE_QTY, <!-- 收货数量 --> RECEIVE_QTY, <!-- 收货数量 -->
RECEIVE_UNIT_WEIGHT, <!-- 收货单重 --> RECEIVE_UNIT_WEIGHT, <!-- 收货单重 -->
RECEIVE_WEIGHT, <!-- 收货重量 --> RECEIVE_WEIGHT, <!-- 收货重量 -->
PRICE, <!-- 单价 -->
AMOUNT, <!-- 金额 -->
STATUS <!-- 状态:0-已收货,1-已入库,2-部分入库,3-退货 --> STATUS <!-- 状态:0-已收货,1-已入库,2-部分入库,3-退货 -->
) VALUES ( ) VALUES (
#accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
...@@ -182,7 +192,7 @@ ...@@ -182,7 +192,7 @@
#planNo#, #contractNo#, #supCode#, #supName#, #purUserId#, #purUserName#, #planNo#, #contractNo#, #supCode#, #supName#, #purUserId#, #purUserName#,
#inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#, #inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#,
#unit#, #length#, #width#, #thick#, #receiveQty#, #receiveUnitWeight#, #unit#, #length#, #width#, #thick#, #receiveQty#, #receiveUnitWeight#,
#receiveWeight#, #status# #receiveWeight#,#price#, #amount#, #status#
) )
</insert> </insert>
......
...@@ -57,7 +57,8 @@ public class HGKC001 extends DaoEPBase { ...@@ -57,7 +57,8 @@ public class HGKC001 extends DaoEPBase {
public static final String FIELD_SUBMIT_STATUS = "submitStatus"; /* 提交状态 0未提交,1已提交*/ public static final String FIELD_SUBMIT_STATUS = "submitStatus"; /* 提交状态 0未提交,1已提交*/
public static final String FIELD_STORAGE_TYPE = "storageType"; /* 入库类型:1:入库 2:退回*/ public static final String FIELD_STORAGE_TYPE = "storageType"; /* 入库类型:1:入库 2:退回*/
public static final String FIELD_IS_RETURN = "isReturn"; /* 是否退回*/ public static final String FIELD_IS_RETURN = "isReturn"; /* 是否退回*/
public static final String FIELD_PRICE = "price"; /* 单价*/
public static final String FIELD_AMOUNT = "amount"; /* 金额*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
...@@ -95,6 +96,8 @@ public class HGKC001 extends DaoEPBase { ...@@ -95,6 +96,8 @@ public class HGKC001 extends DaoEPBase {
public static final String COL_SUBMIT_STATUS = "SUBMIT_STATUS"; /* 提交状态 0未提交,1已提交*/ public static final String COL_SUBMIT_STATUS = "SUBMIT_STATUS"; /* 提交状态 0未提交,1已提交*/
public static final String COL_STORAGE_TYPE = "STORAGE_TYPE"; /* 入库类型:1:入库 2:退回*/ public static final String COL_STORAGE_TYPE = "STORAGE_TYPE"; /* 入库类型:1:入库 2:退回*/
public static final String COL_IS_RETURN = "IS_RETURN"; /* 是否退回*/ public static final String COL_IS_RETURN = "IS_RETURN"; /* 是否退回*/
public static final String COL_PRICE = "PRICE"; /* 单价*/
public static final String COL_AMOUNT = "AMOUNT"; /* 金额*/
public static final String QUERY = "HGKC001.query"; public static final String QUERY = "HGKC001.query";
...@@ -141,6 +144,8 @@ public class HGKC001 extends DaoEPBase { ...@@ -141,6 +144,8 @@ public class HGKC001 extends DaoEPBase {
private Integer submitStatus; /* 提交状态 0未提交,1已提交*/ private Integer submitStatus; /* 提交状态 0未提交,1已提交*/
private Integer storageType; /* 入库类型:1:入库 2:退回*/ private Integer storageType; /* 入库类型:1:入库 2:退回*/
private Integer isReturn; /* 是否退回:0:否 1:是*/ private Integer isReturn; /* 是否退回:0:否 1:是*/
private BigDecimal price = new BigDecimal(0.000); /* 单价*/
private BigDecimal amount = new BigDecimal(0.000); /* 金额*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -306,6 +311,20 @@ public class HGKC001 extends DaoEPBase { ...@@ -306,6 +311,20 @@ public class HGKC001 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_IS_RETURN); eiColumn = new EiColumn(FIELD_IS_RETURN);
eiColumn.setDescName("是否退回:0:否 1:是"); eiColumn.setDescName("是否退回:0:否 1:是");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRICE);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("单价");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AMOUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("金额");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -852,6 +871,22 @@ public class HGKC001 extends DaoEPBase { ...@@ -852,6 +871,22 @@ public class HGKC001 extends DaoEPBase {
this.isReturn = isReturn; this.isReturn = isReturn;
} }
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -895,6 +930,8 @@ public class HGKC001 extends DaoEPBase { ...@@ -895,6 +930,8 @@ public class HGKC001 extends DaoEPBase {
setSubmitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SUBMIT_STATUS)), submitStatus)); setSubmitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SUBMIT_STATUS)), submitStatus));
setStorageType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STORAGE_TYPE)), storageType)); setStorageType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STORAGE_TYPE)), storageType));
setIsReturn(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_IS_RETURN)), isReturn)); setIsReturn(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_IS_RETURN)), isReturn));
setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price));
setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
} }
/** /**
...@@ -939,6 +976,8 @@ public class HGKC001 extends DaoEPBase { ...@@ -939,6 +976,8 @@ public class HGKC001 extends DaoEPBase {
map.put(FIELD_SUBMIT_STATUS, StringUtils.toString(submitStatus, eiMetadata.getMeta(FIELD_SUBMIT_STATUS))); map.put(FIELD_SUBMIT_STATUS, StringUtils.toString(submitStatus, eiMetadata.getMeta(FIELD_SUBMIT_STATUS)));
map.put(FIELD_STORAGE_TYPE, StringUtils.toString(storageType, eiMetadata.getMeta(FIELD_STORAGE_TYPE))); map.put(FIELD_STORAGE_TYPE, StringUtils.toString(storageType, eiMetadata.getMeta(FIELD_STORAGE_TYPE)));
map.put(FIELD_IS_RETURN, StringUtils.toString(isReturn, eiMetadata.getMeta(FIELD_IS_RETURN))); map.put(FIELD_IS_RETURN, StringUtils.toString(isReturn, eiMetadata.getMeta(FIELD_IS_RETURN)));
map.put(FIELD_PRICE, StringUtils.toString(price, eiMetadata.getMeta(FIELD_PRICE)));
map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
return map; return map;
} }
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 --> DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 -->
STORAGE_TYPE as "storageType", <!-- 入库类型:1:入库 2:退回 --> STORAGE_TYPE as "storageType", <!-- 入库类型:1:入库 2:退回 -->
IS_RETURN as "isReturn", <!-- 是否退回:0:否 1:是 --> IS_RETURN as "isReturn", <!-- 是否退回:0:否 1:是 -->
PRICE as "price", <!-- 单价 -->
AMOUNT as "amount", <!-- 金额 -->
SUBMIT_STATUS as "submitStatus" <!-- 提交状态 --> SUBMIT_STATUS as "submitStatus" <!-- 提交状态 -->
</sql> </sql>
...@@ -105,6 +107,12 @@ ...@@ -105,6 +107,12 @@
<isNotEmpty prepend=" AND " property="storageType"> <isNotEmpty prepend=" AND " property="storageType">
STORAGE_TYPE = #storageType# STORAGE_TYPE = #storageType#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="price">
PRICE = #price#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="amount">
AMOUNT = #amount#
</isNotEmpty>
</sql> </sql>
<sql id="idCondition"> <sql id="idCondition">
...@@ -188,6 +196,8 @@ ...@@ -188,6 +196,8 @@
DEPOSIT_WEIGHT, <!-- 入库重量 --> DEPOSIT_WEIGHT, <!-- 入库重量 -->
STORAGE_TYPE, <!-- 入库类型:1:入库 2:退回 --> STORAGE_TYPE, <!-- 入库类型:1:入库 2:退回 -->
IS_RETURN, <!-- 是否退回:0:否 1:是 --> IS_RETURN, <!-- 是否退回:0:否 1:是 -->
PRICE, <!-- 单价 -->
AMOUNT, <!-- 金额 -->
SUBMIT_STATUS SUBMIT_STATUS
) VALUES ( ) VALUES (
#accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
...@@ -195,7 +205,7 @@ ...@@ -195,7 +205,7 @@
#receiveNo#, #planNo#, #contractNo#, #whCode#, #whName#, #inventType#, #receiveNo#, #planNo#, #contractNo#, #whCode#, #whName#, #inventType#,
#inventCode#, #inventName#, #specId#, #spec#, #material#, #inventCode#, #inventName#, #specId#, #spec#, #material#,
#unit#, #length#, #width#, #thick#, #depositQty#, #depositUnitWeight#, #depositWeight#, #unit#, #length#, #width#, #thick#, #depositQty#, #depositUnitWeight#, #depositWeight#,
#storageType#, #isReturn#,#submitStatus# #storageType#, #isReturn#,#price#, #amount#,#submitStatus#
) )
</insert> </insert>
......
...@@ -14,6 +14,37 @@ $(function () { ...@@ -14,6 +14,37 @@ $(function () {
// change事件 // change事件
grid.dataSource.bind("change", function (e) { grid.dataSource.bind("change", function (e) {
supCodeChange(e); supCodeChange(e);
var item = e.items[0];
if (e.field == "price") {
if(item.purQty && item.price && item.taxRate){
// 数量*单价金额
let totalAmount = item.purQty * item.price;
//税额
let taxAmount = totalAmount* item.taxRate / 100;
//不含税金额
let amount = totalAmount - taxAmount;
//含税金额
let taxIncludeAmount = amount + taxAmount;
resultGrid.setCellValue(item, 'taxAmount', taxAmount)
resultGrid.setCellValue(item, 'amount', amount)
resultGrid.setCellValue(item, 'taxIncludeAmount', taxIncludeAmount)
}
}
if (e.field == "taxRate") {
if(item.purQty && item.price && item.taxRate){
// 数量*单价金额
let totalAmount = item.purQty * item.price;
//税额
let taxAmount = totalAmount* item.taxRate / 100;
//不含税金额
let amount = totalAmount - taxAmount;
//含税金额
let taxIncludeAmount = amount + taxAmount;
resultGrid.setCellValue(item, 'taxAmount', taxAmount)
resultGrid.setCellValue(item, 'amount', amount)
resultGrid.setCellValue(item, 'taxIncludeAmount', taxIncludeAmount)
}
}
}); });
}, },
onSave: function (e) { onSave: function (e) {
......
...@@ -65,9 +65,14 @@ ...@@ -65,9 +65,14 @@
<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/> <EF:EFColumn ename="specId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>
<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/> <EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}"/> <EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" enable="false"/>
<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" enable="false"/>
<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"/> <EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"/>
<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="taxRate" cname="税率(%)" width="80" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/> <EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/> <EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
......
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N0}"/> <EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N0}"/>
<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N0}"/> <EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N0}"/>
<EF:EFColumn ename="receiveWeight" cname="收货重量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="receiveWeight" cname="收货重量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" enable="false"/>
<EF:EFColumn ename="amount" cname="金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/> <EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/> <EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
......
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/> <EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="purUserName" cname="采购员" enable="false" width="100" align="center"/> <EF:EFColumn ename="purUserName" cname="采购员" enable="false" width="100" align="center"/>
<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" enable="false"/>
<EF:EFColumn ename="taxRate" cname="税率(%)" width="80" align="right" format="{0:N3}" enable="false"/>
<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/> <EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
......
...@@ -69,6 +69,8 @@ ...@@ -69,6 +69,8 @@
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" enable="false"/>
<EF:EFColumn ename="amount" cname="金额" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center" <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/> editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment