2024-09-25

1.修改金额小数2位数

2024-09-25
1.修改金额小数2位数
1a6727a2 · liuyang · 2a0541a8 · 1a6727a2 · 1a6727a2 · 1a6727a2
Commit 1a6727a2 authored Sep 25, 2024 by liuyang
48 changed files
--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001.java
@@ -132,10 +132,10 @@ public class HGCG001 extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal planQty = new BigDecimal(0.000);		/* 计划数量*/
+	private BigDecimal planQty = new BigDecimal(0);		/* 计划数量*/
 	private BigDecimal planUnitWeight = new BigDecimal(0.000);		/* 计划单重*/
 	private BigDecimal planWeight = new BigDecimal(0.000);		/* 计划重量*/
-	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
+	private BigDecimal purQty = new BigDecimal(0);		/* 采购数量*/
 	private BigDecimal purUnitWeight = new BigDecimal(0.000);		/* 采购单重*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
 	private Integer status;	/* 状态：0-待审核，1-审核中，2-审核通过，3-审核拒绝，4-生成合同，5-部分生成合同*/
@@ -263,7 +263,7 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PLAN_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("计划数量");
 		eiMetadata.addMeta(eiColumn);
@@ -284,7 +284,7 @@ public class HGCG001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PUR_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("采购数量");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001A.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001A.java
@@ -133,10 +133,10 @@ public class HGCG001A extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal planQty = new BigDecimal(0.000);		/* 计划数量*/
+	private BigDecimal planQty = new BigDecimal(0);		/* 计划数量*/
 	private BigDecimal planUnitWeight = new BigDecimal(0.000);		/* 计划单重*/
 	private BigDecimal planWeight = new BigDecimal(0.000);		/* 计划重量*/
-	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
+	private BigDecimal purQty = new BigDecimal(0);		/* 采购数量*/
 	private BigDecimal purUnitWeight = new BigDecimal(0.000);		/* 采购单重*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
 	private Long materialPlanId = new Long(0);	/* 材料计划id*/
@@ -270,7 +270,7 @@ public class HGCG001A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PLAN_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("计划数量");
 		eiMetadata.addMeta(eiColumn);
@@ -291,7 +291,7 @@ public class HGCG001A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PUR_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("采购数量");
 		eiMetadata.addMeta(eiColumn);
