2024-07-30 合同管理新增剩余开票金额字段

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

@@ -63,6 +63,7 @@ public class HGCW002 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_COMPANY_CODES = "companyCodes";
+	public static final String FIELD_REMAINING_AMOUNT = "remainingAmount";    		/* 剩余开票/收票金额*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -105,6 +106,8 @@ public class HGCW002 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 记录修改时间*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 
+	public static final String COL_REMAINING_AMOUNT = "REMAINING_AMOUNT"; /* 剩余开票/收票金额*/
+
 	public static final String QUERY = "HGCW002.query";
 	public static final String COUNT = "HGCW002.count";
 	public static final String INSERT = "HGCW002.insert";
@@ -151,6 +154,7 @@ public class HGCW002 extends DaoEPBase {
 	private String updatedName = " ";		/* 记录修改名称*/
 	private String updatedTime = " ";		/* 记录修改时间*/
 	private String depCode = " ";		/* 部门编码*/
+	private BigDecimal remainingAmount = new BigDecimal("0");		/* 剩余开票/收票金额*/
 
 	/**
 	 * initialize the metadata.
@@ -328,7 +332,12 @@ public class HGCW002 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);
 	}
 
 	/**
@@ -978,6 +987,15 @@ public class HGCW002 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.
 	 *
@@ -1026,6 +1044,7 @@ public class HGCW002 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setRemainingAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_AMOUNT)), remainingAmount));
 	}
 
 	/**
@@ -1075,6 +1094,7 @@ public class HGCW002 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		map.put(FIELD_REMAINING_AMOUNT, StringUtils.toString(remainingAmount, eiMetadata.getMeta(FIELD_REMAINING_AMOUNT)));
 
 		return map;
 	}

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

@@ -220,7 +220,8 @@
 		UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
 		UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
 		UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
-		DEP_CODE	as "depCode" <!-- 部门编码 -->
+		DEP_CODE	as "depCode", <!-- 部门编码 -->
+		REMAINING_AMOUNT as "remainingAmount"
 		FROM ${hggpSchema}.HGCW002 WHERE 1=1
 		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
@@ -402,9 +403,10 @@
 		UPDATED_BY,  <!-- 记录修改者 -->
 		UPDATED_NAME,  <!-- 记录修改名称 -->
 		UPDATED_TIME,  <!-- 记录修改时间 -->
-		DEP_CODE  <!-- 部门编码 -->
+		DEP_CODE,  <!-- 部门编码 -->
+		REMAINING_AMOUNT
 		)
-		VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projCode#, #projName#, #contractNumber#, #contractName#, #contractType#, #contractCategory#, #partyA#, #partyB#, #partyC#, #planStartDate#, #planEndDate#, #contractStatus#, #partyAName#, #partyAPhoneNumber#, #alreadyName#, #alreadyPhoneNumber#, #engineeringAddress#, #signingDate#, #mainContractNumber#, #contractContent#, #contractingMethod#, #paymentMethod#, #pricingMethod#, #taxPoints#, #totalContractPriceExcluding#, #valueAddedTax#, #totalContractPriceIncluding#, #reviewStatus#, #balanceStatus#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
+		VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projCode#, #projName#, #contractNumber#, #contractName#, #contractType#, #contractCategory#, #partyA#, #partyB#, #partyC#, #planStartDate#, #planEndDate#, #contractStatus#, #partyAName#, #partyAPhoneNumber#, #alreadyName#, #alreadyPhoneNumber#, #engineeringAddress#, #signingDate#, #mainContractNumber#, #contractContent#, #contractingMethod#, #paymentMethod#, #pricingMethod#, #taxPoints#, #totalContractPriceExcluding#, #valueAddedTax#, #totalContractPriceIncluding#, #reviewStatus#, #balanceStatus#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#, #remainingAmount#)
 		<selectKey resultClass="long" keyProperty="id">
 			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGCW002
 		</selectKey>
@@ -455,7 +457,8 @@
 		<!-- CREATED_TIME	= #createdTime#,   记录创建时间 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
 		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
-		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+		REMAINING_AMOUNT  = #remainingAmount#
 		<!-- DEP_CODE	= #depCode#  部门编码 -->
 		WHERE
 		ID = #id#

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

@@ -243,6 +243,7 @@ $(function() {
                             totalContractPriceIncluding += totalPriceIncluding;
                         }
                         $("#result-0-totalContractPriceIncluding").val(totalContractPriceIncluding.toFixed(3))
+                        $("#result-0-remainingAmount").val(totalContractPriceIncluding.toFixed(3))
                         var totalPriceExcluding = $("#result-0-totalContractPriceExcluding").val();
                         valueAddedTax = parseFloat(totalContractPriceIncluding.toFixed(3)) - parseFloat(totalPriceExcluding);
                         $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
@@ -255,6 +256,7 @@ $(function() {
                             totalContractPriceExcluding += parseFloat(row.totalPriceExcluding);
                         }
                         $("#result-0-totalContractPriceIncluding").val(totalContractPriceExcluding.toFixed(3))
+                        $("#result-0-remainingAmount").val(totalContractPriceExcluding.toFixed(3))
                         $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
                     }
                 }
@@ -590,6 +592,7 @@ function calculateAmount(item) {
     valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
     $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3))
     $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3))
+    $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3))
     $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
 }
 
@@ -624,6 +627,7 @@ function calculateUnitAmount(item) {
     valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
     $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3))
     $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3))
+    $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3))
     $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
 }
 $(window).load(function () {

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

@@ -114,6 +114,7 @@
             <EF:EFInput ename="result-0-totalContractPriceExcluding" cname="合同总价（不含税）" colWidth="4" readonly="true"/>
             <EF:EFInput ename="result-0-valueAddedTax" cname="增值税" colWidth="4" readonly="true"/>
             <EF:EFInput ename="result-0-totalContractPriceIncluding" cname="合同总价（含税）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-remainingAmount" cname="剩余开票/收票金额" colWidth="4" type="hidden"/>
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="detail1" title="合同清单">

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

@@ -195,6 +195,7 @@ $(function() {
                             totalContractPriceIncluding += totalPriceIncluding;
                         }
                         $("#result-0-totalContractPriceIncluding").val(totalContractPriceIncluding.toFixed(3))
+                        $("#result-0-remainingAmount").val(totalContractPriceIncluding.toFixed(3))
                         var totalPriceExcluding = $("#result-0-totalContractPriceExcluding").val();
                         valueAddedTax = parseFloat(totalContractPriceIncluding.toFixed(3)) - parseFloat(totalPriceExcluding);
                         $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
@@ -207,6 +208,7 @@ $(function() {
                             totalContractPriceExcluding += parseFloat(row.totalPriceExcluding);
                         }
                         $("#result-0-totalContractPriceIncluding").val(totalContractPriceExcluding.toFixed(3))
+                        $("#result-0-remainingAmount").val(totalContractPriceExcluding.toFixed(3))
                         $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
                     }
                 }
@@ -590,6 +592,7 @@ function calculateAmount(item) {
     valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
     $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3))
     $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3))
+    $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3))
     $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
 }
 
@@ -624,6 +627,7 @@ function calculateUnitAmount(item) {
     valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
     $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3))
     $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3))
+    $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3))
     $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3))
 }
 

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

@@ -117,6 +117,7 @@
             <EF:EFInput ename="result-0-totalContractPriceExcluding" cname="合同总价（不含税）" colWidth="4" readonly="true"/>
             <EF:EFInput ename="result-0-valueAddedTax" cname="增值税" colWidth="4" readonly="true"/>
             <EF:EFInput ename="result-0-totalContractPriceIncluding" cname="合同总价（含税）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-remainingAmount" cname="剩余开票/收票金额" colWidth="4" type="hidden"/>
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="detail1" title="合同清单">