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

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002.java

@@ -62,6 +62,12 @@ public class HGCG002 extends DaoEPBase {
 	public static final String FIELD_AUDIT_USER_NAME = "auditUserName";    		/* 审核人名称*/
 	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_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
@@ -102,6 +108,12 @@ public class HGCG002 extends DaoEPBase {
 	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_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 COUNT = "HGCG002.count";
 	public static final String INSERT = "HGCG002.insert";
@@ -148,6 +160,12 @@ public class HGCG002 extends DaoEPBase {
 	private String auditUserName = " ";		/* 审核人名称*/
 	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.
 	 */
@@ -335,7 +353,40 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn.setDescName("审核原因");
 		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);
 	}
 
 	/**
@@ -969,6 +1020,47 @@ public class HGCG002 extends DaoEPBase {
 	public void setAuditReason(String 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.
 	 *
@@ -1016,6 +1108,11 @@ public class HGCG002 extends DaoEPBase {
 		setAuditUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_ID)), auditUserId));
 		setAuditUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AUDIT_USER_NAME)), auditUserName));
 		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));
 	}
 
 	/**
@@ -1064,6 +1161,11 @@ 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_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_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;
 	}

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002A.java

 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.util.NumberUtils;
 import com.baosight.iplat4j.core.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.Map;
 
 /**

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003.java

@@ -58,6 +58,8 @@ public class HGCG003 extends DaoEPBase {
 	public static final String FIELD_RECEIVE_UNIT_WEIGHT = "receiveUnitWeight";    		/* 收货单重*/
 	public static final String FIELD_RECEIVE_WEIGHT = "receiveWeight";    		/* 收货重量*/
 	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_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -95,6 +97,8 @@ public class HGCG003 extends DaoEPBase {
 	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_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 COUNT = "HGCG003.count";
@@ -138,6 +142,8 @@ public class HGCG003 extends DaoEPBase {
 	private BigDecimal receiveUnitWeight = new BigDecimal(0.000);		/* 收货单重*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-已收货，1-已入库，2-部分入库，3-退货*/
+	private BigDecimal price = new BigDecimal(0.000);		/* 单价*/
+	private BigDecimal amount = new BigDecimal(0.000);		/* 金额*/
 
 	/**
 	 * initialize the metadata.
@@ -314,7 +320,19 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn.setDescName("状态：0-已收货，1-已入库，2-部分入库，3-退货");
 		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);
 	}
 
 	/**
@@ -900,6 +918,23 @@ public class HGCG003 extends DaoEPBase {
 	public void setStatus(Integer 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.
 	 *
@@ -944,6 +979,8 @@ public class HGCG003 extends DaoEPBase {
 		setReceiveUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_UNIT_WEIGHT)), receiveUnitWeight));
 		setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight));
 		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));
 	}
 
 	/**
@@ -989,6 +1026,8 @@ public class HGCG003 extends DaoEPBase {
 		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_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;
 	}

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG002.xml

@@ -37,6 +37,11 @@
         PUR_WEIGHT as "purWeight",  <!-- 采购重量 -->
         RECEIVE_QTY as "receiveQty",  <!-- 收货数量 -->
         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-审核未通过 -->
         AUDIT_TIME as "auditTime",  <!-- 审核时间 -->
         AUDIT_USER_ID as "auditUserId",  <!-- 审核人ID -->
@@ -187,13 +192,19 @@
         PUR_QTY,  <!-- 采购数量 -->
         PUR_UNIT_WEIGHT,  <!-- 采购单重 -->
         PUR_WEIGHT,  <!-- 采购重量 -->
-        STATUS  <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
+        STATUS,  <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
+        PRICE,  <!-- 单价 -->
+        AMOUNT,  <!-- 金额（不含税金额） -->
+        TAX_INCLUDE_AMOUNT,  <!-- 含税金额 -->
+        TAX_AMOUNT,  <!-- 税额 -->
+        TAX_RATE  <!-- 税率 -->
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #contractDate#, #contractNo#, #planNo#,
         #supCode#, #supName#, #purUserId#, #purUserName#, #inventCode#, #inventName#,
         #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#,
-        #purQty#, #purUnitWeight#, #purWeight#, #status#
+        #purQty#, #purUnitWeight#, #purWeight#, #status#,
+        #price#, #amount#, #taxIncludeAmount#, #taxAmount#, #taxRate#
         )
     </insert>
 
@@ -221,6 +232,11 @@
         SUP_NAME = #supName#,  <!-- 供应商名称 -->
         PUR_USER_ID = #purUserId#,  <!-- 采购员 -->
         PUR_USER_NAME = #purUserName#,  <!-- 采购员名称 -->
+        PRICE = #price#,  <!-- 单价 -->
+        AMOUNT = #amount#,  <!-- 金额（不含税金额） -->
+        TAX_INCLUDE_AMOUNT = #taxIncludeAmount#,  <!-- 含税金额 -->
+        TAX_AMOUNT = #taxAmount#,  <!-- 税额 -->
+        TAX_RATE = #taxRate#,  <!-- 税率 -->
         <include refid="updateRevise"/>
         WHERE CONTRACT_NO = #contractNo#
     </update>

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG003.xml

@@ -38,6 +38,8 @@
         DEPOSIT_QTY as "depositQty",  <!-- 入库数量 -->
         RECEIVE_UNIT_WEIGHT as "receiveUnitWeight",  <!-- 收货单重 -->
         RECEIVE_WEIGHT as "receiveWeight",  <!-- 收货重量 -->
+        PRICE	as "price",  <!-- 单价 -->
+        AMOUNT	as "amount",  <!-- 金额 -->
         STATUS as "status" <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
     </sql>
 
@@ -94,6 +96,12 @@
         <isNotEmpty prepend=" AND " property="status">
             STATUS = #status#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="price">
+            PRICE = #price#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="amount">
+            AMOUNT = #amount#
+        </isNotEmpty>
     </sql>
 
     <sql id="idCondition">
@@ -175,6 +183,8 @@
         RECEIVE_QTY,  <!-- 收货数量 -->
         RECEIVE_UNIT_WEIGHT,  <!-- 收货单重 -->
         RECEIVE_WEIGHT,  <!-- 收货重量 -->
+        PRICE,  <!-- 单价 -->
+        AMOUNT,  <!-- 金额 -->
         STATUS  <!-- 状态：0-已收货，1-已入库，2-部分入库，3-退货 -->
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
@@ -182,7 +192,7 @@
         #planNo#, #contractNo#, #supCode#, #supName#, #purUserId#, #purUserName#,
         #inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#,
         #unit#, #length#, #width#, #thick#, #receiveQty#, #receiveUnitWeight#,
-        #receiveWeight#, #status#
+        #receiveWeight#,#price#, #amount#, #status#
         )
     </insert>
 

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC001.java

@@ -57,7 +57,8 @@ public class HGKC001 extends DaoEPBase {
 	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_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_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -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_STORAGE_TYPE = "STORAGE_TYPE";    		/* 入库类型：1：入库 2：退回*/
 	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";
@@ -141,6 +144,8 @@ public class HGKC001 extends DaoEPBase {
 	private Integer submitStatus;		/* 提交状态 0未提交，1已提交*/
 	private Integer storageType;	/* 入库类型：1：入库 2：退回*/
 	private Integer isReturn;	   /* 是否退回：0：否 1：是*/
+	private BigDecimal price = new BigDecimal(0.000);		/* 单价*/
+	private BigDecimal amount = new BigDecimal(0.000);		/* 金额*/
 
 	/**
 	 * initialize the metadata.
@@ -306,6 +311,20 @@ public class HGKC001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_IS_RETURN);
 		eiColumn.setDescName("是否退回：0：否 1：是");
 		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 {
 		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.
 	 *
@@ -895,6 +930,8 @@ public class HGKC001 extends DaoEPBase {
 		setSubmitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SUBMIT_STATUS)), submitStatus));
 		setStorageType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STORAGE_TYPE)), storageType));
 		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 {
 		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_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;
 	}

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC001.xml

@@ -37,6 +37,8 @@
         DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 -->
         STORAGE_TYPE	as "storageType", <!-- 入库类型：1：入库 2：退回 -->
         IS_RETURN	as "isReturn", <!-- 是否退回：0：否 1：是 -->
+        PRICE	as "price",  <!-- 单价 -->
+        AMOUNT	as "amount",  <!-- 金额 -->
         SUBMIT_STATUS	as "submitStatus"   <!-- 提交状态 -->
     </sql>
 
@@ -105,6 +107,12 @@
         <isNotEmpty prepend=" AND " property="storageType">
             STORAGE_TYPE = #storageType#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="price">
+            PRICE = #price#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="amount">
+            AMOUNT = #amount#
+        </isNotEmpty>
 	</sql>
 
     <sql id="idCondition">
@@ -188,6 +196,8 @@
         DEPOSIT_WEIGHT,  <!-- 入库重量 -->
         STORAGE_TYPE,  <!-- 入库类型：1：入库 2：退回 -->
         IS_RETURN, <!-- 是否退回：0：否 1：是 -->
+        PRICE,  <!-- 单价 -->
+        AMOUNT,  <!-- 金额 -->
         SUBMIT_STATUS
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
@@ -195,7 +205,7 @@
         #receiveNo#, #planNo#, #contractNo#, #whCode#, #whName#, #inventType#,
         #inventCode#, #inventName#, #specId#, #spec#, #material#,
         #unit#, #length#, #width#, #thick#, #depositQty#, #depositUnitWeight#, #depositWeight#,
-        #storageType#, #isReturn#,#submitStatus#
+        #storageType#, #isReturn#,#price#, #amount#,#submitStatus#
         )
     </insert>
 

src/main/webapp/HG/CG/HGCG002.js

@@ -14,6 +14,37 @@ $(function () {
 				// change事件
 				grid.dataSource.bind("change", function (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) {

src/main/webapp/HG/CG/HGCG002.jsp

@@ -65,9 +65,14 @@
 			<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="spec" cname="规格" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}"/>
+			<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}" enable="false"/>
 			<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="unit" cname="单位" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>

src/main/webapp/HG/CG/HGCG003.jsp

@@ -65,6 +65,8 @@
 			<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="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="unit" cname="单位" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>

src/main/webapp/HG/CG/HGCG003A.jsp

@@ -70,6 +70,11 @@
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<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="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}"/>

src/main/webapp/HG/KC/HGKC001.jsp

@@ -69,6 +69,8 @@
 			<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="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="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>