@@ -332,35 +332,35 @@ public class HGCG001A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("金额（不含税金额）");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("含税金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_RATE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("税率");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002.java
@@ -154,10 +154,10 @@ public class HGCG002 extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
+	private BigDecimal purQty = new BigDecimal(0);		/* 采购数量*/
 	private BigDecimal purUnitWeight = new BigDecimal(0.000);		/* 采购单重*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
-	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
+	private BigDecimal receiveQty = new BigDecimal(0);		/* 收货数量*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-未审批，1-审核通过，2-审核未通过*/
 	private String auditTime = " ";		/* 审核时间*/
@@ -168,10 +168,10 @@ public class HGCG002 extends DaoEPBase {
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
-	private BigDecimal price = new BigDecimal(0.000);    		/* 单价*/
+	private BigDecimal price = new BigDecimal(0.00);    		/* 单价*/
-	private BigDecimal amount = new BigDecimal(0.000);    		/* 金额（不含税金额）*/
+	private BigDecimal amount = new BigDecimal(0.00);    		/* 金额（不含税金额）*/
-	private BigDecimal taxIncludeAmount = new BigDecimal(0.000);    		/* 含税金额*/
+	private BigDecimal taxIncludeAmount = new BigDecimal(0.00);    		/* 含税金额*/
-	private BigDecimal taxAmount = new BigDecimal(0.000);  		/* 税额*/
+	private BigDecimal taxAmount = new BigDecimal(0.00);  		/* 税额*/
 	private BigDecimal taxRate = new BigDecimal(0.000);   		/* 税率*/
 	private Integer source;	/* 数据来源 根据采购数据来源小代码 目前0默认采购计划，1手动录入*/
 	/**
@@ -308,7 +308,7 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PUR_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("采购数量");
 		eiMetadata.addMeta(eiColumn);
@@ -329,7 +329,7 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("收货数量");
 		eiMetadata.addMeta(eiColumn);
@@ -363,28 +363,28 @@ public class HGCG002 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("金额（不含税金额）");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("含税金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002A.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002A.java
@@ -22,8 +22,8 @@ public class HGCG002A extends HGCG002 {
 	public static final String FIELD_BC_RECEIVE_QTY = "bcReceiveQty";    		/* 本次收货数量*/
 	public static final String FIELD_BC_MAX_RECEIVE_QTY = "bcMaxReceiveQty";    		/* 本次最大收货数量*/
-	private BigDecimal bcReceiveQty = new BigDecimal(0.000);		/* 本次收货数量*/
+	private BigDecimal bcReceiveQty = new BigDecimal(0);		/* 本次收货数量*/
-	private BigDecimal bcMaxReceiveQty = new BigDecimal(0.000);		/* 本次最大收货数量*/
+	private BigDecimal bcMaxReceiveQty = new BigDecimal(0);		/* 本次最大收货数量*/
 	/**
 	 * initialize the metadata.
@@ -33,14 +33,14 @@ public class HGCG002A extends HGCG002 {
 		eiColumn = new EiColumn(FIELD_BC_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("本次收货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_BC_MAX_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("本次最大收货数量");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002B.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG002B.java
@@ -138,10 +138,10 @@ public class HGCG002B extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal purQty = new BigDecimal(0.000);		/* 采购数量*/
+	private BigDecimal purQty = new BigDecimal(0);		/* 采购数量*/
 	private BigDecimal purUnitWeight = new BigDecimal(0.000);		/* 采购单重*/
 	private BigDecimal purWeight = new BigDecimal(0.000);		/* 采购重量*/
-	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
+	private BigDecimal receiveQty = new BigDecimal(0);		/* 收货数量*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private BigDecimal price = new BigDecimal("0");		/* 单价*/
 	private BigDecimal amount = new BigDecimal("0");		/* 金额（不含税金额）*/
@@ -156,8 +156,8 @@ public class HGCG002B extends DaoEPBase {
 	private Integer calculationMethod;	/* 状态：0-未审批，1-审核通过，2-审核未通过*/
 	//页面需要填写、展示字段
-	private BigDecimal bcReceiveQty = new BigDecimal(0.000);		/* 本次收货数量*/
+	private BigDecimal bcReceiveQty = new BigDecimal(0);		/* 本次收货数量*/
-	private BigDecimal bcMaxReceiveQty = new BigDecimal(0.000);		/* 本次最大收货数量*/
+	private BigDecimal bcMaxReceiveQty = new BigDecimal(0);		/* 本次最大收货数量*/
 	private BigDecimal bcReceiveWeight = new BigDecimal(0.000);		/* 本次收货重量*/
 	private BigDecimal bcMaxReceiveWeight = new BigDecimal(0.000);		/* 本次最大收货重量*/
 	private String contractDate = " ";		/* 合同日期*/
@@ -272,7 +272,7 @@ public class HGCG002B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PUR_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("采购数量");
 		eiMetadata.addMeta(eiColumn);
@@ -293,7 +293,7 @@ public class HGCG002B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("收货数量");
 		eiMetadata.addMeta(eiColumn);
@@ -307,28 +307,28 @@ public class HGCG002B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("金额（不含税金额）");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("含税金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);
@@ -354,14 +354,14 @@ public class HGCG002B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_BC_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("本次收货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_BC_MAX_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("本次最大收货数量");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003.java
@@ -152,9 +152,9 @@ public class HGCG003 extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
+	private BigDecimal receiveQty = new BigDecimal(0);		/* 收货数量*/
-	private BigDecimal deliverQty = new BigDecimal(0.000);		/* 退货数量*/
+	private BigDecimal deliverQty = new BigDecimal(0);		/* 退货数量*/
-	private BigDecimal depositQty = new BigDecimal(0.000);		/* 入库数量*/
+	private BigDecimal depositQty = new BigDecimal(0);		/* 入库数量*/
 	private BigDecimal receiveUnitWeight = new BigDecimal(0.000);		/* 收货单重*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-已收货，1-已入库，2-部分入库，3-退货*/
@@ -307,21 +307,21 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("收货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_DELIVER_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("退货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_DEPOSIT_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("入库数量");
 		eiMetadata.addMeta(eiColumn);
@@ -346,28 +346,28 @@ public class HGCG003 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("金额（不含税金额）");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("含税金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003B.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003B.java
@@ -153,9 +153,9 @@ public class HGCG003B extends DaoEPBase {
 	private BigDecimal length = new BigDecimal(0.000);		/* 长度*/
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
-	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
+	private BigDecimal receiveQty = new BigDecimal(0);		/* 收货数量*/
-	private BigDecimal deliverQty = new BigDecimal(0.000);		/* 退货数量*/
+	private BigDecimal deliverQty = new BigDecimal(0);		/* 退货数量*/
-	private BigDecimal depositQty = new BigDecimal(0.000);		/* 入库数量*/
+	private BigDecimal depositQty = new BigDecimal(0);		/* 入库数量*/
 	private BigDecimal receiveUnitWeight = new BigDecimal(0.000);		/* 收货单重*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-已收货，1-已入库，2-部分入库，3-退货*/
@@ -309,21 +309,21 @@ public class HGCG003B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("收货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_DELIVER_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("退货数量");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_DEPOSIT_QTY);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(0);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("入库数量");
 		eiMetadata.addMeta(eiColumn);
@@ -348,35 +348,35 @@ public class HGCG003B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("金额（不含税金额）");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("含税金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_TAX_RATE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("税率");
 		eiMetadata.addMeta(eiColumn);
@@ -415,14 +415,14 @@ public class HGCG003B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_CANCEL_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("核销金额");
 		eiMetadata.addMeta(eiColumn);
 		eiColumn = new EiColumn(FIELD_UN_CANCEL_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("未核销金额");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG004.java
+++ b/src/main/java/com/baosight/hggp/hg/cg/domain/HGCG004.java
@@ -121,7 +121,7 @@ public class HGCG004 extends DaoEPBase {
    private String inventName = " ";		/* 存货名称*/
    private Long specId = new Long(0);	/* 规格ID*/
    private String spec = " ";		/* 规格*/
-    private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
+    private BigDecimal receiveQty = new BigDecimal(0);		/* 收货数量*/
    private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
    private BigDecimal price = new BigDecimal("0");		/* 单价*/
    private BigDecimal amount = new BigDecimal("0");		/* 金额（不含税金额）*/
@@ -219,7 +219,7 @@ public class HGCG004 extends DaoEPBase {
        eiColumn = new EiColumn(FIELD_RECEIVE_QTY);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(0);
        eiColumn.setFieldLength(20);
        eiColumn.setDescName("数量");
        eiMetadata.addMeta(eiColumn);
@@ -233,35 +233,35 @@ public class HGCG004 extends DaoEPBase {
        eiColumn = new EiColumn(FIELD_PRICE);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(2);
        eiColumn.setFieldLength(12);
        eiColumn.setDescName("单价");
        eiMetadata.addMeta(eiColumn);
        eiColumn = new EiColumn(FIELD_AMOUNT);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(2);
        eiColumn.setFieldLength(12);
        eiColumn.setDescName("金额（不含税金额）");
        eiMetadata.addMeta(eiColumn);
        eiColumn = new EiColumn(FIELD_TAX_INCLUDE_AMOUNT);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(2);
        eiColumn.setFieldLength(20);
        eiColumn.setDescName("含税金额");
        eiMetadata.addMeta(eiColumn);
        eiColumn = new EiColumn(FIELD_TAX_AMOUNT);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(2);
        eiColumn.setFieldLength(20);
        eiColumn.setDescName("税额");
        eiMetadata.addMeta(eiColumn);
        eiColumn = new EiColumn(FIELD_TAX_RATE);
        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
+        eiColumn.setScaleLength(2);
        eiColumn.setFieldLength(12);
        eiColumn.setDescName("税率");
        eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW003.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW003.java
@@ -154,7 +154,7 @@ public class HGCW003 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_UNIT_PRICE_EXCLUDING_TAX);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("除税单价/元");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW006.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW006.java
@@ -289,7 +289,7 @@ public class HGCW006 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("剩余开票/收票金额");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW007.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW007.java
@@ -130,7 +130,7 @@ public class HGCW007 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_UNIT_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW009.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW009.java
@@ -160,7 +160,7 @@ public class HGCW009 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_UNIT_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("单价");
 		eiMetadata.addMeta(eiColumn);
@@ -174,7 +174,7 @@ public class HGCW009 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_TOTAL_TAX_PRICE);
 		eiColumn.setType("N");
-		eiColumn.setScaleLength(3);
+		eiColumn.setScaleLength(2);
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("含税总价");
 		eiMetadata.addMeta(eiColumn);

--- a/src/main/webapp/HG/CG/HGCG001.jsp
+++ b/src/main/webapp/HG/CG/HGCG001.jsp
@@ -54,9 +54,9 @@
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hggp.hgcg.planStatus"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="120" align="right" format="{0:N0}" defaultValue="0"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
-			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N0}" defaultValue="0"/>
 			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

--- a/src/main/webapp/HG/CG/HGCG001A.jsp
+++ b/src/main/webapp/HG/CG/HGCG001A.jsp
@@ -44,9 +44,9 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" required="true"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="material" cname="材质" width="80" align="center" required="true"/>
 			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>

--- a/src/main/webapp/HG/CG/HGCG002.jsp
+++ b/src/main/webapp/HG/CG/HGCG002.jsp
@@ -71,17 +71,17 @@
 				<EF:EFOptions blockId="user_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="purUserName" cname="采购员姓名" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" enable="false"
+			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" enable="false"
 			             defaultValue="0" sumType="page"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" enable="false"
 			             defaultValue="0" sumType="page"/>
-			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"
 			             defaultValue="0" sumType="page"/>
-			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             defaultValue="0" sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             defaultValue="0" sumType="page"/>
-			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             defaultValue="0" sumType="page"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

--- a/src/main/webapp/HG/CG/HGCG002A.jsp
+++ b/src/main/webapp/HG/CG/HGCG002A.jsp
@@ -38,7 +38,7 @@
 			<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="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" sumType="page"
+			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" sumType="page"
 			             required="true"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" sumType="page"
 			             required="true"/>
@@ -46,17 +46,17 @@
 			                  copy="true" required="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N2}" required="true"/>
 			<EF:EFComboColumn ename="taxRate" cname="税率(%)" enable="true" width="100" align="center" required="true"
 			                  copy="true">
 				<EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right"
-			             format="{0:C3}" sumType="page"/>
+			             format="{0:C2}" sumType="page"/>
 			<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']"/>

--- a/src/main/webapp/HG/CG/HGCG002B.jsp
+++ b/src/main/webapp/HG/CG/HGCG002B.jsp
@@ -40,26 +40,26 @@
 			<EF:EFColumn ename="length" cname="长(MM)" width="80" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="width" cname="宽(MM)" width="80" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="thick" cname="厚(MM)" width="80" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" required="true"
+			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" required="true"
 			             defaultValue="0" sumType="page"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" required="true"
 			             defaultValue="0" sumType="page"/>
-			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"
 			             defaultValue="0" sumType="page"/>
 			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" enable="true" width="100" align="center"
 			                  copy="true" required="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N2}" required="true"/>
 			<EF:EFComboColumn ename="taxRate" cname="税率(%)" enable="true" width="100" align="center" required="true"
 			                  copy="true">
 				<EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

--- a/src/main/webapp/HG/CG/HGCG003.jsp
+++ b/src/main/webapp/HG/CG/HGCG003.jsp
@@ -70,19 +70,19 @@
 				<EF:EFOptions blockId="user_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="purUserName" cname="采购员姓名" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="receiveQty" cname="收货数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="receiveQty" cname="收货数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="page"/>
-			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="page"/>
-			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="page"/>
 			<EF:EFColumn ename="receiveWeight" cname="收货重量" enable="false" width="120" align="right" format="{0:N3}"
 			             sumType="page"/>
-			<EF:EFColumn ename="amount" cname="金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

--- a/src/main/webapp/HG/CG/HGCG003A.jsp
+++ b/src/main/webapp/HG/CG/HGCG003A.jsp
@@ -59,17 +59,17 @@
 			<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="bcReceiveQty" cname="本次</br>收货数量" width="100" align="right" format="{0:N3}"
+			<EF:EFColumn ename="bcReceiveQty" cname="本次</br>收货数量" width="100" align="right" format="{0:N0}"
 			             required="true"/>
 			<EF:EFColumn ename="bcMaxReceiveQty" cname="本次最大</br>收货数量" enable="false" width="100" align="right"
-			             format="{0:N3}"/>
+			             format="{0:N0}"/>
 			<EF:EFColumn ename="bcReceiveWeight" cname="本次</br>收货重量" width="100" align="right" format="{0:N3}"
 			             required="true"/>
 			<EF:EFColumn ename="bcMaxReceiveWeight" cname="本次最大</br>收货重量" enable="false" width="100" align="right"
 			             format="{0:N3}"/>
-			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="receiveWeight" cname="已收货重量" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="purUnitWeight" cname="采购单重" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFComboColumn ename="supCode" cname="供应商名称" enable="false" width="120" align="left" defaultValue=""
@@ -81,14 +81,14 @@
 			                  copy="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" enable="false"/>
+			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N2}" enable="false"/>
-			<EF:EFColumn ename="taxRate" cname="税率(%)" width="80" align="right" format="{0:N3}" enable="false"/>
+			<EF:EFColumn ename="taxRate" cname="税率(%)" width="80" align="right" format="{0:N2}" enable="false"/>
-			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right"
-			             format="{0:C3}" sumType="page"/>
+			             format="{0:C2}" sumType="page"/>
 			<EF:EFColumn ename="planNo" cname="计划单号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

--- a/src/main/webapp/HG/CG/HGCG003B.jsp
+++ b/src/main/webapp/HG/CG/HGCG003B.jsp
@@ -44,11 +44,11 @@
 			<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="receiveQty" cname="收货数量" width="120" align="right" format="{0:N3}" sumType="page"
+			<EF:EFColumn ename="receiveQty" cname="收货数量" width="120" align="right" format="{0:N0}" sumType="page"
 			             required="true"/>
-			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="page"/>
-			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N3}"
+			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="page"/>
 			<EF:EFColumn ename="receiveWeight" cname="收货重量" width="120" align="right" format="{0:N3}" sumType="page"
 			             required="true"/>
@@ -58,15 +58,15 @@
 			                  copy="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="price" cname="单价" width="120" align="right" format="{0:C3}" required="true"/>
+			<EF:EFColumn ename="price" cname="单价" width="120" align="right" format="{0:C2}" required="true"/>
 			<EF:EFComboColumn ename="taxRate" cname="税率(%)" width="100" align="center" required="true" copy="true">
 				<EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="amount" cname="金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="amount" cname="金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
-			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C3}"
+			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C2}"
 			             sumType="page"/>
 			<EF:EFColumn ename="contractNo" cname="合同号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="contractLineNo" cname="合同行号" enable="false" width="120" align="center"/>

--- a/src/main/webapp/HG/CG/HGCG004.jsp
+++ b/src/main/webapp/HG/CG/HGCG004.jsp
@@ -50,7 +50,7 @@
                         required="true"/>
            <EF:EFColumn ename="receiveWeight" cname="重量" width="120" align="right" format="{0:N3}" sumType="page"
                         required="true"/>
-            <EF:EFColumn ename="amount" cname="金额" width="120" align="right" format="{0:C3}" sumType="page"
+            <EF:EFColumn ename="amount" cname="金额" width="120" align="right" format="{0:C2}" sumType="page"
                         required="true"/>
        </EF:EFGrid>
    </EF:EFRegion>

--- a/src/main/webapp/HG/CW/HGCW005A.jsp
+++ b/src/main/webapp/HG/CW/HGCW005A.jsp
@@ -45,14 +45,14 @@
                              blockName="customer_record_all_block_id" textField="textField" valueField="valueField"
                              columnTemplate="#=textField#" itemTemplate="#=textField#"
                              maxLength="16" readonly="true" align="center" filter="contains" sort="true"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true"  align="center" required="true"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true" format="{0:N2}" align="center" required="true"/>
            <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="true" width="120" align="center"
                              blockName="invent_code_box_block_id" textField="textField" valueField="valueField"
                              columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" required="true"
                              filter="contains"/>
            <EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
            <EF:EFColumn ename="quantity" cname="数量" width="120" enable="true" format="{0:N0}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="true"
                         data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
            <EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text"

--- a/src/main/webapp/HG/CW/HGCW005B.jsp
+++ b/src/main/webapp/HG/CW/HGCW005B.jsp
@@ -51,11 +51,11 @@
                              filter="contains"/>
            <EF:EFColumn ename="spec" cname="规格" enable="false" width="140" align="center" maxLength="50"/>
            <EF:EFColumn ename="quantity" cname="数量" width="120" enable="false" format="{0:N0}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0.00" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
            <EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0.00" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW006A.jsp
+++ b/src/main/webapp/HG/CW/HGCW006A.jsp
@@ -93,7 +93,7 @@
            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" />
            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N0}" align="center"/>
-            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N2}" align="center"/>
            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N0}" align="center"/>
            <EF:EFColumn ename="totalPrice" cname="总价" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/>

--- a/src/main/webapp/HG/CW/HGCW006B.jsp
+++ b/src/main/webapp/HG/CW/HGCW006B.jsp
@@ -100,9 +100,9 @@
            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" />
-            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N0}" align="center"/>
-            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N2}" align="center"/>
-            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N0}" align="center"/>
            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/>

--- a/src/main/webapp/HG/CW/HGCW006C.jsp
+++ b/src/main/webapp/HG/CW/HGCW006C.jsp
@@ -78,9 +78,9 @@
            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" enable="false"/>
            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N0}" align="center" enable="false"/>
