[fix]修改bug

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm

@@ -16,6 +16,8 @@
        t1.contract_status_desc,
        t1.billing_method,
        t1.billing_method_desc,
+       t1.inv_object_taxpayer_type,
+       t1.inv_object_taxpayer_type_desc,
        decode(t2.cf_item,'250',t1.inv_billing_object_id,t1.billing_object_id) billing_object_id,
        decode(t2.cf_item,'250',t1.inv_billing_object_code,t1.billing_object_code) billing_object_code,
        decode(t2.cf_item,'250',t1.inv_billing_object_name,t1.billing_object_name) billing_object_name,
@@ -74,7 +76,7 @@
        t2.overdue_status,
        t2.write_off_flag,
        t2.overdue_max_days,
-	   t1.bp_id_agent_level1,
+     t1.bp_id_agent_level1,
        t1.termination_date,
        t1.lease_channel,
        t2.cf_direction,
@@ -87,7 +89,7 @@
                 '250',
                 t1.inv_object_taxpayer_type,
                 t1.object_taxpayer_type) = 'SMALL_SCALE_TAXPAYER' and
-       trunc(t2.due_date) <= sysdate) or t2.write_off_flag = 'FULL')
+       to_char(t2.due_date,'yyyy-mm') <= to_char(SYSDATE,'yyyy-mm')) or t2.write_off_flag = 'FULL')
    and ((t2.cf_item = '8' and t2.write_off_flag = 'FULL') or
        t2.cf_item <> '8')
   ORDER BY t1.contract_id,t2.times,t2.due_date,t2.cf_item)vv
@@ -111,6 +113,8 @@
         <bm:field name="account_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
         <bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_METHOD"/>
         <bm:field name="billing_method_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_METHOD_DESC"/>
+        <bm:field name="inv_object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="inv_object_taxpayer_type"/>
+        <bm:field name="inv_object_taxpayer_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="inv_object_taxpayer_type_desc"/>
         <bm:field name="billing_object_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BILLING_OBJECT_ID"/>
         <bm:field name="billing_object_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_OBJECT_CODE"/>
         <bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_OBJECT_NAME"/>
@@ -200,6 +204,7 @@
         <bm:query-field name="termination_date_to" queryExpression="to_date(t1.termination_date,&apos;yyyy-mm-dd&apos;) &lt;= to_date(${@termination_date_to},&apos;yyyy-mm-dd&apos;)"/>
         <bm:query-field name="lease_channel" queryExpression="t1.lease_channel=${@lease_channel}"/>
         <bm:query-field name="project_number" queryExpression="t1.project_number like &apos;%&apos;|| ${@project_number}||&apos;%&apos;"/>
+        <bm:query-field name="inv_object_taxpayer_type" queryExpression="vv.inv_object_taxpayer_type like &apos;%&apos;|| ${@inv_object_taxpayer_type}||&apos;%&apos;"/>
     </bm:query-fields>
     <bm:data-filters>
         <!--<bm:data-filter enforceOperations="query" expression="nvl(t2.billing_amount,0)&lt;t2.received_amount"/>-->

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -145,6 +145,7 @@
         ]]></script>
        <a:dataSets>
           <a:dataSet id="acr510_bp_class" lookupCode="HLS211_BP_CLASS"/>
+          <a:dataSet id="taxpayer_type_ds" lookupCode="HLS211_TAXPAYER_TYPE"/>
             <a:dataSet id="acr510_invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/>
             <a:dataSet id="acr510_status_name_ds" lookupCode="CON500_CONTRACT_STATUS"/>
             <a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
@@ -166,6 +167,7 @@
             </a:dataSet>-->
        <a:dataSet id="allConditionDs" autoCreate="true">
                 <a:fields>
+                    <a:field name="inv_object_taxpayer_type_desc" displayField="code_value_name" options="taxpayer_type_ds" returnField="inv_object_taxpayer_type" valueField="code_value"/>
                     <a:field name="bill_object_bp_class_desc" displayField="code_value_name" options="acr510_bp_class" returnField="bill_object_bp_class" valueField="code_value"/>
                     <a:field name="invoice_type_desc" displayField="code_value_name" options="acr510_invoiceKindDs" returnField="invoice_type" valueField="code_value"/>
                     <a:field name="overdue_status_desc" displayField="code_value_name" options="overdue_status_ds" returnField="overdue_status" valueField="code_value"/>
@@ -294,9 +296,10 @@
                 <a:gridButton click="allConditionDs_reset" text="重置条件"/>
                 <a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>
                 <a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/>
-            </a:screenTopToolbar>-
+            </a:screenTopToolbar>
             <a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false" resultTarget="contractDs">
                 <a:formToolBar labelWidth="100">
+                  <a:hBox>
                     <a:lov name="billing_object_name" bindTarget="allConditionDs" prompt="开票对象"/>
 
 <!--
@@ -306,10 +309,13 @@
 <!--
                     <a:comboBox name="invoice_type_desc" bindTarget="allConditionDs" prompt="发票类型"/>
 -->
-                    <a:comboBox name="contract_status_desc" bindTarget="allConditionDs" prompt="合同状态"/>
                     <a:lov name="bp_id_agent_level1" bindTarget="allConditionDs" prompt="代理店"/>
-                    <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
-
+                        <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
+                  </a:hBox>
+                    <a:hBox>
+                        <a:comboBox name="contract_status_desc" bindTarget="allConditionDs" prompt="合同状态"/>
+                        <a:comboBox name="inv_object_taxpayer_type_desc" bindTarget="allConditionDs" prompt="纳税人类型"/>
+                    </a:hBox>
                 </a:formToolBar>
                <!-- <a:formBody column="4" labelWidth="400">
                     <a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
@@ -381,9 +387,10 @@
                                 <a:column name="billing_object_name" autoAdjust="false" editor="contractDs_grid_editor_lov" prompt="开票对象名称" renderer="render_contractDs_grid" showTitle="true" width="200"/>
                                 <a:column name="invoice_title" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="发票抬头" showTitle="true" width="200"/>
                                 <a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
+                                <a:column name="inv_object_taxpayer_type_desc" prompt="纳税人类型" width="150"/>
                                 <a:column name="invoice_bp_address_phone_num" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开票地址电话" showTitle="true" width="200"/>
                                 <a:column name="invoice_bp_bank_account" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开户行及账号" showTitle="true" width="150"/>
-                                <a:column name="description" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="备注" showTitle="true" width="200"/>
+                                <a:column name="description" autoAdjust="false"  prompt="备注" showTitle="true" width="200"/>
                             </a:columns>
                             <a:editors>
                                 <a:lov id="contractDs_grid_editor_lov"/>

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -52,10 +52,11 @@
                         return;
                     }
                 //暂时去掉
-               /* if(a[i].get('billing_status_n')!='FULL' ||a[i].get('billing_status_n')!='发票已确认'){
+                debugger
+                if(a[i].get('billing_status_n')!='已开票' ||a[i].get('invoice_status_n')!='发票已确认'){
                     $L.showErrorMessage("提示",'请选择开票状态为已开票，发票状态为已确认的现金流！');
                     return;
-                }*/
+                }
 
                     cashflow_id = a[i].get('cashflow_id');
                     var arr = {};