1.结算单增加累计结算工程量

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW008.java

@@ -53,6 +53,8 @@ public class HGCW008 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_COMPANY_CODES = "companyCodes";
+	public static final String FIELD_THIS_ENGINEERING_QUANTITY = "thisEngineeringQuantity";
+	public static final String FIELD_CUMULATIVE_ENGINEERING_QUANTITY = "cumulativeEngineeringQuantity";
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -85,6 +87,8 @@ public class HGCW008 extends DaoEPBase {
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 记录修改名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 记录修改时间*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+	public static final String COL_THIS_ENGINEERING_QUANTITY = "THIS_ENGINEERING_QUANTITY";
+	public static final String COL_CUMULATIVE_ENGINEERING_QUANTITY = "CUMULATIVE_ENGINEERING_QUANTITY";
 
 	public static final String QUERY = "HGCW008.query";
 	public static final String COUNT = "HGCW008.count";
@@ -121,6 +125,8 @@ public class HGCW008 extends DaoEPBase {
 	private String updatedName = " ";		/* 记录修改名称*/
 	private String updatedTime = " ";		/* 记录修改时间*/
 	private String depCode = " ";		/* 部门编码*/
+	private BigDecimal thisEngineeringQuantity = new BigDecimal("0");		/* 累计结算价税合计金额*/
+	private BigDecimal cumulativeEngineeringQuantity = new BigDecimal("0");		/* 累计结算价税合计金额*/
 
 	/**
 	 * initialize the metadata.
@@ -268,8 +274,20 @@ public class HGCW008 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_DEP_CODE);
 		eiColumn.setDescName("部门编码");
 		eiMetadata.addMeta(eiColumn);
-
-
+		
+		eiColumn = new EiColumn(FIELD_THIS_ENGINEERING_QUANTITY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("本次结算工程量");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_CUMULATIVE_ENGINEERING_QUANTITY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("累计结算工程量");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -735,6 +753,23 @@ public class HGCW008 extends DaoEPBase {
 	public void setRemainingAmount(BigDecimal remainingAmount) {
 		this.remainingAmount = remainingAmount;
 	}
+	
+	public BigDecimal getThisEngineeringQuantity() {
+		return thisEngineeringQuantity;
+	}
+	
+	public void setThisEngineeringQuantity(BigDecimal thisEngineeringQuantity) {
+		this.thisEngineeringQuantity = thisEngineeringQuantity;
+	}
+	
+	public BigDecimal getCumulativeEngineeringQuantity() {
+		return cumulativeEngineeringQuantity;
+	}
+	
+	public void setCumulativeEngineeringQuantity(BigDecimal cumulativeEngineeringQuantity) {
+		this.cumulativeEngineeringQuantity = cumulativeEngineeringQuantity;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -772,6 +807,8 @@ public class HGCW008 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setThisEngineeringQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THIS_ENGINEERING_QUANTITY)), thisEngineeringQuantity));
+		setCumulativeEngineeringQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CUMULATIVE_ENGINEERING_QUANTITY)), cumulativeEngineeringQuantity));
 	}
 
 	/**
@@ -810,7 +847,9 @@ public class HGCW008 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
-
+		map.put(FIELD_THIS_ENGINEERING_QUANTITY, StringUtils.toString(thisEngineeringQuantity, eiMetadata.getMeta(FIELD_THIS_ENGINEERING_QUANTITY)));
+		map.put(FIELD_CUMULATIVE_ENGINEERING_QUANTITY, StringUtils.toString(cumulativeEngineeringQuantity, eiMetadata.getMeta(FIELD_CUMULATIVE_ENGINEERING_QUANTITY)));
+		
 		return map;
 	}
 

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW008.java

@@ -238,8 +238,13 @@ public class ServiceHGCW008 extends ServiceBase {
 		}
 		return inInfo;
 	}
-
-
+	
+	/**
+	 * 累计金额
+	 *
+	 * @param inInfo
+	 * @return
+	 */
 	public EiInfo queryCalculateAmount(EiInfo inInfo) {
 		try {
 			Map map = new HashMap();

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -634,10 +634,12 @@ public class HGCWTools {
 			    paramMap.put("cumulativeSettlementAmount", BigDecimal.ZERO);
 			    paramMap.put("cumulativeSettlementTax", BigDecimal.ZERO);
 			    paramMap.put("cumulativePriceTax", BigDecimal.ZERO);
+			    paramMap.put("cumulativeEngineeringQuantity", BigDecimal.ZERO);
 		    } else {
 			    paramMap.put("cumulativeSettlementAmount", calcAmountMap.get("thisSettlementAmount"));
 			    paramMap.put("cumulativeSettlementTax", calcAmountMap.get("thisSettlementTax"));
 			    paramMap.put("cumulativePriceTax", calcAmountMap.get("thisPriceTax"));
+			    paramMap.put("cumulativeEngineeringQuantity", calcAmountMap.get("thisEngineeringQuantity"));
 		    }
 		    DaoUtils.update("HGCW008.updateCumulativeSettlement", paramMap);
 	    }

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC001.java

@@ -33,6 +33,7 @@ public class HGSC001 extends DaoEPBase {
 	public static final String FIELD_genral_contract_name = "genralContractName";    		/* 总包商名称*/
 	public static final String FIELD_party_pm_name = "partyPmName";    		/* 甲方项目经理名称*/
 	public static final String FIELD_party_pm_hpone = "partyPmHpone";    		/* 甲方项目经理联系电话*/
+	public static final String FIELD_CONTRACT_NO = "contractNo";    		/* 合同号*/
 	public static final String FIELD_contract_name = "contractName";    		/* 合同名称*/
 	public static final String FIELD_contract_work_txt = "contractWorkTxt";    		/* 合同工作量*/
 	public static final String FIELD_proj_code = "projCode";    		/* 项目编码*/
@@ -62,6 +63,7 @@ public class HGSC001 extends DaoEPBase {
 	public static final String COL_genral_contract_name = "genral_contract_name";    		/* 总包商名称*/
 	public static final String COL_party_pm_name = "party_pm_name";    		/* 甲方项目经理名称*/
 	public static final String COL_party_pm_hpone = "party_pm_hpone";    		/* 甲方项目经理联系电话*/
+	public static final String COL_CONTRACT_NO = "CONTRACT_NO";    		/* 合同号*/
 	public static final String COL_contract_name = "contract_name";    		/* 合同名称*/
 	public static final String COL_contract_work_txt = "contract_work_txt";    		/* 合同工作量*/
 	public static final String COL_proj_code = "proj_code";    		/* 项目编码*/
@@ -101,6 +103,7 @@ public class HGSC001 extends DaoEPBase {
 	private String genralContractName = "";		/* 总包商名称*/
 	private String partyPmName = "";		/* 甲方项目经理名称*/
 	private String partyPmHpone = "";		/* 甲方项目经理联系电话*/
+	private String contractNo = "";		/* 合同号*/
 	private String contractName = "";		/* 合同名称*/
 	private String contractWorkTxt = "";		/* 合同工作量*/
 	private String projCode = "";		/* 项目编码*/
@@ -169,7 +172,11 @@ public class HGSC001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_party_pm_hpone);
 		eiColumn.setDescName("甲方项目经理联系电话");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_CONTRACT_NO);
+		eiColumn.setDescName("合同号");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_contract_name);
 		eiColumn.setDescName("合同名称");
 		eiMetadata.addMeta(eiColumn);
@@ -696,6 +703,15 @@ public class HGSC001 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+	
+	public String getContractNo() {
+		return contractNo;
+	}
+	
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -732,6 +748,7 @@ public class HGSC001 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
+		setContractNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NO)), contractNo));
 	}
 
 	/**
@@ -769,6 +786,7 @@ public class HGSC001 extends DaoEPBase {
 		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
 		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
 		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
+		map.put(FIELD_CONTRACT_NO, StringUtils.toString(contractNo, eiMetadata.getMeta(FIELD_CONTRACT_NO)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101.java

@@ -157,10 +157,12 @@ public class ServiceHGSC101 extends ServiceEPBase {
 				dbSc001.setDepName(dbPz009.getAccountName());
 				dbSc001.setProjCode(projCode);
 				dbSc001.setProjName(dcContractList.getTitle());
+				dbSc001.setContractNo(dcContractList.getHtid());
 				DaoUtils.insert(HGSC001.INSERT, dbSc001);
 			} else {
 				Map updateMap = new HashMap();
 				updateMap.put(HGSC001.FIELD_proj_code, projCode);
+				updateMap.put(HGSC001.FIELD_CONTRACT_NO, dcContractList.getHtid());
 				updateMap.put(HGSC001.FIELD_proj_name, dcContractList.getTitle());
 				DaoUtils.update(HgScSqlConstant.HgSc001.UPDATE_PROJ_NAME, updateMap);
 			}

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -14,6 +14,7 @@
         genral_contract_name as "genralContractName",  <!-- 总包商名称 -->
         party_pm_name as "partyPmName",  <!-- 甲方项目经理名称 -->
         party_pm_hpone as "partyPmHpone",  <!-- 甲方项目经理联系电话 -->
+        contract_no as "contractNo",  <!-- 合同号 -->
         contract_name as "contractName",  <!-- 合同名称 -->
         contract_work_txt as "contractWorkTxt",  <!-- 合同工作量 -->
         proj_code as "projCode",  <!-- 项目编码 -->
@@ -159,41 +160,46 @@
         <include refid="customCondition"/>
     </select>
 
-	<insert id="insert">
-		INSERT INTO ${hggpSchema}.HGSC001 (id,
-										company_code,  <!-- 公司编码 -->
-										company_name,  <!-- 公司名称 -->
-										dep_code,  <!-- 部门编码 -->
-										dep_name,  <!-- 部门名称 -->
-										subcontract_code,  <!-- 分包商编码 -->
-										subcontract_name,  <!-- 分包商名称 -->
-										genral_contract_code,  <!-- 总包商编码 -->
-										genral_contract_name,  <!-- 总包商名称 -->
-										party_pm_name,  <!-- 甲方项目经理名称 -->
-										party_pm_hpone,  <!-- 甲方项目经理联系电话 -->
-										contract_name,  <!-- 合同名称 -->
-										contract_work_txt,  <!-- 合同工作量 -->
-										proj_code,  <!-- 项目编码 -->
-										proj_name,  <!-- 项目名称 -->
-										proj_type,  <!-- 项目性质 -->
-										proj_status,  <!-- 项目状态	0:在建；1:完工 -->
-										approval_status,  <!-- 审批状态	0:待审；1:审核中；2:已审 -->
-										permiss_start_date,  <!-- 准许开工日期 -->
-										start_date,  <!-- 开工日期 -->
-										end_date,  <!-- 完工日期 -->
-										account_code,  <!-- 帐套 -->
-										created_by,  <!-- 创建人 -->
-										created_name,  <!-- 创建人名称 -->
-										created_time,  <!-- 创建时间 -->
-										updated_by,  <!-- 更新人 -->
-										updated_name,  <!-- 修改人名称 -->
-										updated_time  <!-- 更新时间 -->
-										)
-	    VALUES (#id#, #companyCode#, #companyName#, #depCode#, #depName#, #subcontractCode#, #subcontractName#, #genralContractCode#, #genralContractName#, #partyPmName#, #partyPmHpone#, #contractName#, #contractWorkTxt#, #projCode#, #projName#, #projType#, #projStatus#, #approvalStatus#, #permissStartDate#, #startDate#, #endDate#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
-		<selectKey resultClass="long" keyProperty="id">
-			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC001
-		</selectKey>
-	</insert>
+    <insert id="insert">
+        INSERT INTO ${hggpSchema}.HGSC001 (id,
+        company_code,  <!-- 公司编码 -->
+        company_name,  <!-- 公司名称 -->
+        dep_code,  <!-- 部门编码 -->
+        dep_name,  <!-- 部门名称 -->
+        subcontract_code,  <!-- 分包商编码 -->
+        subcontract_name,  <!-- 分包商名称 -->
+        genral_contract_code,  <!-- 总包商编码 -->
+        genral_contract_name,  <!-- 总包商名称 -->
+        party_pm_name,  <!-- 甲方项目经理名称 -->
+        party_pm_hpone,  <!-- 甲方项目经理联系电话 -->
+        contract_name,  <!-- 合同名称 -->
+        contract_work_txt,  <!-- 合同工作量 -->
+        proj_code,  <!-- 项目编码 -->
+        proj_name,  <!-- 项目名称 -->
+        proj_type,  <!-- 项目性质 -->
+        proj_status,  <!-- 项目状态	0:在建；1:完工 -->
+        approval_status,  <!-- 审批状态	0:待审；1:审核中；2:已审 -->
+        permiss_start_date,  <!-- 准许开工日期 -->
+        start_date,  <!-- 开工日期 -->
+        end_date,  <!-- 完工日期 -->
+        account_code,  <!-- 帐套 -->
+        created_by,  <!-- 创建人 -->
+        created_name,  <!-- 创建人名称 -->
+        created_time,  <!-- 创建时间 -->
+        updated_by,  <!-- 更新人 -->
+        updated_name,  <!-- 修改人名称 -->
+        updated_time,  <!-- 更新时间 -->
+        contract_no  <!-- 合同号 -->
+        )
+        VALUES (#id#, #companyCode#, #companyName#, #depCode#, #depName#, #subcontractCode#, #subcontractName#,
+        #genralContractCode#, #genralContractName#, #partyPmName#, #partyPmHpone#, #contractName#, #contractWorkTxt#,
+        #projCode#, #projName#, #projType#, #projStatus#, #approvalStatus#, #permissStartDate#, #startDate#, #endDate#,
+        #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
+        #contractNo#)
+        <selectKey resultClass="long" keyProperty="id">
+            SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC001
+        </selectKey>
+    </insert>
 
 	<delete id="delete">
 		DELETE FROM ${hggpSchema}.HGSC001 WHERE
@@ -326,6 +332,7 @@
     <update id="updateProjName">
         UPDATE ${hggpSchema}.HGSC001
         SET
+        CONTRACT_NO = #contractNo#,
         PROJ_NAME = #projName#,
         <include refid="SqlBase.updateRevise"/>
         WHERE PROJ_CODE = #projCode#

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java

@@ -2,20 +2,21 @@ package com.baosight.hggp.hg.wd.service;
 
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
-import com.baosight.hggp.core.enums.OrgTypeEnum;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.wd.constant.HgWdConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.tools.HGWDTools;
 import com.baosight.hggp.hg.wd.utils.HgWdUtils;
-import com.baosight.hggp.hg.xs.domain.Org;
-import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.MapUtils;
 import com.baosight.hggp.util.ObjectUtils;
-import com.baosight.iplat4j.core.ei.*;
+import com.baosight.iplat4j.core.ei.EiBlock;
+import com.baosight.iplat4j.core.ei.EiBlockMeta;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.ef.ui.tree.TreeService;
 import com.baosight.xservices.xs.service.ServiceXSTreeNode;
@@ -23,8 +24,11 @@ import com.baosight.xservices.xs.util.LoginUserDetails;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author LiuYang
@@ -239,7 +243,7 @@ public class ServiceHGWD001D extends TreeService {
 			return results;
 		}
 		for (HGSC001 dbSc001 : dbSc001s) {
-			String text = "[" + dbSc001.getProjCode() + "]" + dbSc001.getProjName();
+			String text = dbSc001.getProjName() + "（" + dbSc001.getProjCode() + "）";
 			Map leafMap = buildLeaf(parentId, dbSc001.getProjCode(), text, HgWdConstant.LeafType.P);
 			leafMap.put("projCode", dbSc001.getProjCode());
 			leafMap.put("projName", dbSc001.getProjName());

src/main/webapp/HG/CW/HGCW008A.js

 var sumCumulativeSettlementAmount = 0;
 var sumCumulativeSettlementTax = 0;
+var sumCumulativeEngineeringQuantity = 0;
 
 $(function() {
 
@@ -150,6 +151,7 @@ $(function() {
                             var data = ei.extAttr.result;
                             sumCumulativeSettlementAmount = data[0].sumCumulativeSettlementAmount;
                             sumCumulativeSettlementTax = data[0].sumCumulativeSettlementTax;
+	                        sumCumulativeEngineeringQuantity = data[0].sumCumulativeEngineeringQuantity;
                         } else {
                             NotificationUtil(ei, "error");
                             return 0;
@@ -448,13 +450,17 @@ function calculateAmount(rows) {
     var contractType = $("#contractType").val();
     var totalPrice = 0;
 	var deductionPrice = 0;
+	var thisEngineeringQuantity = 0;
 	rows.forEach(function (row, index) {
+		thisEngineeringQuantity += parseFloat(row.thisEngineeringQuantity);
 		if (row.settlementBasis == "合同内") {
 			totalPrice += parseFloat(row.totalPrice);
 		} else {
 			deductionPrice += parseFloat(row.totalPrice);
 		}
 	});
+	// 累计结算工程量
+	let cumulativeEngineeringQuantity = sumCumulativeEngineeringQuantity + thisEngineeringQuantity;
     // 税点
 	var taxPoints = $("#result-0-taxPoints").val() ? $("#result-0-taxPoints").val() / 100 : 0;
 	// 本次结算金额
@@ -480,6 +486,8 @@ function calculateAmount(rows) {
 	$("#result-0-cumulativeSettlementTax").val(parseFloat(cumulativeSettlementTax).toFixed(3));
 	$("#result-0-thisPriceTax").val(parseFloat(thisPriceTax).toFixed(3));
 	$("#result-0-cumulativePriceTax").val(parseFloat(cumulativePriceTax).toFixed(3));
+	$("#result-0-thisEngineeringQuantity").val(parseFloat(thisEngineeringQuantity).toFixed(3));
+	$("#result-0-cumulativeEngineeringQuantity").val(parseFloat(cumulativeEngineeringQuantity).toFixed(3));
 }
 
 function fieldValidation() {

src/main/webapp/HG/CW/HGCW008A.jsp

@@ -63,8 +63,13 @@
         <div class="row">
             <EF:EFInput ename="result-0-totalContractPrice" cname="合同金额（元）" colWidth="4" readonly="true"/>
             <EF:EFInput ename="result-0-remainingAmount" cname="剩余开票金额（元）" colWidth="4" readonly="true"/>
-        </div>
+		 </div>
+	    <div class="row">
+		    <EF:EFInput ename="result-0-thisEngineeringQuantity" cname="本次结算工程量" colWidth="4" readonly="true"/>
+		    <EF:EFInput ename="result-0-cumulativeEngineeringQuantity" cname="累计结算工程量" colWidth="4" readonly="true"/>
+	    </div>
     </EF:EFRegion>
+
     <EF:EFRegion id="detail1" title="合同清单">
         <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
 	        <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
@@ -74,7 +79,7 @@
 	        <EF:EFColumn ename="engineeringContent" cname="工程内容" align="left"/>
 	        <EF:EFColumn ename="thisEngineeringQuantity" cname="本次结算工程量" format="{0:N3}" align="right"/>
 	        <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
-	                     format="{0:N3}" align="right"/>
+	                     format="{0:N3}" align="right" hidden="true"/>
 	        <EF:EFColumn ename="unit" cname="单位" align="center"/>
 	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>

src/main/webapp/HG/CW/HGCW008B.js

@@ -373,10 +373,15 @@ function calcTotalPrice(e, type) {
 function calculateAmount(rows) {
 	var thisAmount = 0;
 	var thisTaxAmount = 0;
+	var thisQuantity = 0;
 	rows.forEach(function (row, index) {
 		thisAmount += parseFloat(row.totalPrice);
 		thisTaxAmount += parseFloat(row.totalTaxPrice);
+		thisQuantity += parseFloat(row.thisEngineeringQuantity);
 	});
+	// 累计结算工程量
+	var sumQuantity = $("#main-0-thisEngineeringQuantity").val();
+	let cumulativeQuantity = parseFloat(sumQuantity) + thisQuantity;
 	// 本次结算税金
 	var thisTax = thisTaxAmount - thisAmount;
 	// 累计不含税金额，不含本结算单
@@ -396,7 +401,9 @@ function calculateAmount(rows) {
 	$("#result-0-thisSettlementTax").val(parseFloat(thisTax).toFixed(3))
 	$("#result-0-cumulativeSettlementTax").val(parseFloat(cumulativeSettlementTax).toFixed(3))
 	$("#result-0-thisPriceTax").val(parseFloat(thisTaxAmount).toFixed(3))
-	$("#result-0-cumulativePriceTax").val(parseFloat(cumulativePriceTax).toFixed(3))
+	$("#result-0-cumulativePriceTax").val(parseFloat(cumulativePriceTax).toFixed(3));
+	$("#result-0-thisEngineeringQuantity").val(parseFloat(thisQuantity).toFixed(3));
+	$("#result-0-cumulativeEngineeringQuantity").val(parseFloat(cumulativeQuantity).toFixed(3));
 }
 
 /**

src/main/webapp/HG/CW/HGCW008B.jsp

@@ -9,6 +9,7 @@
 	    <EF:EFInput ename="main-0-thisSettlementAmount" cname="累计结算金额" type="hidden"/>
 	    <EF:EFInput ename="main-0-thisSettlementTax" cname="累计结算税金" type="hidden"/>
 	    <EF:EFInput ename="main-0-thisPriceTax" cname="累计结算价税合计金额" type="hidden"/>
+	    <EF:EFInput ename="main-0-thisEngineeringQuantity" cname="累计结算工程量" type="hidden"/>
 	    <EF:EFInput ename="result-0-id" cname="id" type="hidden"/>
 	    <div class="row">
             <EF:EFInput ename="result-0-projCode" cname="项目编号" colWidth="4" readonly="true"/>
@@ -50,6 +51,8 @@
         </div>
         <div class="row">
             <EF:EFInput ename="result-0-totalContractPrice" cname="合同金额（元）" colWidth="4" readonly="true"/>
+	        <EF:EFInput ename="result-0-thisEngineeringQuantity" cname="本次结算工程量" colWidth="4" readonly="true"/>
+	        <EF:EFInput ename="result-0-cumulativeEngineeringQuantity" cname="累计结算工程量" colWidth="4" readonly="true"/>
         </div>
     </EF:EFRegion>
 
@@ -62,7 +65,7 @@
 	        <EF:EFColumn ename="engineeringContent" cname="工程内容" align="left"/>
 	        <EF:EFColumn ename="thisEngineeringQuantity" cname="本次结算工程量" format="{0:N3}" align="right"/>
 	        <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
-	                     format="{0:N3}" align="right"/>
+	                     format="{0:N3}" align="right" hidden="true"/>
 	        <EF:EFColumn ename="unit" cname="单位" align="center"/>
 	        <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N2}" align="right"/>
 	        <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>

src/main/webapp/HG/CW/HGCW008C.jsp

@@ -48,6 +48,8 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="result-0-totalContractPrice" cname="合同金额（元）" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="result-0-thisEngineeringQuantity" cname="本次结算工程量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="result-0-cumulativeEngineeringQuantity" cname="累计结算工程量" colWidth="4" readonly="true"/>
 		</div>
 	</EF:EFRegion>
 
@@ -60,7 +62,7 @@
 			<EF:EFColumn ename="engineeringContent" cname="工程内容" enable="false" align="center"/>
 			<EF:EFColumn ename="thisEngineeringQuantity" cname="本次结算工程量" enable="false" format="{0:N3}" align="right"/>
 			<EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量" enable="false" width="140"
-			             align="right" format="{0:N3}"/>
+			             align="right" format="{0:N3}" hidden="true"/>
 			<EF:EFColumn ename="unit" cname="单位" enable="false" align="center"/>
 			<EF:EFColumn ename="unitPrice" cname="含税单价" enable="false" format="{0:N2}" align="right"/>
 			<EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>