-            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N2}" align="center" enable="false"/>
-            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N0}" align="center" enable="false"/>
-            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW008A.js
+++ b/src/main/webapp/HG/CW/HGCW008A.js
@@ -15,21 +15,32 @@ $(function() {
            pageSize: 20,
            pageSizes: [10,20,30,50,100,200],
        },
-        columns: [{
+        columns: [
+            {
+                field: "unitPrice",
+                template: function(e) {
+                    return kendo.toString(parseFloat(e.unitPrice).toFixed(2), "n2");
+                }
+            },{
+                field: "totalPrice",
+                template: function(e) {
+                    return kendo.toString(parseFloat(e.totalPrice).toFixed(2), "n2");
+                }
+            },{
 	        field: "totalTaxPrice",
 	        template: function (item) {
 	        	if(isBlank(item.totalPrice)){
 			        let thisEngineeringQuantity = item.thisEngineeringQuantity;
 			        let unitPrice = item.unitPrice;
 			        if(!isBlank(thisEngineeringQuantity) && !isBlank(unitPrice)){
-				        return parseFloat(thisEngineeringQuantity) * parseFloat(unitPrice);
+				        return kendo.toString(parseFloat(thisEngineeringQuantity).toFixed(2) * parseFloat(unitPrice).toFixed(2), "n2");
 			        } else {
-			        	return "";
+			        	return 0;
 			        }
 		        }else if(!isBlank(item.totalTaxPrice)){
-	        	    return parseFloat(item.totalTaxPrice);
+	        	    return kendo.toString(parseFloat(item.totalTaxPrice).toFixed(2), "n2");
                }else {
-			        return parseFloat(item.totalPrice);
+			        return kendo.toString(parseFloat(item.totalPrice).toFixed(2), "n2");
 		        }
 	        }
        }],

--- a/src/main/webapp/HG/CW/HGCW008A.jsp
+++ b/src/main/webapp/HG/CW/HGCW008A.jsp
@@ -76,7 +76,7 @@
 	        <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
 	                     format="{0:N3}" align="right"/>
 	        <EF:EFColumn ename="unit" cname="单位" align="center"/>
-	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N3}" align="right"/>
+	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="totalTaxPrice" cname="含税总价" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="remarks" cname="备注" align="left"/>

--- a/src/main/webapp/HG/CW/HGCW008B.js
+++ b/src/main/webapp/HG/CW/HGCW008B.js
@@ -13,20 +13,30 @@ $(function() {
 		    pageSizes: [10, 20, 30, 50, 100, 200],
 	    },
 	    columns: [{
+            field: "unitPrice",
+            template: function(e) {
+                return kendo.toString(parseFloat(e.unitPrice).toFixed(2), "n2");
+            }
+        },{
+            field: "totalPrice",
+            template: function(e) {
+                return kendo.toString(parseFloat(e.totalPrice).toFixed(2), "n2");
+            }
+        },{
 		    field: "totalTaxPrice",
 		    template: function (item) {
 			    if(isBlank(item.totalTaxPrice)){
 				    let thisEngineeringQuantity = item.thisEngineeringQuantity;
 				    let unitPrice = item.unitPrice;
 				    if(!isBlank(thisEngineeringQuantity) && !isBlank(unitPrice)){
-					    return parseFloat(thisEngineeringQuantity) * parseFloat(unitPrice);
+					    return kendo.toString(parseFloat(thisEngineeringQuantity).toFixed(2) * parseFloat(unitPrice).toFixed(2),"n2");
 				    } else {
-					    return "";
+					    return 0;
 				    }
 			    }else if(!isBlank(item.totalTaxPrice)){
-                    return parseFloat(item.totalTaxPrice);
+                    return kendo.toString(parseFloat(item.totalTaxPrice).toFixed(2),"n2");
                } else {
-				    return parseFloat(item.totalTaxPrice);
+				    return kendo.toString(parseFloat(item.totalTaxPrice).toFixed(2),"n2");
 			    }
 		    }
 	    }],

--- a/src/main/webapp/HG/CW/HGCW008B.jsp
+++ b/src/main/webapp/HG/CW/HGCW008B.jsp
@@ -64,9 +64,9 @@
 	        <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
 	                     format="{0:N3}" align="right"/>
 	        <EF:EFColumn ename="unit" cname="单位" align="center"/>
-	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N3}" align="right"/>
+	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N2}" align="right"/>
-	        <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N3}" align="right"/>
+	        <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>
-	        <EF:EFColumn ename="totalTaxPrice" cname="含税总价" format="{0:N3}" align="right"/>
+	        <EF:EFColumn ename="totalTaxPrice" cname="含税总价" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="remarks" cname="备注" align="left"/>
 	        <EF:EFColumn ename="inventoryId" cname="清单id" hidden="true"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW008C.js
