收款单，付款单，采购开票，销售收票bug处理

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

@@ -269,7 +269,7 @@ public class ServiceHGCW010 extends ServiceBase {
 
 
     /**
-     * 提交操作
+     * 审核操作
      * @param inInfo
      * @return
      */
@@ -279,12 +279,12 @@ public class ServiceHGCW010 extends ServiceBase {
             for (int i = 0; i < resultRows.size(); i++) {
                 HGCW010 HGCW010 = new HGCW010();
                 HGCW010.fromMap(resultRows.get(i));
-                HGCW010.setReviewStatus(3);
+                HGCW010.setReviewStatus(1);
                 DaoUtils.update("HGCW010.submit", HGCW010);
             }
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");
         }

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

@@ -56,7 +56,8 @@ public class ServiceHGCW010A extends ServiceBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			inInfo = super.query(inInfo, HGCW010A.QUERY, new HGCW010A());
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
 		return inInfo;

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

@@ -229,7 +229,7 @@ public class ServiceHGCW012 extends ServiceBase {
             }
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "审核失败，发票类型未选！");
         }

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

@@ -269,12 +269,12 @@ public class ServiceHGCW014 extends ServiceBase {
             for (int i = 0; i < resultRows.size(); i++) {
                 HGCW014 HGCW014 = new HGCW014();
                 HGCW014.fromMap(resultRows.get(i));
-                HGCW014.setReviewStatus(3);
+                HGCW014.setReviewStatus(1);
                 DaoUtils.update("HGCW014.submit", HGCW014);
             }
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");
         }

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

@@ -249,7 +249,7 @@ public class ServiceHGCW016 extends ServiceBase {
 
 
     /**
-     * 提交操作
+     * 审核操作
      * @param inInfo
      * @return
      */
@@ -259,12 +259,12 @@ public class ServiceHGCW016 extends ServiceBase {
             for (int i = 0; i < resultRows.size(); i++) {
                 HGCW016 HGCW016 = new HGCW016();
                 HGCW016.fromMap(resultRows.get(i));
-                HGCW016.setReviewStatus(3);
+                HGCW016.setReviewStatus(1);
                 DaoUtils.update("HGCW016.submit", HGCW016);
             }
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");
         }

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

@@ -181,7 +181,7 @@
 		T1.CUMULATIVE_SETTLEMENT_AMOUNT	as "cumulativeSettlementAmount",  <!-- 累计结算金额 -->
 		T1.CUMULATIVE_SETTLEMENT_TAX	as "cumulativeSettlementTax",  <!-- 累计结算税金 -->
 		T1.CUMULATIVE_PRICE_TAX	as "cumulativePriceTax",  <!-- 累计结算价税合计金额 -->
-		T1.REMAINING_AMOUNT	as "remainingAmount",  <!-- 累计结算价税合计金额 -->
+		T1.REMAINING_AMOUNT	as "remainingAmount",  <!-- 剩余开票金额-->
 		T1.REVIEW_STATUS	as "reviewStatus",  <!-- 审核状态 -->
 		T1.CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
 		T1.CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
@@ -195,7 +195,7 @@
 		ON T1.PROJ_CODE = B.PROJ_CODE
 		AND T1.CONTRACT_NUMBER = B.CONTRACT_NUMBER
 		AND T1.COMPANY_CODE = B.COMPANY_CODE
-		WHERE 1=1 AND B.CONTRACT_TYPE = 1
+		WHERE 1=1 AND B.CONTRACT_TYPE = 1 AND T1.REMAINING_AMOUNT != 0
 		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
@@ -392,7 +392,7 @@
 	<update id="updateDeductionAmount">
 		UPDATE ${hggpSchema}.HGCW008
 		SET
-		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 审核状态 -->
+		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 剩余开票金额 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
 		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
 		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->

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

@@ -31,8 +31,8 @@
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <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="120" align="center" readonly="true" required="true"
-                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+            <EF:EFComboColumn ename="billTybe" cname="票据类型" width="120" align="center" required="true"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
                 <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>