Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

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

@@ -202,8 +202,8 @@ public class ServiceHGCW016 extends ServiceBase {
                     for (HGCW017 hgcw017 : hgcw017List) {
                         hgcw017.setMainId(HGCW016.getId());
                         // 反写金额
-                        HGCWTools.HgCw010.cutAmount(hgcw017.getContractNumber(),rowMap.get(hgcw017.getContractNumber()));
-                        DaoUtils.insert(HGCW015.INSERT, hgcw017);
+                        HGCWTools.HgCw012.cutAmount(hgcw017.getContractNumber(),rowMap.get(hgcw017.getContractNumber()));
+                        DaoUtils.insert(HGCW017.INSERT, hgcw017);
                     }
                 } else {
                     HGCW016 HGCW016 = HGCWTools.HgCw016.getId(mainId);

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

@@ -279,5 +279,14 @@
 			WHERE
 			ID = #id#
 	</update>
-
+	<update id="updateDeductionAmount">
+		UPDATE ${hggpSchema}.HGCW012
+		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/HGCW014.xml

@@ -63,7 +63,7 @@
 			SIGNING_DATE <= REPLACE(#signingDateTo#, '-', '')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="partyA">
-			PARTY_A = like ('%$partyA$%')
+			PARTY_A like ('%$partyA$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="cancelStatus">
 			CANCEL_STATUS = #cancelStatus#

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

@@ -52,7 +52,7 @@
 			SIGNING_DATE <= REPLACE(#signingDateTo#, '-', '')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="partyA">
-			PARTY_A = like ('%$partyA$%')
+			PARTY_A like ('%$partyA$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="cancelStatus">
 			CANCEL_STATUS = #cancelStatus#
@@ -225,7 +225,7 @@
 					TOTAL_CONTRACT_PRICE_INCLUDING	= #totalContractPriceIncluding#,   <!-- 付款总额 -->
 					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
 					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
-					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+					UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
 			WHERE
 			ID = #id#
 	</update>

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

@@ -373,7 +373,7 @@ public class HGCWTools {
                 throw new PlatException("扣款金额不能大于采购收票剩余金额！");
             }
             HGCW012.setRemainingAmount(remainingAmount);
-            DaoUtils.update("HGCW010.updateDeductionAmount", HGCW012);
+            DaoUtils.update("HGCW012.updateDeductionAmount", HGCW012);
 
         }
     }

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

@@ -13,7 +13,7 @@
             <EF:EFInput cname="隐藏条件" ename="partyA" blockId="inqu_status" row="0" type="hidden"/>
             <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
 
-            <EF:EFDateSpan startCname="开票日期(从)" endCname="至" blockId="inqu_status"
+            <EF:EFDateSpan startCname="付款日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
@@ -29,22 +29,20 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn ename="thisAmount" cname="本次收款金额" width="120" align="center"/>
-            <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="thisAmount" cname="本次付款金额" width="120" align="center"/>
+            <EF:EFColumn ename="remainingAmount" cname="剩余付款金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="projCode" cname="项目编码" hidden="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFComboColumn ename="billTybe" cname="票据类型" width="100" align="center"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
                 <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="signingDate" cname="付款日期" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="false" readonly="true" align="center"/>
 
         </EF:EFGrid>
     </EF:EFRegion>

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

@@ -11,10 +11,9 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" format="{0:N3}" align="center"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>

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

@@ -11,10 +11,9 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N3}" align="center" enable="false" readonly="true"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" format="{0:N3}" align="center" enable="false" readonly="true"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>