+++ b/src/main/webapp/HG/CW/HGCW008C.js
@@ -7,6 +7,22 @@ $(function() {
            pageSizes: [10,20,30,50,100,200],
        },
        columns: [
+            {
+                field: "unitPrice",
+                template: function(e) {
+                    return kendo.toString(parseFloat(e.unitPrice).toFixed(2), "n2");
+                }
+            },{
+                field: "totalPrice",
+                template: function(e) {
+                    return kendo.toString(parseFloat(e.totalPrice).toFixed(2), "n2");
+                }
+            },{
+                field: "totalTaxPrice",
+                template: function(e) {
+                    return kendo.toString(parseFloat(e.totalTaxPrice).toFixed(2), "n2");
+                }
+            }
        ]
    }

--- a/src/main/webapp/HG/CW/HGCW008C.jsp
+++ b/src/main/webapp/HG/CW/HGCW008C.jsp
@@ -62,7 +62,7 @@
 			<EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
 			             align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="unit" cname="单位" enable="false" align="center"/>
-			<EF:EFColumn ename="unitPrice" cname="含税单价" enable="false" format="{0:N3}" align="right"/>
+			<EF:EFColumn ename="unitPrice" cname="含税单价" enable="false" format="{0:N2}" align="right"/>
 			<EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>
 			<EF:EFColumn ename="totalTaxPrice" cname="含税总价" enable="false" format="{0:N2}" align="right"/>
 			<EF:EFColumn ename="remarks" cname="备注" enable="false" align="center"/>

