结算单管理-增加收款付款剩余金额

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

@@ -42,6 +42,7 @@ public class HGCW008 extends DaoEPBase {
 	public static final String FIELD_CUMULATIVE_SETTLEMENT_AMOUNT = "cumulativeSettlementAmount";    		/* 累计结算金额*/
 	public static final String FIELD_CUMULATIVE_SETTLEMENT_TAX = "cumulativeSettlementTax";    		/* 累计结算税金*/
 	public static final String FIELD_CUMULATIVE_PRICE_TAX = "cumulativePriceTax";    		/* 累计结算价税合计金额*/
+	public static final String FIELD_REMAINING_AMOUNT = "remainingAmount";    		/* 累计结算价税合计金额*/
 	public static final String FIELD_REVIEW_STATUS = "reviewStatus";    		/* 审核状态*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 记录创建者*/
 	public static final String FIELD_CREATED_NAME = "createdName";    		/* 记录创建名称*/
@@ -71,6 +72,9 @@ public class HGCW008 extends DaoEPBase {
 	public static final String COL_CUMULATIVE_SETTLEMENT_AMOUNT = "CUMULATIVE_SETTLEMENT_AMOUNT";    		/* 累计结算金额*/
 	public static final String COL_CUMULATIVE_SETTLEMENT_TAX = "CUMULATIVE_SETTLEMENT_TAX";    		/* 累计结算税金*/
 	public static final String COL_CUMULATIVE_PRICE_TAX = "CUMULATIVE_PRICE_TAX";    		/* 累计结算价税合计金额*/
+
+	public static final String COL_REMAINING_AMOUNT = "REMAINING_AMOUNT";    		/* 累计结算价税合计金额*/
+
 	public static final String COL_REVIEW_STATUS = "REVIEW_STATUS";    		/* 审核状态*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 记录创建者*/
 	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 记录创建名称*/
@@ -106,6 +110,7 @@ public class HGCW008 extends DaoEPBase {
 	private BigDecimal cumulativeSettlementAmount = new BigDecimal("0");		/* 累计结算金额*/
 	private BigDecimal cumulativeSettlementTax = new BigDecimal("0");		/* 累计结算税金*/
 	private BigDecimal cumulativePriceTax = new BigDecimal("0");		/* 累计结算价税合计金额*/
+	private BigDecimal remainingAmount = new BigDecimal("0");		/* 累计结算价税合计金额*/
 	private Integer reviewStatus;	/* 审核状态*/
 	private String createdBy = " ";		/* 记录创建者*/
 	private String createdName = " ";		/* 记录创建名称*/
@@ -223,6 +228,13 @@ public class HGCW008 extends DaoEPBase {
 		eiColumn.setDescName("累计结算价税合计金额");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("剩余开票/收票金额");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_REVIEW_STATUS);
 		eiColumn.setDescName("审核状态");
 		eiMetadata.addMeta(eiColumn);
@@ -713,6 +725,14 @@ public class HGCW008 extends DaoEPBase {
 	public void setDepCode(String depCode) {
 		this.depCode = depCode;
 	}
+
+	public BigDecimal getRemainingAmount() {
+		return remainingAmount;
+	}
+
+	public void setRemainingAmount(BigDecimal remainingAmount) {
+		this.remainingAmount = remainingAmount;
+	}
 	/**
 	 * get the value from Map.
 	 *
@@ -741,6 +761,7 @@ public class HGCW008 extends DaoEPBase {
 		setCumulativeSettlementAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CUMULATIVE_SETTLEMENT_AMOUNT)), cumulativeSettlementAmount));
 		setCumulativeSettlementTax(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CUMULATIVE_SETTLEMENT_TAX)), cumulativeSettlementTax));
 		setCumulativePriceTax(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CUMULATIVE_PRICE_TAX)), cumulativePriceTax));
+		setRemainingAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_AMOUNT)), remainingAmount));
 		setReviewStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
 		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
@@ -778,6 +799,7 @@ public class HGCW008 extends DaoEPBase {
 		map.put(FIELD_CUMULATIVE_SETTLEMENT_AMOUNT, StringUtils.toString(cumulativeSettlementAmount, eiMetadata.getMeta(FIELD_CUMULATIVE_SETTLEMENT_AMOUNT)));
 		map.put(FIELD_CUMULATIVE_SETTLEMENT_TAX, StringUtils.toString(cumulativeSettlementTax, eiMetadata.getMeta(FIELD_CUMULATIVE_SETTLEMENT_TAX)));
 		map.put(FIELD_CUMULATIVE_PRICE_TAX, StringUtils.toString(cumulativePriceTax, eiMetadata.getMeta(FIELD_CUMULATIVE_PRICE_TAX)));
+		map.put(FIELD_REMAINING_AMOUNT, StringUtils.toString(remainingAmount, eiMetadata.getMeta(FIELD_REMAINING_AMOUNT)));
 		map.put(FIELD_REVIEW_STATUS, StringUtils.toString(reviewStatus, eiMetadata.getMeta(FIELD_REVIEW_STATUS)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
 		map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
@@ -789,4 +811,6 @@ public class HGCW008 extends DaoEPBase {
 
 		return map;
 	}
+
+
 }

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

 package com.baosight.hggp.hg.cw.domain;
 
-
 import com.baosight.iplat4j.core.util.NumberUtils;
 import java.math.BigDecimal;
 import com.baosight.iplat4j.core.ei.EiColumn;
@@ -17,9 +16,8 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-23 9:08:57 create
+ * @history 2024-05-27 16:53:39 create
  */
-
 public class HGCW012 extends DaoEPBase {
 
 	private static final long serialVersionUID = 1L;
@@ -28,18 +26,16 @@ public class HGCW012 extends DaoEPBase {
 	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 公司编码*/
 	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
-	public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
-	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编号*/
 	public static final String FIELD_SETTLEMENT_NUMBER = "settlementNumber";    		/* 来源单号*/
 	public static final String FIELD_BILL_TYBE = "billTybe";    		/* 票据类型*/
 	public static final String FIELD_BILL_NUMBER = "billNumber";    		/* 发票号*/
 	public static final String FIELD_BILL_STATE = "billState";    		/* 开票状态*/
 	public static final String FIELD_SIGNING_DATE = "signingDate";    		/* 开票日期*/
-	public static final String FIELD_PARTY_A = "partyA";    		/* 客户名称*/
+	public static final String FIELD_PARTY_A = "partyA";    		/* 供应商名称*/
 	public static final String FIELD_REVIEW_STATUS = "reviewStatus";    		/* 审批状态*/
+	public static final String FIELD_TAX_POINTS = "taxPoints";    		/* 税率*/
 	public static final String FIELD_THIS_SETTLEMENT_TAX = "thisSettlementTax";    		/* 税额*/
 	public static final String FIELD_THIS_SETTLEMENT_AMOUNT = "thisSettlementAmount";    		/* 不含税金额*/
-	public static final String FIELD_TAX_POINTS = "taxPoints";    		/* 税率*/
 	public static final String FIELD_TOTAL_CONTRACT_PRICE_INCLUDING = "totalContractPriceIncluding";    		/* 开票总额*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 记录创建者*/
 	public static final String FIELD_CREATED_NAME = "createdName";    		/* 记录创建名称*/
@@ -53,18 +49,16 @@ public class HGCW012 extends DaoEPBase {
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 公司编码*/
 	public static final String COL_COMPANY_NAME = "COMPANY_NAME";    		/* 公司名称*/
-	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
-	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编号*/
 	public static final String COL_SETTLEMENT_NUMBER = "SETTLEMENT_NUMBER";    		/* 来源单号*/
 	public static final String COL_BILL_TYBE = "BILL_TYBE";    		/* 票据类型*/
 	public static final String COL_BILL_NUMBER = "BILL_NUMBER";    		/* 发票号*/
 	public static final String COL_BILL_STATE = "BILL_STATE";    		/* 开票状态*/
 	public static final String COL_SIGNING_DATE = "SIGNING_DATE";    		/* 开票日期*/
-	public static final String COL_PARTY_A = "PARTY_A";    		/* 客户名称*/
+	public static final String COL_PARTY_A = "PARTY_A";    		/* 供应商名称*/
 	public static final String COL_REVIEW_STATUS = "REVIEW_STATUS";    		/* 审批状态*/
+	public static final String COL_TAX_POINTS = "TAX_POINTS";    		/* 税率*/
 	public static final String COL_THIS_SETTLEMENT_TAX = "THIS_SETTLEMENT_TAX";    		/* 税额*/
 	public static final String COL_THIS_SETTLEMENT_AMOUNT = "THIS_SETTLEMENT_AMOUNT";    		/* 不含税金额*/
-	public static final String COL_TAX_POINTS = "TAX_POINTS";    		/* 税率*/
 	public static final String COL_TOTAL_CONTRACT_PRICE_INCLUDING = "TOTAL_CONTRACT_PRICE_INCLUDING";    		/* 开票总额*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 记录创建者*/
 	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 记录创建名称*/
@@ -78,27 +72,22 @@ public class HGCW012 extends DaoEPBase {
 	public static final String COUNT = "HGCW012.count";
 	public static final String INSERT = "HGCW012.insert";
 	public static final String UPDATE = "HGCW012.update";
-	public static final String UPDATE_STATUS = "HGCW012.updateStatus";
-	public static final String UPDATE_DOC_ID = "HGCW012.updateDocId";
 	public static final String DELETE = "HGCW012.delete";
-	public static final String DELETE_FLAG = "HGCW012.deleteFlag";
 
 	private Long id = new Long(0);
 	private String accountCode = " ";		/* 企业编码*/
 	private String companyCode = " ";		/* 公司编码*/
 	private String companyName = " ";		/* 公司名称*/
-	private String projName = " ";		/* 项目名称*/
-	private String projCode = " ";		/* 项目编号*/
 	private String settlementNumber = " ";		/* 来源单号*/
-	private String billTybe = " ";		/* 票据类型*/
+	private Integer billTybe = new Integer(0);		/* 票据类型*/
 	private String billNumber = " ";		/* 发票号*/
-	private String billState = " ";		/* 开票状态*/
+	private Integer billState = new Integer(0);		/* 开票状态*/
 	private String signingDate = " ";		/* 开票日期*/
-	private String partyA = " ";		/* 客户名称*/
+	private String partyA = " ";		/* 供应商名称*/
 	private Boolean reviewStatus;	/* 审批状态*/
+	private Integer taxPoints = new Integer(0);		/* 税率*/
 	private String thisSettlementTax = " ";		/* 税额*/
 	private String thisSettlementAmount = " ";		/* 不含税金额*/
-	private String taxPoints = " ";		/* 税率*/
 	private BigDecimal totalContractPriceIncluding = new BigDecimal("0");		/* 开票总额*/
 	private String createdBy = " ";		/* 记录创建者*/
 	private String createdName = " ";		/* 记录创建名称*/
@@ -131,14 +120,6 @@ public class HGCW012 extends DaoEPBase {
 		eiColumn.setDescName("公司名称");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_PROJ_NAME);
-		eiColumn.setDescName("项目名称");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_PROJ_CODE);
-		eiColumn.setDescName("项目编号");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_SETTLEMENT_NUMBER);
 		eiColumn.setDescName("来源单号");
 		eiMetadata.addMeta(eiColumn);
@@ -160,13 +141,18 @@ public class HGCW012 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_PARTY_A);
-		eiColumn.setDescName("客户名称");
+		eiColumn.setDescName("供应商名称");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_REVIEW_STATUS);
+		eiColumn.setPrimaryKey(true);
 		eiColumn.setDescName("审批状态");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_TAX_POINTS);
+		eiColumn.setDescName("税率");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX);
 		eiColumn.setDescName("税额");
 		eiMetadata.addMeta(eiColumn);
@@ -175,10 +161,6 @@ public class HGCW012 extends DaoEPBase {
 		eiColumn.setDescName("不含税金额");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_TAX_POINTS);
-		eiColumn.setDescName("税率");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -289,38 +271,6 @@ public class HGCW012 extends DaoEPBase {
 		this.companyName = companyName;
 	}
 	/**
-	 * get the projName - 项目名称.
-	 * @return the projName
-	 */
-	public String getProjName() {
-		return this.projName;
-	}
-
-	/**
-	 * set the projName - 项目名称.
-	 *
-	 * @param projName - 项目名称
-	 */
-	public void setProjName(String projName) {
-		this.projName = projName;
-	}
-	/**
-	 * get the projCode - 项目编号.
-	 * @return the projCode
-	 */
-	public String getProjCode() {
-		return this.projCode;
-	}
-
-	/**
-	 * set the projCode - 项目编号.
-	 *
-	 * @param projCode - 项目编号
-	 */
-	public void setProjCode(String projCode) {
-		this.projCode = projCode;
-	}
-	/**
 	 * get the settlementNumber - 来源单号.
 	 * @return the settlementNumber
 	 */
@@ -340,7 +290,7 @@ public class HGCW012 extends DaoEPBase {
 	 * get the billTybe - 票据类型.
 	 * @return the billTybe
 	 */
-	public String getBillTybe() {
+	public Integer getBillTybe() {
 		return this.billTybe;
 	}
 
@@ -349,7 +299,7 @@ public class HGCW012 extends DaoEPBase {
 	 *
 	 * @param billTybe - 票据类型
 	 */
-	public void setBillTybe(String billTybe) {
+	public void setBillTybe(Integer billTybe) {
 		this.billTybe = billTybe;
 	}
 	/**
@@ -372,7 +322,7 @@ public class HGCW012 extends DaoEPBase {
 	 * get the billState - 开票状态.
 	 * @return the billState
 	 */
-	public String getBillState() {
+	public Integer getBillState() {
 		return this.billState;
 	}
 
@@ -381,7 +331,7 @@ public class HGCW012 extends DaoEPBase {
 	 *
 	 * @param billState - 开票状态
 	 */
-	public void setBillState(String billState) {
+	public void setBillState(Integer billState) {
 		this.billState = billState;
 	}
 	/**
@@ -401,7 +351,7 @@ public class HGCW012 extends DaoEPBase {
 		this.signingDate = signingDate;
 	}
 	/**
-	 * get the partyA - 客户名称.
+	 * get the partyA - 供应商名称.
 	 * @return the partyA
 	 */
 	public String getPartyA() {
@@ -409,9 +359,9 @@ public class HGCW012 extends DaoEPBase {
 	}
 
 	/**
-	 * set the partyA - 客户名称.
+	 * set the partyA - 供应商名称.
 	 *
-	 * @param partyA - 客户名称
+	 * @param partyA - 供应商名称
 	 */
 	public void setPartyA(String partyA) {
 		this.partyA = partyA;
@@ -433,6 +383,22 @@ public class HGCW012 extends DaoEPBase {
 		this.reviewStatus = reviewStatus;
 	}
 	/**
+	 * get the taxPoints - 税率.
+	 * @return the taxPoints
+	 */
+	public Integer getTaxPoints() {
+		return this.taxPoints;
+	}
+
+	/**
+	 * set the taxPoints - 税率.
+	 *
+	 * @param taxPoints - 税率
+	 */
+	public void setTaxPoints(Integer taxPoints) {
+		this.taxPoints = taxPoints;
+	}
+	/**
 	 * get the thisSettlementTax - 税额.
 	 * @return the thisSettlementTax
 	 */
@@ -465,22 +431,6 @@ public class HGCW012 extends DaoEPBase {
 		this.thisSettlementAmount = thisSettlementAmount;
 	}
 	/**
-	 * get the taxPoints - 税率.
-	 * @return the taxPoints
-	 */
-	public String getTaxPoints() {
-		return this.taxPoints;
-	}
-
-	/**
-	 * set the taxPoints - 税率.
-	 *
-	 * @param taxPoints - 税率
-	 */
-	public void setTaxPoints(String taxPoints) {
-		this.taxPoints = taxPoints;
-	}
-	/**
 	 * get the totalContractPriceIncluding - 开票总额.
 	 * @return the totalContractPriceIncluding
 	 */
@@ -620,18 +570,16 @@ public class HGCW012 extends DaoEPBase {
 		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
-		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
-		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 		setSettlementNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SETTLEMENT_NUMBER)), settlementNumber));
-		setBillTybe(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_TYBE)), billTybe));
+		setBillTybe(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_BILL_TYBE)), billTybe));
 		setBillNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_NUMBER)), billNumber));
