Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -107,6 +107,8 @@ public class HGConstant {
 		public static final String BLUEPRINT_CODE = "BLUEPRINT_CODE";
 
 		public static final String CW_CONTRACT_NO = "CW_CONTRACT_NO";
+
+		public static final String CW_SETTLEMENT_NO = "CW_SETTLEMENT_NO";
 	}
 
 	/**

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

@@ -22,10 +22,7 @@ import org.apache.commons.collections.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author yukang
@@ -262,15 +259,34 @@ public class ServiceHGCW002 extends ServiceBase {
 
 	public EiInfo projectComboBox(EiInfo inInfo){
 		Map<String, Object> map = new HashMap<>();
+		List<String> contractTypArray = new ArrayList<>();
 		if (StringUtils.isNotEmpty(inInfo.getString("reviewStatus"))) {
 			map.put("reviewStatus", inInfo.getString("reviewStatus"));
 		}
 		if (StringUtils.isNotEmpty(inInfo.getString("contractType"))) {
 			map.put("contractType", inInfo.getString("contractType"));
 		}
+		if (StringUtils.isNotEmpty(inInfo.getString("contractTyps"))) {
+			String[] contractTyps = inInfo.getString("contractTyps").split(",");
+			for (String c : contractTyps) {
+				contractTypArray.add(c);
+			}
+			map.put("contractTyps", contractTypArray);
+		}
 		List<HGCW002> HGCW002List = dao.query("HGCW002.queryProjectComboBox", map);
 		inInfo.addBlock("projcet_combo_box").setRows(HGCW002List);
 		return inInfo;
 	}
 
+	public EiInfo queryContractByType(EiInfo inInfo){
+		Map<String, Object> map = new HashMap<>();
+		if (StringUtils.isNotEmpty(inInfo.getString("reviewStatus"))) {
+			map.put("reviewStatus", "3");
+		}
+
+		List<HGCW002> HGCW002List = dao.query("HGCW002.queryContractByType",map);
+		inInfo.addBlock("contract_combo_box").setRows(HGCW002List);
+		return inInfo;
+	}
+
 }

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

@@ -193,10 +193,7 @@ public class ServiceHGCW004 extends ServiceBase {
 //     * 上传附件
 //     * @param inInfo
 //     * @return
-//     */
-//    @OperationLogAnnotation(operModul = "账期维护",operType = "上传附件",operDesc = "上传附件")
-//    public EiInfo form(EiInfo inInfo) {
-//        return inInfo;
+//     *
 //    }
 @OperationLogAnnotation(operModul = "账期维护",operType = "上传附件",operDesc = "上传附件操作")
 public EiInfo updateDocId(EiInfo inInfo){

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.cw.domain.HGCW008;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.LogUtils;
+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.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW008().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGCW008.QUERY, new HGCW008());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "保存",operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			List<Map> detail1Rows = inInfo.getBlock("detail1").getRows();
+
+			if (CollectionUtils.isNotEmpty(resultRows)) {
+				HGCW008 HGCW008 = new HGCW008();
+				HGCW008.fromMap(resultRows.get(0));
+				if (HGCW008.getId() == null || HGCW008.getId() == 0) {
+					UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+					String settlementNumber = SequenceGenerator.getNextSequence(HGConstant.SequenceId.CW_SETTLEMENT_NO);
+					HGCW008.setCompanyCode(userVO.getUsercode());
+					HGCW008.setCompanyName(userVO.getUsername());
+					HGCW008.setSettlementNumber(settlementNumber);
+					HGCW008.setReviewStatus(0);
+					HGCW008.setContractDate(DateUtils.formatShort(HGCW008.getContractDate()));
+					this.add(HGCW008);
+					// 写入其他数据
+					HGCWTools.HgCw009.save(detail1Rows,settlementNumber,userVO);
+					// 更新合同结算状态
+					HGCWTools.HgCw002.updateBalanceStatus(HGCW008.getContractNumber(),HGCW008.getSettlementType() + 1);
+
+				} else {
+					BigDecimal totalContractPriceExcluding = new BigDecimal(0);
+					BigDecimal totalContractPriceIncluding = new BigDecimal(0);
+					BigDecimal valueAddedTax = new BigDecimal(0);
+					BigDecimal totalQuantity = new BigDecimal(0);
+
+					//计算合同清单金额
+					for (int i = 0; i < detail1Rows.size(); i++) {
+						HGCW007 hgcw007 = new HGCW007();
+						hgcw007.fromMap(detail1Rows.get(i));
+						totalContractPriceExcluding = totalContractPriceExcluding.add(hgcw007.getTotalPrice());
+						totalQuantity = totalQuantity.add(hgcw007.getDeviceNumber());
+					}
+					BigDecimal taxPoints = new BigDecimal(HGCW008.getTaxPoints() / 100);
+					totalContractPriceIncluding = totalContractPriceExcluding.multiply(taxPoints.add(new BigDecimal(1)));
+					valueAddedTax = totalContractPriceIncluding.subtract(totalContractPriceExcluding);
+					DecimalFormat decimalFormat = new DecimalFormat("#.000");
+					this.modify(HGCW008);
+					// 更新合同结算状态
+					HGCWTools.HgCw002.updateBalanceStatus(HGCW008.getContractNumber(),HGCW008.getSettlementType() + 1);
+				}
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param HGCW008
+	 * @return
+	 */
+	public void add(HGCW008 HGCW008) {
+		DaoUtils.insert("HGCW008.insert", HGCW008);
+	}
+
+	/**
+	 * 修改操作
+	 *
+	 * @param HGCW008
+	 * @return
+	 */
+	public void modify(HGCW008 HGCW008) {
+		DaoUtils.update("HGCW008.update", HGCW008);
+	}
+	
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "删除",operDesc = "删除")
+	public EiInfo delete(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				DaoUtils.update("HGCW008.delete", resultRows.get(i));
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return inInfo;
+	}
+
+	/**
+     * 提交操作
+	 * @param inInfo
+     * @return
+	 */
+	public EiInfo submit(EiInfo inInfo){
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW008 HGCW008 = new HGCW008();
+				HGCW008.fromMap(resultRows.get(i));
+				HGCW008.setReviewStatus(3);
+				DaoUtils.update("HGCW008.submit", HGCW008);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+
+	public EiInfo queryCalculateAmount(EiInfo inInfo) {
+		try {
+			Map map = new HashMap();
+			String contractNumber = inInfo.getString("contractNumber");
+			map.put("contractNumber", contractNumber);
+			List result = dao.query("HGCW008.queryCalculateAmount", map);
+			inInfo.set("result", result);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.hg.cw.domain.HGCW008;
+import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Org;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008A extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
+			inInfo.addBlock("detail1").addBlockMeta(new HGCW008().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.hg.cw.domain.HGCW008;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.domain.HGCW009;
+import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.LogUtils;
+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.core.service.impl.ServiceBase;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008B extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "修改合同",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			String id = inInfo.getString("id");
+			HGCW008 HGCW008 = HGCWTools.HgCw008.getId(id);
+			inInfo.addBlock(EiConstant.resultBlock).addRow(HGCW008);
+			//获取清单
+			List<HGCW009> hgcw009List = HGCWTools.HgCw009.queryBySettlementNumber(HGCW008.getSettlementNumber());
+			inInfo.addBlock("detail1").addRows(hgcw009List);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.LogUtils;
+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.core.service.impl.ServiceBase;
+
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008C extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同详情",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+//			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
+			String id = inInfo.getString("id");
+			HGCW006 HGCW006 = HGCWTools.HgCw006.getId(id);
+			inInfo.addBlock(EiConstant.resultBlock).addRow(HGCW006);
+			//获取清单
+			List<HGCW007> hgcw007List = HGCWTools.HgCw007.queryByContractNumber(HGCW006.getContractNumber());
+			inInfo.addBlock("detail1").addRows(hgcw007List);
+			List<HGCW999> hgcw999List = HGCWTools.HgCw999.queryByBiz(HGCW006.getId(),"ZL");
+			inInfo.addBlock("detail2").addRows(hgcw999List);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.StringUtils;
+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.core.service.impl.ServiceBase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008D extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW003().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			List<String> ids = new ArrayList<>();
+			String inventoryIds = inInfo.getString("inqu_status-0-inventoryIds");
+			if (StringUtils.isNotEmpty(inventoryIds)) {
+				String[] inventoryIdsArr = inventoryIds.split(",");
+				for (String id : inventoryIdsArr) {
+					ids.add(id);
+				}
+				inInfo.set("inqu_status-0-ids", ids);
+			}
+			inInfo = super.query(inInfo, HGCW003.QUERY, new HGCW003());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.cw.domain.HGCW005;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.StringUtils;
+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.core.service.impl.ServiceBase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW008E extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo.addBlock("result1").addBlockMeta(new HGCW003().eiMetadata);
+			inInfo.addBlock("result2").addBlockMeta(new HGCW003().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			List<String> ids = new ArrayList<>();
+			List<String> dids = new ArrayList<>();
+			String inventoryIds = inInfo.getString("inqu_status-0-inventoryIds");
+			String deductionIds = inInfo.getString("inqu_status-0-deductionIds");
+
+			if (StringUtils.isNotEmpty(inventoryIds)) {
+				String[] inventoryIdsArr = inventoryIds.split(",");
+				for (String id : inventoryIdsArr) {
+					ids.add(id);
+				}
+				inInfo.set("inqu_status-0-ids", ids);
+			}
+			inInfo = super.query(inInfo, HGCW003.QUERY, new HGCW003(),new HGCW003().eiMetadata,"","","result1",false);
+			if (StringUtils.isNotEmpty(deductionIds)) {
+				String[] deductionIdsArr = deductionIds.split(",");
+				for (String id : deductionIdsArr) {
+					dids.add(id);
+				}
+				inInfo.set("inqu_status-0-dids", dids);
+			}
+			inInfo = super.query(inInfo, HGCW005.QUERY, new HGCW005(),new HGCW005().eiMetadata,"","","result2",false);
+
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

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

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.LogUtils;
+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.core.service.impl.ServiceBase;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW009 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW007().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGCW007.QUERY, new HGCW007());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "保存",operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		EiInfo eiInfo = new EiInfo();
+		try {
+			List<Map> resultRows = inInfo.getBlock("detail1").getRows();
+			String contractNumber = "";
+			// 写入数据
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW007 HGCW007 = new HGCW007();
+				HGCW007.fromMap(resultRows.get(i));
+				contractNumber = HGCW007.getContractNumber();
+				if (HGCW007.getId() == null || HGCW007.getId() == 0) {
+					this.add(HGCW007);
+				} else {
+					this.modify(HGCW007);
+				}
+			}
+			List<HGCW007> HGCW007List = HGCWTools.HgCw007.queryByContractNumber(contractNumber);
+			eiInfo.addBlock("detail1").addRows(HGCW007List);
+			eiInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			eiInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return eiInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param HGCW007
+	 * @return
+	 */
+	public void add(HGCW007 HGCW007) {
+		DaoUtils.insert("HGCW007.insert", HGCW007);
+	}
+
+	/**
+	 * 修改操作
+	 *
+	 * @param HGCW007
+	 * @return
+	 */
+	public void modify(HGCW007 HGCW007) {
+		DaoUtils.update("HGCW007.update", HGCW007);
+	}
+
+	public void deleteEntity(HGCW007 HGCW007) {
+		DaoUtils.update("HGCW007.delete", HGCW007);
+	}
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "删除",operDesc = "删除")
+	public EiInfo delete(EiInfo inInfo) {
+		EiInfo eiInfo = new EiInfo();
+		try {
+			List<Map> resultRows = inInfo.getBlock("detail1").getRows();
+			String contractNumber = "";
+			// 写入数据
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW007 HGCW007 = new HGCW007();
+				HGCW007.fromMap(resultRows.get(i));
+				contractNumber = HGCW007.getContractNumber();
+				this.deleteEntity(HGCW007);
+			}
+			List<HGCW007> HGCW007List = HGCWTools.HgCw007.queryByContractNumber(contractNumber);
+			eiInfo.addBlock("detail1").addRows(HGCW007List);
+			eiInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			eiInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return eiInfo;
+	}
+
+	public EiInfo queryEngineeringQuantity(EiInfo inInfo) {
+		try {
+			Map map = new HashMap();
+			String inventoryId = inInfo.getString("inventoryId");
+			map.put("inventoryId", inventoryId);
+			List result = dao.query("HGCW009.queryEngineeringQuantity", map);
+			inInfo.set("result", result.get(0));
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW002.xml

@@ -510,9 +510,24 @@
 		<isNotEmpty prepend=" AND " property="contractType">
 			CONTRACT_TYPE	= #contractType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractTyps">
+			CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
+		</isNotEmpty>
 		ORDER BY CONTRACT_NUMBER
 	</select>
 
+	<update id="updateBalanceStatus">
+		UPDATE ${hggpSchema}.HGCW002
+		SET
+		BALANCE_STATUS	= #balanceStatus#,   <!-- 审核状态 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		WHERE
+		CONTRACT_NUMBER = #contractNumber#
+	</update>
+
+
 	<update id="submit">
 		UPDATE ${hggpSchema}.HGCW002
 		SET
@@ -524,4 +539,28 @@
 		ID = #id#
 	</update>
 
+	<select id="queryContractByType" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hggp.hg.cw.domain.HGCW002">
+		SELECT DISTINCT
+		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
+		PROJ_NAME	as "projName",  <!-- 项目名称 -->
+		CONTRACT_NUMBER	as "contractNumber",  <!-- 合同号 -->
+		CONTRACT_NAME	as "contractName",  <!-- 合同名称 -->
+		TOTAL_CONTRACT_PRICE_EXCLUDING	as "totalContractPriceExcluding",  <!-- 合同总价（不含税） -->
+		CONTRACT_TYPE as contractType,  <!-- 合同类型;1销售合同2劳务合同3补充协议4合同外用工 -->
+		PARTY_A	as "partyA",  <!-- 甲方名称 -->
+		PARTY_B	as "partyB"  <!-- 乙方名称 -->
+		FROM ${hggpSchema}.HGCW002
+		WHERE 1=1 AND REVIEW_STATUS= 3 AND CONTRACT_TYPE IN (1,2)
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
+		ORDER BY CONTRACT_NUMBER
+	</select>
 </sqlMap>

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW003.xml

@@ -94,6 +94,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="ids">
+			ID NOT IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW005.xml

@@ -92,6 +92,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="dids">
+			ID NOT IN <iterate close=")" open="(" conjunction="," property="dids">#dids[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -45,6 +45,15 @@ public class HGCWTools {
             });
             return results.get(0);
         }
+
+        public static void updateBalanceStatus(String contractNumber, Integer balanceStatus ) {
+            AssertUtils.isNull(contractNumber, "合同号不能为空！");
+            AssertUtils.isNull(balanceStatus, "结算状态不能为空！");
+            DaoUtils.update("HGCW002.updateBalanceStatus", new HashMap<String,Object>(){
+                {put("contractNumber",contractNumber);}
+                {put("balanceStatus",balanceStatus);}
+            });
+        }
     }
 
     public static class HgCw003{
@@ -112,6 +121,44 @@ public class HGCWTools {
         }
     }
 
+    public static class HgCw008 {
+
+        public static HGCW008 getId(String id) {
+            AssertUtils.isNull(id, "结算单ID不能为空！");
+            List<HGCW008> results = DaoBase.getInstance().query(HGCW008.QUERY,new HashMap<String,Object>(){
+                {put("id",id);}
+            });
+            return results.get(0);
+        }
+    }
+
+    public static class HgCw009 {
+        public static void save(List<Map> rows, String settlementNumber, UserVO userVO) {
+            AssertUtils.isNull(settlementNumber, "结算单号不能为空！");
+            rows.forEach(row -> {
+                HGCW009 hgcw009 = new HGCW009();
+                hgcw009.fromMap(row);
+                hgcw009.setCompanyCode(userVO.getUsercode());
+                hgcw009.setCompanyName(userVO.getUsername());
+                hgcw009.setSettlementNumber(settlementNumber);
+                DaoUtils.insert(HGCW009.INSERT, hgcw009);
+            });
+        }
+
+        /**
+         * 根据合同号获取合同清单
+         * @param settlementNumber
+         * @return
+         */
+        public static List<HGCW009> queryBySettlementNumber(String settlementNumber) {
+            AssertUtils.isNull(settlementNumber, "结算单号不能为空！");
+            List<HGCW009> results = DaoBase.getInstance().query(HGCW009.QUERY,new HashMap<String,Object>(){
+                {put("contractNumber",settlementNumber);}
+            });
+            return results;
+        }
+    }
+
     public static class HgCw999 {
 
         public static void batchUpdate(List<Map> rows, Long id) {

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -37,8 +37,11 @@
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW001.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW002.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW003.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW004.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW006.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW007.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW008.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW009.xml"/>
 
 
     <!--配置-->

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

@@ -24,8 +24,8 @@ $(function() {
                 let auditStatus = item.status;
                 let template = '';
                 if (item.id) {
-                    template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                        + 'onclick="uploadFile(' + item.id + ')"  >附件上传</a>';
+                    let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                        + 'onclick="fileDetailFunc(' + item.id + ')">附件详情</a>';
                 }
 
                 return template;
@@ -254,67 +254,13 @@ function updateStatus(id,deviceStatus) {
         }
     );
 }
-/**
- * 文件上传
- *
- * @param id
- */
-function uploadFile(id) {
-    JSColorbox.open({
-        href: "HGCW004A?methodName=initLoad&inqu_status-0-id="+id,
-        title: "<div style='text-align: center;'>附件上传</div>",
-        width: "60%",
-        height: "50%",
-        callbackName: uploadFileCallback
-    });
-}
 
-/**
- * 附件上传回调
- *
- * @param docId
- */
-function uploadFileCallback(result) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", result.id);
-    inEiInfo.set("result-0-docId", result.docId);
-    inEiInfo.set("result-0-docName", result.docName);
-    EiCommunicator.send('HGCW004', 'updateDocId', inEiInfo, {
-        onSuccess(ei) {
-            if (ei.status == "-1") {
-                NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
-            } else {
-                NotificationUtil(ei.msg);
-                query();
-            }
-        },
-        onFail(errorMessage, status, e) {
-            NotificationUtil("执行失败！", "error");
-        }
-    }, {
-        async: false
-    });
-}
 
-function loadChange(grid,e,field) {
-    var cell_label = field,that = grid;
-    // locked 表示是否为固定列
-    var locked = that.isCellLocked(cell_label);
-    // tr 表示 locked 和非 locked 的行,index 表示此行的第几列
-    var tr,index;
-    // 获取此 model 元素信息
-    var item = e.items[0];
-    var _uid = item.uid;
-    if (locked) {
-        tr = $(".k-grid-content-locked tr[data-uid="+ _uid +"]");
-        index = $("th[data-field='"+cell_label+"']").data("index");
-    } else {
-        tr = $(".k-grid-content tr[data-uid="+ _uid +"]");
-        index = parseInt($("th[data-field='"+cell_label+"']").data("index")) - that.lockedHeader.find("th").length;
-    }
-    // 获取子 cell(td)
-    var td = tr.children("td:eq("+index+")");
-    // 触发 td.click 事件，
-    td.trigger("click");
+function fileDetailFunc(id) {
+    JSColorbox.open({
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=QZ&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW004",
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
 }
-

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

@@ -23,7 +23,7 @@ $(function() {
                 let template = '';
                 if (item.id) {
                     template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                        + 'onclick="uploadFile(' + item.id + ')"  >附件上传</a>';
+                        + 'onclick="fileDetailFunc(' + item.id + ')"  >附件上传</a>';
                 }
 
                 return template;
@@ -35,7 +35,7 @@ $(function() {
             query: function (container, params) {
                 var queryInfo = new EiInfo();
                 // info.set("reviewStatus","3")
-                queryInfo.set("contractType","2")
+                queryInfo.set("contractTyps","2,4")
                 return queryInfo;
             },
             init: function (e, options) {
@@ -104,39 +104,7 @@ function saveFunc() {
         return;
     }
     let flag = true;
-    // $.each(rows, function(index, item) {
-    //     let companyCode= item.get("companyCode");
-    //     let accountYear= item.get("accountYear");
-    //     let accountPeriod= item.get("accountPeriod");
-    //     let accountPeriodDateStart= item.get("accountPeriodStatus");
-    //     let accountPeriodDateEnd= item.get("accountPeriodStatus");
-    //
-    //     if(isBlank(companyCode)){
-    //         message("选中的第"+(index+1)+"行\"公司名称\"，不能为空!");
-    //         flag = false;
-    //         return false;
-    //     }
-    //     if(isBlank(accountYear)){
-    //         message("选中的第"+(index+1)+"行\"会计年度\"，不能为空!");
-    //         flag = false;
-    //         return false;
-    //     }
-    //     if(isBlank(accountPeriod)){
-    //         message("选中的第"+(index+1)+"行\"会计期\"，不能为空!");
-    //         flag = false;
-    //         return false;
-    //     }
-    //     if(isBlank(accountPeriodDateStart)){
-    //         message("选中的第"+(index+1)+"行\"账期开始日期\"，不能为空!");
-    //         flag = false;
-    //         return false;
-    //     }
-    //     if(isBlank(accountPeriodDateEnd)){
-    //         message("选中的第"+(index+1)+"行\"账期结束日期\"，不能为空!");
-    //         flag = false;
-    //         return false;
-    //     }
-    // });
+
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
@@ -220,70 +188,6 @@ function updateStatus(id,deviceStatus) {
         }
     );
 }
-/**
- * 文件上传
- *
- * @param id
- */
-function uploadFile(id) {
-    JSColorbox.open({
-        href: "HGCW005A?methodName=initLoad&inqu_status-0-id="+id,
-        title: "<div style='text-align: center;'>附件上传</div>",
-        width: "60%",
-        height: "50%",
-        callbackName: uploadFileCallback
-    });
-}
-
-/**
- * 附件上传回调
- *
- * @param docId
- */
-function uploadFileCallback(result) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", result.id);
-    inEiInfo.set("result-0-docId", result.docId);
-    inEiInfo.set("result-0-docName", result.docName);
-    EiCommunicator.send('HGCW005', 'updateDocId', inEiInfo, {
-        onSuccess(ei) {
-            if (ei.status == "-1") {
-                NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
-            } else {
-                NotificationUtil(ei.msg);
-                query();
-            }
-        },
-        onFail(errorMessage, status, e) {
-            NotificationUtil("执行失败！", "error");
-        }
-    }, {
-        async: false
-    });
-}
-
-function loadChange(grid,e,field) {
-    var cell_label = field,that = grid;
-    // locked 表示是否为固定列
-    var locked = that.isCellLocked(cell_label);
-    // tr 表示 locked 和非 locked 的行,index 表示此行的第几列
-    var tr,index;
-    // 获取此 model 元素信息
-    var item = e.items[0];
-    var _uid = item.uid;
-    if (locked) {
-        tr = $(".k-grid-content-locked tr[data-uid="+ _uid +"]");
-        index = $("th[data-field='"+cell_label+"']").data("index");
-    } else {
-        tr = $(".k-grid-content tr[data-uid="+ _uid +"]");
-        index = parseInt($("th[data-field='"+cell_label+"']").data("index")) - that.lockedHeader.find("th").length;
-    }
-    // 获取子 cell(td)
-    var td = tr.children("td:eq("+index+")");
-    // 触发 td.click 事件，
-    td.trigger("click");
-}
-
 function submitFunc() {
     let rows = resultGrid.getCheckedRows();
     if (rows.length != 1) {
@@ -331,3 +235,11 @@ function submitFunc() {
     }
 }
 
+function fileDetailFunc(id) {
+    JSColorbox.open({
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=KK&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW005",
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
\ No newline at end of file

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

+
+$(function() {
+
+    // 查询
+    $("#QUERY").on("click", function () {
+        query();
+    });
+
+
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [{
+            field: "operator",
+            template: function (item) {
+                let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                    + 'onclick="contractDetailFunc(' + item.id + ')">结算单详情</a>';
+                return template;
+            }
+        }
+        ],
+        loadComplete: function (e) {
+            $("#BTN_INSERT").on("click",addFunc);
+            $("#BTN_UPDATE").on("click",updateFunc);
+            $("#BTN_SUBMIT").on("click",submitFunc);
+
+        },
+        onSuccess: function (e) {
+            if (e.eiInfo.extAttr.methodName == 'save' || e.eiInfo.extAttr.methodName == 'delete') {
+                query();
+            }
+        },
+    }
+
+
+    window.document.addEventListener("keyup",function (event) {
+        if(event.keyCode === 13){
+            var grid = $("#ef_grid_result").data("kendoGrid");
+            // 回填
+            //grid.addRows(returnRows);
+            grid.closeCell();
+        }
+    })
+});
+
+$(window).load(function () {
+    // 查
+    query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
+
+/**
+ * 新增
+ */
+function addFunc() {
+    JSColorbox.open({
+        href: "HGCW008A?methodName=initLoad&efParentFormEname=HGCW008",
+        title: "<div style='text-align: center;'>新增结算单</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+/**
+ * 修改
+ */
+function updateFunc() {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length != 1) {
+        message("请选择一条数据");
+        return;
+    }
+    JSColorbox.open({
+        href: "HGCW008B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW008",
+        title: "<div style='text-align: center;'>修改结算单</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+
+function windowCallback() {
+    // 刷新列表
+    resultGrid.dataSource.page(1);
+    // 关闭弹窗
+    JSColorbox.close();
+}
+
+function contractDetailFunc(id) {
+    JSColorbox.open({
+        href: "HGCW008C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW008",
+        title: "<div style='text-align: center;'>结算单详情</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+
+function submitFunc() {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length != 1) {
+        message("请选择一条数据");
+        return;
+    }
+    var flag = true;
+    rows.forEach(function (row) {
+        if (row.reviewStatus == "3") {
+            message("勾选的数据中有已经提交的结算单！");
+            flag = false;
+        }
+    })
+
+    if (flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
+            ok: function () {
+                var info = new EiInfo();
+                info.addBlock(JSUtils.checkedRows2Block("result"));
+                EiCommunicator.send("HGCW008", "submit", info, {
+                    onSuccess: function (ei) {
+                        if (ei.getStatus() >= 0) {
+                            try {
+                                query();
+                            } catch (e) {
+                                // TODO: handle exception
+                            }
+                            if (ei.getStatus() == 0) {
+                                NotificationUtil(ei, 'warning');
+                            } else {
+                                NotificationUtil(ei);
+                            }
+                        } else {
+                            NotificationUtil(ei, "error");
+                        }
+                    },
+                    onFail: function (ei) {
+                        // 发生异常
+                        NotificationUtil("操作失败，原因[" + ei + "]", "error");
+                    }
+                });
+            }
+        });
+
+    }
+}
+
+

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="合同管理">
+
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFSelect cname="所属公司" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFDateSpan startCname="结算日期(从)" endCname="至" blockId="inqu_status"
+                           startName="contractDateFrom" endName="contractDateTo" row="0" role="date"
+                           format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+            </EF:EFDateSpan>
+            <EF:EFInput cname="结算编号" ename="settlementNumber" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFSelect cname="结算类别" ename="inqu_status-0-settlementType" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.settlementType"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+            </EF:EFSelect>
+        </div>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="记录集">
+        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="200" align="center"/>
+            <EF:EFColumn ename="companyName" cname="所属公司" align="center" enable="false"/>
+            <EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false"/>
+            <EF:EFColumn ename="projName" cname="项目名称" align="center" enable="false"/>
+            <EF:EFColumn ename="contractNumber" cname="合同号" align="center" enable="false"/>
+            <EF:EFColumn ename="contractName" cname="合同名称" align="center" enable="false"/>
+            <EF:EFColumn ename="settlementNumber" cname="结算编号" align="center" enable="false"/>
+            <EF:EFComboColumn ename="settlementType" cname="结算类别" width="100" align="center"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+                <EF:EFCodeOption codeName="hggp.cw.settlementType"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="thisSettlementAmount" cname="本次结算金额" align="center" enable="false"/>
+            <EF:EFColumn ename="thisSettlementTax" cname="本次结算税金" align="center" enable="false"/>
+            <EF:EFColumn ename="contractDate" cname="结算日期" align="center" enable="false"/>
+            <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+            </EF:EFComboColumn>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW008.js"></script>
\ No newline at end of file

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="新增结算单">
+    <EF:EFRegion id="inqu1" title="基本信息">
+        <div class="row">
+            <EF:EFPopupInput ename="popupInputProjCode" cname="项目编号" colWidth="4"
+                             serviceName="HGCW002" methodName="queryContractByType"
+                             resultId="contract_combo_box"
+                             save="false" popupType="ServiceGrid"
+                             valueField="projCode" textField="projCode"
+                             columnEnames="projCode,projName,contractNumber,contractName,totalContractPriceExcluding"
+                             columnCnames="项目编码,项目名称,合同号,合同名称,合同总价"
+                             backFillColumnIds="projCode,projName,contractNumber,contractName,totalContractPriceExcluding,contractType"
+                             backFillFieldIds="result-0-projCode,result-0-projName,result-0-contractNumber,result-0-contractName,result-0-totalContractPrice,contractType"
+                             readonly="true" required="true"
+                             resizable="true" popupTitle="项目信息" popupWidth="800">
+            </EF:EFPopupInput>
+            <EF:EFInput ename="result-0-projCode" cname="项目编号" type="hidden"/>
+            <EF:EFInput ename="result-0-projName" cname="项目简称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
+            <EF:EFInput ename="contractType" cname="合同类型" type="hidden"/>
+
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-settlementNumber" cname="结算编号" colWidth="4" readonly="true"/>
+
+            <EF:EFSelect cname="结算类别" ename="result-0-settlementType" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.settlementType"/>
+            </EF:EFSelect>
+        </div>
+        <div class="row">
+            <EF:EFSelect cname="税点" ename="result-0-taxPoints" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="价税分离" ename="result-0-priceTaxSeparation" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.priceTaxSeparation"/>
+            </EF:EFSelect>
+            <EF:EFDatePicker cname="结算日期" ename="result-0-contractDate" colWidth="4"
+                             format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-thisSettlementAmount" cname="本次结算金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-thisSettlementTax" cname="本次结算税金（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-thisPriceTax" cname="本次结算价税合计金额（元）" colWidth="4" readonly="true"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-totalContractPrice" cname="合同金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-cumulativeSettlementAmount" cname="累计结算金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-cumulativeSettlementTax" cname="累计结算税金（元）" colWidth="4" readonly="true"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-cumulativePriceTax" 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"/>
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="settlementBasis" cname="结算依据"  align="center" />
+            <EF:EFColumn ename="taskName" cname="任务名称"  align="center" />
+            <EF:EFColumn ename="engineeringContent" cname="工程内容"  align="center" />
+            <EF:EFColumn ename="thisEngineeringQuantity" cname="本次结算工程量"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量"  format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="unit" cname="单位"  align="center" />
+            <EF:EFColumn ename="unitPrice" cname="单价" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalPrice" cname="合价" enable="false" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="remarks" cname="备注"  align="center" />
+            <EF:EFColumn ename="inventoryId" cname="清单id" hidden="true"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <div class="row" style="display:flex;justify-content:center;">
+        <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-center"/>
+        <EF:EFButton ename="btn_save"  cname="保存" type="button" class="btn-center"/>
+    </div>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW008A.js"></script>
\ No newline at end of file

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="修改结算单">
+    <EF:EFRegion id="inqu1" title="基本信息">
+        <div class="row">
+            <EF:EFPopupInput ename="popupInputProjCode" cname="项目编号" colWidth="4"
+                             serviceName="HGCW002" methodName="queryContractByType"
+                             resultId="contract_combo_box"
+                             save="false" popupType="ServiceGrid"
+                             valueField="projCode" textField="projCode"
+                             columnEnames="projCode,projName,contractNumber,contractName,totalContractPriceExcluding"
+                             columnCnames="项目编码,项目名称,合同号,合同名称,合同总价"
+                             backFillColumnIds="projCode,projName,contractNumber,contractName,totalContractPriceExcluding,contractType"
+                             backFillFieldIds="result-0-projCode,result-0-projName,result-0-contractNumber,result-0-contractName,result-0-totalContractPrice,contractType"
+                             readonly="true" required="true"
+                             resizable="true" popupTitle="项目信息" popupWidth="800">
+            </EF:EFPopupInput>
+            <EF:EFInput ename="result-0-projCode" cname="项目编号" type="hidden"/>
+            <EF:EFInput ename="result-0-projName" cname="项目简称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
+            <EF:EFInput ename="contractType" cname="合同类型" type="hidden"/>
+
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-settlementNumber" cname="结算编号" colWidth="4" readonly="true"/>
+
+            <EF:EFSelect cname="结算类别" ename="result-0-settlementType" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.settlementType"/>
+            </EF:EFSelect>
+        </div>
+        <div class="row">
+            <EF:EFSelect cname="税点" ename="result-0-taxPoints" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="价税分离" ename="result-0-priceTaxSeparation" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.priceTaxSeparation"/>
+            </EF:EFSelect>
+            <EF:EFDatePicker cname="结算日期" ename="result-0-contractDate" colWidth="4"
+                             format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-thisSettlementAmount" cname="本次结算金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-thisSettlementTax" cname="本次结算税金（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-thisPriceTax" cname="本次结算价税合计金额（元）" colWidth="4" readonly="true"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-totalContractPrice" cname="合同金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-cumulativeSettlementAmount" cname="累计结算金额（元）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-cumulativeSettlementTax" cname="累计结算税金（元）" colWidth="4" readonly="true"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-cumulativePriceTax" 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"/>
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="settlementBasis" cname="结算依据"  align="center" />
+            <EF:EFColumn ename="taskName" cname="任务名称"  align="center" />
+            <EF:EFColumn ename="engineeringContent" cname="工程内容"  align="center" />
+            <EF:EFColumn ename="thisEngineeringQuantity" cname="本次结算工程量"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="cumulativeEngineeringQuantity" cname="至本次累计结算工程量"  format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="unit" cname="单位"  align="center" />
+            <EF:EFColumn ename="unitPrice" cname="单价" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalPrice" cname="合价" enable="false" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="remarks" cname="备注"  align="center" />
+            <EF:EFColumn ename="inventoryId" cname="清单id" hidden="true"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+
+    <div class="row" style="display:flex;justify-content:center;">
+        <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-center"/>
+        <EF:EFButton ename="btn_save"  cname="保存" type="button" class="btn-center"/>
+    </div>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW008B.js"></script>
\ No newline at end of file

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

+$(function () {
+
+    IPLATUI.EFGrid = {
+        "result": {
+            toolbarConfig: {
+                hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
+            },
+            columns: []
+        }
+    }
+
+
+    /**
+     * 取消
+     */
+    $('#cancel').on('click', function () {
+        // 关闭弹窗
+        parent.JSColorbox.close();
+    })
+
+    /**
+     * 确认
+     */
+    $('#confirm').on('click', function () {
+        let allRows = new Array();
+        allRows = resultGrid.getCheckedRows();
+        if (allRows.length > 0) {
+            parent.JSColorbox.setValueCallback(allRows);
+
+        } else {
+            message("请选择至少一条合同清单！");
+            return;
+        }
+    })
+
+});
+
+
+/**
+ * 查询
+ */
+function query() {
+    resultGrid.dataSource.page(1);
+}
+
+$(window).load(function () {
+    // 查
+    query();
+});
+
+

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="合同清单">
+	<EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" />
+	<EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" />
+	<EF:EFRegion id="result" title="合同清单">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="inventory" cname="清单"  align="center" enable="false"/>
+			<EF:EFColumn ename="unit" cname="单位"  align="center" enable="false"/>
+			<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="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N3}" align="center"/>
+			<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N3}" align="center"/>
+			<EF:EFColumn ename="laborCosts" cname="其中人工费、元"  format="{0:N3}" align="center" enable="false"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+	<div class="row">
+		<EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-align-right"/>
+		<EF:EFButton ename="confirm"  cname="确认" type="button" class="btn-align-right"/>
+	</div>
+</EF:EFPage>
+

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

+$(function () {
+
+    IPLATUI.EFGrid = {
+        "result": {
+            toolbarConfig: {
+                hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
+            },
+            columns: []
+        }
+    }
+
+
+    /**
+     * 取消
+     */
+    $('#cancel').on('click', function () {
+        // 关闭弹窗
+        parent.JSColorbox.close();
+    })
+
+    /**
+     * 确认
+     */
+    $('#confirm').on('click', function () {
+        let allRows = new Array();
+        allRows = resultGrid.getCheckedRows();
+        if (allRows.length > 0) {
+            parent.JSColorbox.setValueCallback(allRows);
+
+        } else {
+            message("请选择至少一条合同清单！");
+            return;
+        }
+    })
+
+});
+
+
+/**
+ * 查询
+ */
+function query() {
+    resultGrid.dataSource.page(1);
+}
+
+$(window).load(function () {
+    // 查
+    query();
+});
+
+

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="合同清单">
+	<EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" />
+	<EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" />
+	<EF:EFInput cname="DIDS" ename="deductionIds" blockId="inqu_status" row="0" type="hidden" />
+	<EF:EFRegion id="result1" title="合同清单">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="inventory" cname="清单"  align="center" enable="false"/>
+			<EF:EFColumn ename="unit" cname="单位"  align="center" enable="false"/>
+			<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="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N3}" align="center"/>
+			<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N3}" align="center"/>
+			<EF:EFColumn ename="laborCosts" cname="其中人工费、元"  format="{0:N3}" align="center" enable="false"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+	<EF:EFRegion id="result2" title="扣款单">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+			<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="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="signingDate" cname="扣款日期" align="center" enable="false"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+	<div class="row">
+		<EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-align-right"/>
+		<EF:EFButton ename="confirm"  cname="确认" type="button" class="btn-align-right"/>
+	</div>
+</EF:EFPage>
+