--- a/src/main/webapp/HG/CW/HGCW008D.jsp
+++ b/src/main/webapp/HG/CW/HGCW008D.jsp
@@ -18,10 +18,10 @@
 			<EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" enable="false"/>
 			<EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center" enable="false"/>
 			<EF:EFColumn ename="taxPoints" cname="合同税点" enable="false" width="90" align="center"/>
-			<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N2}" align="center" enable="false"/>
 			<EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N2}" align="center"/>
 			<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/>
-			<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N2}" align="center" enable="false"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
@@ -35,7 +35,7 @@
 			<EF:EFColumn ename="partyA" cname="甲方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="partyB" cname="乙方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="contractContent" cname="签证事由" enable="false" align="center"/>
-			<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" enable="false" align="center"/>
+			<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" format="{0:N2}" enable="false" align="center"/>
 			<EF:EFColumn ename="signingDate" cname="签订日期" align="center" enable="false"/>
 		</EF:EFGrid>
 	</EF:EFRegion>

--- a/src/main/webapp/HG/CW/HGCW008E.jsp
+++ b/src/main/webapp/HG/CW/HGCW008E.jsp
@@ -18,10 +18,10 @@
 			<EF:EFColumn ename="provisionalQuantity" cname="暂定工程量"  format="{0:N3}" align="center" enable="false"/>
 			<EF:EFColumn ename="measurementMethod" cname="计量方式"  align="center" enable="false"/>
 			<EF:EFColumn ename="supplyMethod" cname="材料供应方式"  align="center" enable="false"/>