-		setBillState(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_STATE)), billState));
+		setBillState(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_BILL_STATE)), billState));
 		setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
 		setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
 		setReviewStatus(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
+		setTaxPoints(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
 		setThisSettlementTax(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_TAX)), thisSettlementTax));
 		setThisSettlementAmount(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_AMOUNT)), thisSettlementAmount));
-		setTaxPoints(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
 		setTotalContractPriceIncluding(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)), totalContractPriceIncluding));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
 		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
@@ -653,8 +601,6 @@ public class HGCW012 extends DaoEPBase {
 		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
 		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
-		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
-		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
 		map.put(FIELD_SETTLEMENT_NUMBER, StringUtils.toString(settlementNumber, eiMetadata.getMeta(FIELD_SETTLEMENT_NUMBER)));
 		map.put(FIELD_BILL_TYBE, StringUtils.toString(billTybe, eiMetadata.getMeta(FIELD_BILL_TYBE)));
 		map.put(FIELD_BILL_NUMBER, StringUtils.toString(billNumber, eiMetadata.getMeta(FIELD_BILL_NUMBER)));
@@ -662,9 +608,9 @@ public class HGCW012 extends DaoEPBase {
 		map.put(FIELD_SIGNING_DATE, StringUtils.toString(signingDate, eiMetadata.getMeta(FIELD_SIGNING_DATE)));
 		map.put(FIELD_PARTY_A, StringUtils.toString(partyA, eiMetadata.getMeta(FIELD_PARTY_A)));
 		map.put(FIELD_REVIEW_STATUS, StringUtils.toString(reviewStatus, eiMetadata.getMeta(FIELD_REVIEW_STATUS)));
+		map.put(FIELD_TAX_POINTS, StringUtils.toString(taxPoints, eiMetadata.getMeta(FIELD_TAX_POINTS)));
 		map.put(FIELD_THIS_SETTLEMENT_TAX, StringUtils.toString(thisSettlementTax, eiMetadata.getMeta(FIELD_THIS_SETTLEMENT_TAX)));
 		map.put(FIELD_THIS_SETTLEMENT_AMOUNT, StringUtils.toString(thisSettlementAmount, eiMetadata.getMeta(FIELD_THIS_SETTLEMENT_AMOUNT)));
-		map.put(FIELD_TAX_POINTS, StringUtils.toString(taxPoints, eiMetadata.getMeta(FIELD_TAX_POINTS)));
 		map.put(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING, StringUtils.toString(totalContractPriceIncluding, eiMetadata.getMeta(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
 		map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));

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

@@ -88,6 +88,7 @@ public class ServiceHGCW008 extends ServiceBase {
 					HGCW008.setSettlementNumber(settlementNumber);
 					HGCW008.setReviewStatus(0);
 					HGCW008.setContractDate(DateUtils.formatShort(HGCW008.getContractDate()));
+					HGCW008.setRemainingAmount(HGCW008.getThisPriceTax());
 					this.add(HGCW008);
 					// 写入其他数据
 					HGCWTools.HgCw009.save(detail1Rows,settlementNumber,userVO);

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

@@ -152,6 +152,7 @@
 		CUMULATIVE_SETTLEMENT_AMOUNT	as "cumulativeSettlementAmount",  <!-- 累计结算金额 -->
 		CUMULATIVE_SETTLEMENT_TAX	as "cumulativeSettlementTax",  <!-- 累计结算税金 -->
 		CUMULATIVE_PRICE_TAX	as "cumulativePriceTax",  <!-- 累计结算价税合计金额 -->
+		REMAINING_AMOUNT	as "remainingAmount",  <!-- 累计结算价税合计金额 -->
 		REVIEW_STATUS	as "reviewStatus",  <!-- 审核状态 -->
 		CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
 		CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
@@ -286,6 +287,7 @@
 		CUMULATIVE_SETTLEMENT_AMOUNT,  <!-- 累计结算金额 -->
 		CUMULATIVE_SETTLEMENT_TAX,  <!-- 累计结算税金 -->
 		CUMULATIVE_PRICE_TAX,  <!-- 累计结算价税合计金额 -->
+		REMAINING_AMOUNT,  <!-- 累计结算价税合计金额 -->
 		REVIEW_STATUS,  <!-- 审核状态 -->
 		CREATED_BY,  <!-- 记录创建者 -->
 		CREATED_NAME,  <!-- 记录创建名称 -->
@@ -295,7 +297,7 @@
 		UPDATED_TIME,  <!-- 记录修改时间 -->
 		DEP_CODE  <!-- 部门编码 -->
 		)
-		VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projCode#, #projName#, #contractNumber#, #contractName#, #settlementNumber#, #settlementType#, #contractDate#, #taxPoints#, #priceTaxSeparation#, #thisSettlementAmount#, #thisSettlementTax#, #thisPriceTax#, #totalContractPrice#, #cumulativeSettlementAmount#, #cumulativeSettlementTax#, #cumulativePriceTax#, #reviewStatus#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
+		VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projCode#, #projName#, #contractNumber#, #contractName#, #settlementNumber#, #settlementType#, #contractDate#, #taxPoints#, #priceTaxSeparation#, #thisSettlementAmount#, #thisSettlementTax#, #thisPriceTax#, #totalContractPrice#, #cumulativeSettlementAmount#, #cumulativeSettlementTax#, #cumulativePriceTax#,#remainingAmount#, #reviewStatus#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
 		<selectKey resultClass="long" keyProperty="id">
 			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGCW008
 		</selectKey>
@@ -351,4 +353,16 @@
 		WHERE
 		ID = #id#
 	</update>
+
+
+	<update id="updateDeductionAmount">
+		UPDATE ${hggpSchema}.HGCW008
+		SET
+		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 审核状态 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		WHERE
+		ID = #id#
+	</update>
 </sqlMap>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-23 9:08:57
+		Generate time : 2024-05-27 16:53:39
    		Version :  1.0
 		schema : hggp
 		tableName : HGCW012
@@ -8,18 +8,16 @@
 		 ACCOUNT_CODE  VARCHAR, 
 		 COMPANY_CODE  VARCHAR, 
 		 COMPANY_NAME  VARCHAR, 
-		 PROJ_NAME  VARCHAR, 
-		 PROJ_CODE  VARCHAR, 
 		 SETTLEMENT_NUMBER  VARCHAR, 
-		 BILL_TYBE  VARCHAR, 
+		 BILL_TYBE  TINYINT, 
 		 BILL_NUMBER  VARCHAR, 
-		 BILL_STATE  VARCHAR, 
+		 BILL_STATE  TINYINT, 
 		 SIGNING_DATE  VARCHAR, 
 		 PARTY_A  VARCHAR, 
-		 REVIEW_STATUS  TINYINT, 
+		 REVIEW_STATUS  TINYINT   NOT NULL   primarykey, 
+		 TAX_POINTS  INTEGER, 
 		 THIS_SETTLEMENT_TAX  VARCHAR, 
 		 THIS_SETTLEMENT_AMOUNT  VARCHAR, 
-		 TAX_POINTS  VARCHAR, 
 		 TOTAL_CONTRACT_PRICE_INCLUDING  DECIMAL, 
 		 CREATED_BY  VARCHAR   NOT NULL, 
 		 CREATED_NAME  VARCHAR   NOT NULL, 
@@ -44,12 +42,6 @@
 		<isNotEmpty prepend=" AND " property="companyName">
 			COMPANY_NAME = #companyName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="settlementNumber">
 			SETTLEMENT_NUMBER = #settlementNumber#
 		</isNotEmpty>
@@ -71,15 +63,15 @@
 		<isNotEmpty prepend=" AND " property="reviewStatus">
 			REVIEW_STATUS = #reviewStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="taxPoints">
+			TAX_POINTS = #taxPoints#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="thisSettlementTax">
 			THIS_SETTLEMENT_TAX = #thisSettlementTax#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="thisSettlementAmount">
 			THIS_SETTLEMENT_AMOUNT = #thisSettlementAmount#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="taxPoints">
-			TAX_POINTS = #taxPoints#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="totalContractPriceIncluding">
 			TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#
 		</isNotEmpty>
@@ -109,38 +101,37 @@
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.cw.domain.HGCW012">
 		SELECT
-				ID	as "id",  
-				ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
-				COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
-				COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
-				PROJ_NAME	as "projName",  <!-- 项目名称 -->
-				PROJ_CODE	as "projCode",  <!-- 项目编号 -->
-				SETTLEMENT_NUMBER	as "settlementNumber",  <!-- 来源单号 -->
-				BILL_TYBE	as "billTybe",  <!-- 票据类型 -->
-				BILL_NUMBER	as "billNumber",  <!-- 发票号 -->
-				BILL_STATE	as "billState",  <!-- 开票状态 -->
-				SIGNING_DATE	as "signingDate",  <!-- 开票日期 -->
-				PARTY_A	as "partyA",  <!-- 客户名称 -->
-				REVIEW_STATUS	as "reviewStatus",  <!-- 审批状态 -->
-				THIS_SETTLEMENT_TAX	as "thisSettlementTax",  <!-- 税额 -->
-				THIS_SETTLEMENT_AMOUNT	as "thisSettlementAmount",  <!-- 不含税金额 -->
-				TAX_POINTS	as "taxPoints",  <!-- 税率 -->
-				TOTAL_CONTRACT_PRICE_INCLUDING	as "totalContractPriceIncluding",  <!-- 开票总额 -->
-				CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
-				CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
-				CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
-				UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
-				UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
-				UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
-				DEP_CODE	as "depCode" <!-- 部门编码 -->
+		ID	as "id",
+		ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+		COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+		COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+		SETTLEMENT_NUMBER	as "settlementNumber",  <!-- 来源单号 -->
+		BILL_TYBE	as "billTybe",  <!-- 票据类型 -->
+		BILL_NUMBER	as "billNumber",  <!-- 发票号 -->
+		BILL_STATE	as "billState",  <!-- 开票状态 -->
+		SIGNING_DATE	as "signingDate",  <!-- 开票日期 -->
+		PARTY_A	as "partyA",  <!-- 供应商名称 -->
+		REVIEW_STATUS	as "reviewStatus",  <!-- 审批状态 -->
+		TAX_POINTS	as "taxPoints",  <!-- 税率 -->
+		THIS_SETTLEMENT_TAX	as "thisSettlementTax",  <!-- 税额 -->
+		THIS_SETTLEMENT_AMOUNT	as "thisSettlementAmount",  <!-- 不含税金额 -->
+		TOTAL_CONTRACT_PRICE_INCLUDING	as "totalContractPriceIncluding",  <!-- 开票总额 -->
+		CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+		CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+		CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+		UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+		DEP_CODE	as "depCode" <!-- 部门编码 -->
 		FROM ${hggpSchema}.HGCW012 WHERE 1=1
-        <include refid="condition" />
+		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
-    		  $orderBy$
+				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-    		  ID asc
+				ID asc,
+				REVIEW_STATUS asc
 			</isEmpty>
 		</dynamic>
 
@@ -148,7 +139,7 @@
 
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGCW012 WHERE 1=1
-    <include refid="condition" />
+		<include refid="condition" />
 	</select>
 
 	<!--
@@ -164,12 +155,6 @@
 		<isNotEmpty prepend=" AND " property="companyName">
 			COMPANY_NAME = #companyName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="settlementNumber">
 			SETTLEMENT_NUMBER = #settlementNumber#
 		</isNotEmpty>
@@ -191,15 +176,15 @@
 		<isNotEmpty prepend=" AND " property="reviewStatus">
 			REVIEW_STATUS = #reviewStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="taxPoints">
+			TAX_POINTS = #taxPoints#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="thisSettlementTax">
 			THIS_SETTLEMENT_TAX = #thisSettlementTax#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="thisSettlementAmount">
 			THIS_SETTLEMENT_AMOUNT = #thisSettlementAmount#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="taxPoints">
-			TAX_POINTS = #taxPoints#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="totalContractPriceIncluding">
 			TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#
 		</isNotEmpty>
@@ -228,93 +213,63 @@
 
 	<insert id="insert">
 		INSERT INTO ${hggpSchema}.HGCW012 (ID,
-										ACCOUNT_CODE,  <!-- 企业编码 -->
-										COMPANY_CODE,  <!-- 公司编码 -->
-										COMPANY_NAME,  <!-- 公司名称 -->
-										PROJ_NAME,  <!-- 项目名称 -->
-										PROJ_CODE,  <!-- 项目编号 -->
-										SETTLEMENT_NUMBER,  <!-- 来源单号 -->
-										BILL_TYBE,  <!-- 票据类型 -->
-										BILL_NUMBER,  <!-- 发票号 -->
-										BILL_STATE,  <!-- 开票状态 -->
-										SIGNING_DATE,  <!-- 开票日期 -->
-										PARTY_A,  <!-- 客户名称 -->
-										REVIEW_STATUS,  <!-- 审批状态 -->
-										THIS_SETTLEMENT_TAX,  <!-- 税额 -->
-										THIS_SETTLEMENT_AMOUNT,  <!-- 不含税金额 -->
-										TAX_POINTS,  <!-- 税率 -->
-										TOTAL_CONTRACT_PRICE_INCLUDING,  <!-- 开票总额 -->
-										CREATED_BY,  <!-- 记录创建者 -->
-										CREATED_NAME,  <!-- 记录创建名称 -->
-										CREATED_TIME,  <!-- 记录创建时间 -->
-										UPDATED_BY,  <!-- 记录修改者 -->
-										UPDATED_NAME,  <!-- 记录修改名称 -->
-										UPDATED_TIME,  <!-- 记录修改时间 -->
-										DEP_CODE  <!-- 部门编码 -->
-										)
-	    VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projName#, #projCode#, #settlementNumber#, #billTybe#, #billNumber#, #billState#, #signingDate#, #partyA#, #reviewStatus#, #thisSettlementTax#, #thisSettlementAmount#, #taxPoints#, #totalContractPriceIncluding#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
+		ACCOUNT_CODE,  <!-- 企业编码 -->
+		COMPANY_CODE,  <!-- 公司编码 -->
+		COMPANY_NAME,  <!-- 公司名称 -->
+		SETTLEMENT_NUMBER,  <!-- 来源单号 -->
+		BILL_TYBE,  <!-- 票据类型 -->
+		BILL_NUMBER,  <!-- 发票号 -->
+		BILL_STATE,  <!-- 开票状态 -->
+		SIGNING_DATE,  <!-- 开票日期 -->
+		PARTY_A,  <!-- 供应商名称 -->
+		REVIEW_STATUS,  <!-- 审批状态 -->
+		TAX_POINTS,  <!-- 税率 -->
+		THIS_SETTLEMENT_TAX,  <!-- 税额 -->
+		THIS_SETTLEMENT_AMOUNT,  <!-- 不含税金额 -->
+		TOTAL_CONTRACT_PRICE_INCLUDING,  <!-- 开票总额 -->
+		CREATED_BY,  <!-- 记录创建者 -->
+		CREATED_NAME,  <!-- 记录创建名称 -->
+		CREATED_TIME,  <!-- 记录创建时间 -->
+		UPDATED_BY,  <!-- 记录修改者 -->
+		UPDATED_NAME,  <!-- 记录修改名称 -->
+		UPDATED_TIME,  <!-- 记录修改时间 -->
+		DEP_CODE  <!-- 部门编码 -->
+		)
+		VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #settlementNumber#, #billTybe#, #billNumber#, #billState#, #signingDate#, #partyA#, #reviewStatus#, #taxPoints#, #thisSettlementTax#, #thisSettlementAmount#, #totalContractPriceIncluding#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
 	</insert>
 
 	<delete id="delete">
 		DELETE FROM ${hggpSchema}.HGCW012 WHERE
-			ID = #id#
+			ID = #id# AND
+			REVIEW_STATUS = #reviewStatus#
 	</delete>
 
 	<update id="update">
 		UPDATE ${hggpSchema}.HGCW012
 		SET
-					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
-					COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
-					COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
-					PROJ_NAME	= #projName#,   <!-- 项目名称 -->
-					PROJ_CODE	= #projCode#,   <!-- 项目编号 -->
-					SETTLEMENT_NUMBER	= #settlementNumber#,   <!-- 来源单号 -->
-					BILL_TYBE	= #billTybe#,   <!-- 票据类型 -->
-					BILL_NUMBER	= #billNumber#,   <!-- 发票号 -->
-					BILL_STATE	= #billState#,   <!-- 开票状态 -->
-					SIGNING_DATE	= #signingDate#,   <!-- 开票日期 -->
-					PARTY_A	= #partyA#,   <!-- 客户名称 -->
-					REVIEW_STATUS	= #reviewStatus#,   <!-- 审批状态 -->
-					THIS_SETTLEMENT_TAX	= #thisSettlementTax#,   <!-- 税额 -->
-					THIS_SETTLEMENT_AMOUNT	= #thisSettlementAmount#,   <!-- 不含税金额 -->
-					TAX_POINTS	= #taxPoints#,   <!-- 税率 -->
-					TOTAL_CONTRACT_PRICE_INCLUDING	= #totalContractPriceIncluding#,   <!-- 开票总额 -->
-					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
-					CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
-					CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
-					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
-					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
-					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
-					DEP_CODE	= #depCode#  <!-- 部门编码 -->
-			WHERE
-			ID = #id#
+		ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
+		COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
+		COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
+		SETTLEMENT_NUMBER	= #settlementNumber#,   <!-- 来源单号 -->
+		BILL_TYBE	= #billTybe#,   <!-- 票据类型 -->
+		BILL_NUMBER	= #billNumber#,   <!-- 发票号 -->
+		BILL_STATE	= #billState#,   <!-- 开票状态 -->
+		SIGNING_DATE	= #signingDate#,   <!-- 开票日期 -->
+		PARTY_A	= #partyA#,   <!-- 供应商名称 -->
+		TAX_POINTS	= #taxPoints#,   <!-- 税率 -->
+		THIS_SETTLEMENT_TAX	= #thisSettlementTax#,   <!-- 税额 -->
+		THIS_SETTLEMENT_AMOUNT	= #thisSettlementAmount#,   <!-- 不含税金额 -->
+		TOTAL_CONTRACT_PRICE_INCLUDING	= #totalContractPriceIncluding#,   <!-- 开票总额 -->
+		CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
+		CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
+		CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+		DEP_CODE	= #depCode#  <!-- 部门编码 -->
+		WHERE
+		ID = #id# AND
+		REVIEW_STATUS = #reviewStatus#
 	</update>
-	<select id="queryconteractComboBox" parameterClass="java.util.HashMap"
-			resultClass="java.util.HashMap">
-		SELECT DISTINCT
-		COMPANY_NAME	as "companyName",  <!-- 所属公司 -->
-		PROJ_CODE	as "projCode",  <!-- 项目编号 -->
-		PROJ_NAME	as "projName",  <!-- 项目名称 -->
-		CONTRACT_NUMBER	as "contractNumber",  <!-- 合同号 -->
-		CONTRACT_NAME	as "contractName",  <!-- 合同名称 -->
-		SETTLEMENT_NUMBER	as "settlementNumber",  <!-- 结算编号 -->
-		THIS_SETTLEMENT_TAX	as "thisSettlementTax",  <!-- 税金 -->
-		THIS_SETTLEMENT_AMOUNT	as "thisSettlementAmount",  <!-- 结算金额 -->
-		THIS_PRICE_TAX	as "thisPriceTax"  <!-- 税价合计 -->
-		FROM ${hggpSchema}.HGCW008
-		WHERE 1=1
-		<isNotEmpty prepend=" AND " property="accountCode">
-			ACCOUNT_CODE = #accountCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="settlementType">
-			SETTLEMENT_TYPE = "2"
-		</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/tools/HGCWTools.java

@@ -13,6 +13,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -142,6 +143,28 @@ public class HGCWTools {
             });
             return results.get(0);
         }
