[fix]修复销项发票bug

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

@@ -77,7 +77,8 @@
        t2.overdue_status,
        t2.write_off_flag,
        t2.overdue_max_days,
-     t1.bp_id_agent_level1,
+       t1.bp_id_agent_level1,
+       t1.bp_id_agent_level1_n,
        t1.termination_date,
        t1.lease_channel,
        t2.cf_direction,
@@ -168,6 +169,7 @@
         <bm:field name="overdue_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="OVERDUE_STATUS"/>
         <bm:field name="overdue_max_days" databaseType="NUMBER" datatype="java.lang.Long" physicalName="OVERDUE_MAX_DAYS"/>
         <bm:field name="bp_id_agent_level1"/>
+        <bm:field name="bp_id_agent_level1_n"/>
         <bm:field name="termination_date"/>
         <bm:field name="lease_channel"/>
     </bm:fields>
@@ -200,7 +202,8 @@
         <bm:query-field name="contract_name" queryExpression="vv.contract_name like &apos;%&apos;||${@contract_name}||&apos;%&apos; "/>
         <bm:query-field name="document_type" queryExpression="vv.document_type=${@document_type}"/>
         <bm:query-field name="contract_status" queryExpression="vv.contract_status = ${@contract_status}"/>
-        <bm:query-field name="bp_id_agent_level1" queryExpression="t1.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
+        <bm:query-field name="bp_id_agent_level1" queryExpression="vv.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
+        <bm:query-field name="bp_id_agent_level1_n" queryExpression="vv.bp_id_agent_level1_n like ${@bp_id_agent_level1_n}"/>
         <bm:query-field name="termination_date_from" queryExpression="to_date(t1.termination_date,&apos;yyyy-mm-dd&apos;) &gt;= to_date(${@termination_date_from},&apos;yyyy-mm-dd&apos;)"/>
         <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}"/>

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

@@ -253,12 +253,13 @@
                             <a:map from="bp_name" to="bp_id_agent_level1"/>
                         </a:mapping>
                     </a:field>-->
-                    <a:field name="bp_id_agent_level1" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="acr.ACR510.acr_bp_agent_ds" lovWidth="600" title="代理店">
+                    <a:field name="bp_id_agent_level1_n" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="acr.ACR510.acr_bp_agent_ds" lovWidth="600" title="代理店">
                         <a:mapping>
                             <a:map from="value_code" to="bp_id_agent_level1"/>
-                            <a:map from="value_name" to="bp_id_agent_level1"/>
+                            <a:map from="value_name" to="bp_id_agent_level1_n"/>
                         </a:mapping>
                     </a:field>
+                    <a:field name="bp_id_agent_level1"/>
 
                 </a:fields>
                 <a:events>
@@ -309,7 +310,7 @@
 <!--
                     <a:comboBox name="invoice_type_desc" bindTarget="allConditionDs" prompt="发票类型"/>
 -->
-                    <a:lov name="bp_id_agent_level1" bindTarget="allConditionDs" prompt="代理店"/>
+                    <a:lov name="bp_id_agent_level1_n" bindTarget="allConditionDs" prompt="代理店"/>
                         <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
                   </a:hBox>
                     <a:hBox>
@@ -350,7 +351,7 @@
                                 <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" lock="true" prompt="合同编号" width="150"/>
                                 <a:column name="billing_object_name" prompt="发票抬头"/>
-                                <a:column name="bp_id_agent_level1" prompt="代理店"/>
+                                <a:column name="bp_id_agent_level1_n" prompt="代理店"/>
                                 <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
                                 <a:column name="cf_item_desc" lock="true" prompt="应收项目"/>
                                 <a:column name="due_date" prompt="应收日" renderer="Leaf.formatDate"/>