-			<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元"  format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元"  format="{0:N2}" align="center" enable="false"/>
 			<EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N2}" align="center"/>
 			<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/>
-			<EF:EFColumn ename="laborCosts" cname="其中人工费、元"  format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="laborCosts" cname="其中人工费、元"  format="{0:N2}" align="center" enable="false"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
 	<EF:EFRegion id="result3" title="签证单">
@@ -29,12 +29,12 @@
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="projCode" cname="项目编号"  align="center" enable="false"/>
 			<EF:EFColumn ename="projName" cname="项目名称"  align="center" enable="false"/>
-			<EF:EFColumn ename="contractNumber" cname="主合同号"  format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="contractNumber" cname="主合同号" format="{0:N3}" align="center" enable="false"/>
 			<EF:EFColumn ename="contractName" cname="主合同名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="partyA" cname="甲方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="partyB" cname="乙方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="contractContent" cname="签证事由" enable="false" align="center"/>
-			<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" enable="false" align="center"/>
+			<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" format="{0:N2}" enable="false" align="center"/>
 			<EF:EFColumn ename="signingDate" cname="签订日期" align="center" enable="false"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
@@ -43,12 +43,12 @@
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="projCode" cname="项目编号"  align="center" enable="false"/>
 			<EF:EFColumn ename="projName" cname="项目名称"  align="center" enable="false"/>