+
+        public static void deductionAmount(String settlementNumber, BigDecimal deductionAmount) {
+            AssertUtils.isNull(settlementNumber, "结算单不能为空！");
+            if (deductionAmount.compareTo(new BigDecimal(BigInteger.ZERO)) <= 0) {
+                throw new PlatException("扣款金额不能小于等于0！");
+            }
+            List<HGCW008> results = DaoBase.getInstance().query(HGCW008.QUERY,new HashMap<String,Object>(){
+                {put("settlementNumber",settlementNumber);}
+            });
+            if (CollectionUtils.isEmpty(results)) {
+                throw new PlatException("找不到对应的结算单！");
+            }
+            DecimalFormat decimalFormat = new DecimalFormat("#.000");
+            HGCW008 hgcw008 = results.get(0);
+            BigDecimal remainingAmount = new BigDecimal(decimalFormat.format(hgcw008.getRemainingAmount().subtract(deductionAmount)));
+            if (remainingAmount.compareTo(new BigDecimal(BigInteger.ZERO)) < 0) {
+                throw new PlatException("扣款金额不能大于结算单剩余金额！");
+            }
+            hgcw008.setRemainingAmount(remainingAmount);
+            DaoUtils.update("HGCW008.updateDeductionAmount", hgcw008);
+
+        }
     }
 
     public static class HgCw009 {

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

@@ -385,7 +385,7 @@
 		SELECT distinct
 		proj_code	as "projCode",  <!-- 项目编码 -->
 		CONCAT(proj_code,"-",proj_name)	as "projName"  <!-- 项目名称 -->
-		FROM ${hggpSchema}.HGSC001 WHERE approval_status = 2
+		FROM ${hggpSchema}.HGSC001 WHERE approval_status = 2 and proj_status = 0
 		<include refid="condition" />
 	</select>
 </sqlMap>

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

@@ -43,6 +43,9 @@
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW008.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW009.xml"/>
 
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW014.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW015.xml"/>
+
 
     <!--配置-->
     <sqlMap resource="com/baosight/hggp/hg/pz/sql/HGPZ005A.xml"/>