-			<EF:EFColumn ename="contractNumber" cname="主合同号"  format="{0:N3}" align="center" enable="false"/>
+			<EF:EFColumn ename="contractNumber" cname="主合同号" format="{0:N3}" align="center" enable="false"/>
 			<EF:EFColumn ename="contractName" cname="主合同名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="partyA" cname="甲方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="partyB" cname="乙方名称"  align="center" enable="false"/>
 			<EF:EFColumn ename="contractContent" cname="扣款事由" enable="false" align="center"/>
-			<EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" enable="false" align="center"/>
+			<EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" format="{0:N2}" enable="false" align="center"/>
 			<EF:EFColumn ename="signingDate" cname="扣款日期" align="center" enable="false"/>
 		</EF:EFGrid>
 	</EF:EFRegion>

--- a/src/main/webapp/HG/CW/HGCW008F.jsp
+++ b/src/main/webapp/HG/CW/HGCW008F.jsp
@@ -23,7 +23,7 @@
            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" />
            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N0}" align="center"/>
-            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N2}" align="center"/>
            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N0}" align="center"/>
            <EF:EFColumn ename="totalPrice" cname="总价" format="{0:N2}" align="center"/>
            <EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/>

--- a/src/main/webapp/HG/CW/HGCW010.jsp
+++ b/src/main/webapp/HG/CW/HGCW010.jsp
@@ -78,15 +78,15 @@
                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
            </EF:EFComboColumn>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="true" readonly="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="true"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFComboColumn ename="billState" cname="开票状态" width="100" align="center" required="true"

--- a/src/main/webapp/HG/CW/HGCW010A.jsp
+++ b/src/main/webapp/HG/CW/HGCW010A.jsp
@@ -47,20 +47,20 @@
                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
            </EF:EFComboColumn>
            <EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisSettlementAmount" cname="结算金额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisPriceTax" cname="结算含税金额" enable="false" hidden="false" format="{0:N2}" align="right"/>
            <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW010D.jsp
+++ b/src/main/webapp/HG/CW/HGCW010D.jsp
@@ -51,23 +51,23 @@
                         editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
            <EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW010E.jsp
+++ b/src/main/webapp/HG/CW/HGCW010E.jsp
@@ -51,23 +51,23 @@
                         editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
            <EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="15" required="false"
+                         displayType="0.00" sort="true" align="right" maxLength="15" required="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW012.js
+++ b/src/main/webapp/HG/CW/HGCW012.js
@@ -65,12 +65,12 @@ $(function() {
        },{
            field: "thisSettlementAmount",
            template: function (item) {
-                return kendo.format("{0:C3}",parseFloat(item.thisSettlementAmount));
+                return kendo.format("{0:C2}",parseFloat(item.thisSettlementAmount));
            }
        },{
            field: "thisSettlementTax",
            template: function (item) {
-                return kendo.format("{0:C3}",parseFloat(item.thisSettlementTax));
+                return kendo.format("{0:C2}",parseFloat(item.thisSettlementTax));
            }
        }],
        loadComplete: function (grid) {
@@ -83,13 +83,13 @@ $(function() {
                    if(item.taxPoints && item.totalContractPriceIncluding){
                        let thisSettlementAmount = item.totalContractPriceIncluding / (item.taxPoints / 100 + 1);
                        // 使用toFixed方法四舍五入到两位小数，并转换为数字
-                        thisSettlementAmount = Number(thisSettlementAmount.toFixed(3));
+                        thisSettlementAmount = Number(thisSettlementAmount.toFixed(2));
                        resultGrid.setCellValue(item,'thisSettlementAmount',thisSettlementAmount)
                    }
                    if(item.thisSettlementAmount && item.totalContractPriceIncluding){
                        let thisSettlementTax = item.totalContractPriceIncluding-item.thisSettlementAmount;
                        // 使用toFixed方法四舍五入到两位小数，并转换为数字
-                        thisSettlementTax = Number(thisSettlementTax.toFixed(3));
+                        thisSettlementTax = Number(thisSettlementTax.toFixed(2));
                        resultGrid.setCellValue(item,'thisSettlementTax',thisSettlementTax)
                    }
                }else if(e.field === "billNumber"){
@@ -106,7 +106,7 @@ $(function() {
                    if(item.thisSettlementAmount && item.totalContractPriceIncluding){
                        let thisSettlementTax = item.totalContractPriceIncluding-item.thisSettlementAmount;
                        // 使用toFixed方法四舍五入到两位小数，并转换为数字
-                        thisSettlementTax = Number(thisSettlementTax.toFixed(3));
+                        thisSettlementTax = Number(thisSettlementTax.toFixed(2));
                        resultGrid.setCellValue(item,'thisSettlementTax',thisSettlementTax)
                    }
                }
@@ -118,7 +118,6 @@ $(function() {
                                resultGrid.setCellValue(item,'companyCode',projRecordBox[i]["param1Field"]);
                                resultGrid.setCellValue(item,'companyName',projRecordBox[i]["param2Field"]);
                            }
-                            continue
                            break;
                        }
                    }

--- a/src/main/webapp/HG/CW/HGCW012A.js
+++ b/src/main/webapp/HG/CW/HGCW012A.js
@@ -264,7 +264,7 @@ $(function () {
                            item.thisSettlementAmount = item.taxIncludeAmount;
                            resultGrid.setCellValue(item, "thisSettlementAmount", item.taxIncludeAmount)
                        }
-                        return kendo.format("{0:C3}",parseFloat(item.thisSettlementAmount));
+                        return kendo.format("{0:C2}",parseFloat(item.thisSettlementAmount));
                    }
                }],
            loadComplete: function(grid) {

--- a/src/main/webapp/HG/CW/HGCW014.jsp
+++ b/src/main/webapp/HG/CW/HGCW014.jsp
@@ -53,7 +53,7 @@
            <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="incomeNumber" cname="收款单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true"

--- a/src/main/webapp/HG/CW/HGCW014A.jsp
+++ b/src/main/webapp/HG/CW/HGCW014A.jsp
@@ -44,11 +44,11 @@
            <EF:EFColumn ename="projCode" cname="项目编码" hidden="true"/>
            <EF:EFColumn ename="projName" cname="项目名称" width="200" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="thisAmount" cname="本次收款金额" width="120" enable="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="false"
+                         displayType="0.00" sort="true" align="right" readonly="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="partyA" cname="客户名称" width="200" enable="false" readonly="true" align="center"/>
@@ -61,15 +61,15 @@
            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW014B.jsp
+++ b/src/main/webapp/HG/CW/HGCW014B.jsp
@@ -15,7 +15,7 @@
            <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="false"
+                         displayType="0.00" sort="true" align="right" readonly="false"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW016.jsp
+++ b/src/main/webapp/HG/CW/HGCW016.jsp
@@ -57,7 +57,7 @@
            <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="incomeNumber" cname="付款单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true"

--- a/src/main/webapp/HG/CW/HGCW016A.jsp
+++ b/src/main/webapp/HG/CW/HGCW016A.jsp
@@ -48,11 +48,11 @@
                              align="center" filter="contains" sort="true">
            </EF:EFComboColumn>
            <EF:EFColumn ename="thisAmount" cname="本次付款金额" width="120" enable="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0.00" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="true"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="remainingAmount" cname="剩余付款金额" width="120" enable="false" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0.00" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="true"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFComboColumn ename="partyA" cname="供应商名称" blockName="sup_record_block_id"
@@ -72,15 +72,15 @@
            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="false" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW016B.jsp
+++ b/src/main/webapp/HG/CW/HGCW016B.jsp
@@ -26,7 +26,7 @@
            </EF:EFComboColumn>
            <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right"
+                         displayType="0.00" sort="true" align="right"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>

--- a/src/main/webapp/HG/CW/HGCW016C.jsp
+++ b/src/main/webapp/HG/CW/HGCW016C.jsp
@@ -26,7 +26,7 @@
            </EF:EFComboColumn>
            <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="false" format="{0:C2}" editType="text"
-                         displayType="0.000" sort="true" align="right" readonly="true"
+                         displayType="0.00" sort="true" align="right" readonly="true"
                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
                         data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
        </EF:EFGrid>